[Sphere-axis-commits] CVS: Axis/S_Sphere52 itemeditdlg.cpp,1.4,1.5 itemeditdlg.h,1.3,1.4 Resource.h,
Brought to you by:
pesterle
Menu
▾
▴
[Sphere-axis-commits] CVS: Axis/S_Sphere52 itemeditdlg.cpp,1.4,1.5 itemeditdlg.h,1.3,1.4 Resource.h,1.10,1.11 S_Sphere52.rc,1.13,1.14 ScriptsMain.cpp,1.26,1.27 ScriptsMain.h,1.17,1.18 SkillMenuEditDlg.cpp,1.2,1.3 strings.h,1.7,1.8 WOPEditDlg.cpp,1.2,1.3
|
From: Philip E. <pes...@us...> - 2003-07-21 14:14:00
|
Update of /cvsroot/sphere-axis/Axis/S_Sphere52
In directory sc8-pr-cvs1:/tmp/cvs-serv20136/S_Sphere52
Modified Files:
itemeditdlg.cpp itemeditdlg.h Resource.h S_Sphere52.rc
ScriptsMain.cpp ScriptsMain.h SkillMenuEditDlg.cpp strings.h
WOPEditDlg.cpp
Log Message:
no message
Index: itemeditdlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/itemeditdlg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** itemeditdlg.cpp 17 Jul 2003 22:09:06 -0000 1.4
--- itemeditdlg.cpp 21 Jul 2003 14:13:57 -0000 1.5
***************
*** 42,45 ****
--- 42,47 ----
// CItemEditDlg dialog
+ int CItemEditDlg::iIDSort = 1;
+ int CItemEditDlg::iNameSort = 1;
CItemEditDlg::CItemEditDlg(CWnd* pParent /*=NULL*/)
***************
*** 65,69 ****
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CItemEditDlg)
- DDX_Control(pDX, IDC_ITEMENTRY, m_ccbEntry);
DDX_Control(pDX, IDOK, m_cbOK);
DDX_Control(pDX, IDCANCEL, m_cbCancel);
--- 67,70 ----
***************
*** 103,107 ****
DDX_Control(pDX, IDC_ARMOURMAX, m_ceArmourMax);
DDX_Control(pDX, IDC_ARMOURBONUS, m_ceArmourBonus);
- DDX_Control(pDX, IDC_EI_SENTRY, m_sEntry);
DDX_Control(pDX, IDC_EI_SBASE, m_sBase);
DDX_Control(pDX, IDC_EI_SDUPE, m_sDupe);
--- 104,107 ----
***************
*** 133,136 ****
--- 133,138 ----
//}}AFX_DATA_MAP
DDX_Control(pDX, IDC_ITEMDISPLAY, m_Display);
+ DDX_Control(pDX, IDC_ITEMTREE, m_tcItemTree);
+ DDX_Control(pDX, IDC_ITEMLIST, m_lcItemList);
}
***************
*** 147,151 ****
ON_BN_CLICKED(IDC_TRIGEDIT, OnTrigedit)
ON_BN_CLICKED(IDC_IEPALETTE, OnIepalette)
- ON_CBN_SELCHANGE(IDC_ITEMENTRY, OnSelchangeItementry)
ON_BN_CLICKED(IDC_ITEM_NEW, OnItemNew)
ON_BN_CLICKED(IDC_ITEM_EDIT, OnItemEdit)
--- 149,152 ----
***************
*** 156,159 ****
--- 157,161 ----
ON_CBN_SELCHANGE(IDC_COLORCOMBO, OnSelchangeColorcombo)
//}}AFX_MSG_MAP
+ ON_NOTIFY(TVN_SELCHANGED, IDC_ITEMTREE, OnTvnSelchangedItemtree)
END_MESSAGE_MAP()
***************
*** 204,209 ****
CString csString;
csString.Format(_T("%s [%s]"), pItem->m_csDescription, pItem->m_csValue);
- int index = this->m_ccbEntry.AddString(csString);
- this->m_ccbEntry.SetItemData(index, (DWORD_PTR) pItem);
}
--- 206,209 ----
***************
*** 219,222 ****
--- 219,224 ----
// Fill in the category box
FillCategoryTree();
+ m_lcItemList.InsertColumn(0, locale->String(IDS_ITEMGEN_DESCRIPTION), LVCFMT_LEFT, 140, -1);
+ m_lcItemList.InsertColumn(1, locale->String(IDS_ITEMGEN_ID), LVCFMT_LEFT, 97, -1);
m_hPaletteIcon = AfxGetApp()->LoadIcon(IDI_PALETTE);
***************
*** 224,237 ****
if ( m_pItem != NULL )
{
- for ( i = 0; i < this->m_ccbEntry.GetCount(); i++ )
- {
- CCategorizedScriptBase * pItem = (CCategorizedScriptBase *) this->m_ccbEntry.GetItemData(i);
- if ( pItem->m_csValue == m_pItem->m_csValue )
- {
- this->m_ccbEntry.SetCurSel(i);
- this->OnItemEdit();
- break;
- }
- }
}
if ( m_csDispID != _T("") )
--- 226,229 ----
***************
*** 264,268 ****
return;
}
-
}
--- 256,259 ----
***************
*** 342,345 ****
--- 333,338 ----
void CItemEditDlg::InitData(CItem *pItem)
{
+ if ( pItem == NULL )
+ return;
// Clear out the text in all of the windows
m_ceSellValue.SetWindowText(_T(""));
***************
*** 806,810 ****
this->m_ccbColor.EnableWindow(bEnable);
this->m_ccbDupeitem.EnableWindow(bEnable);
- this->m_ccbEntry.EnableWindow(!bEnable);
this->m_ccbItemType.EnableWindow(bEnable);
this->m_ccbSkill.EnableWindow(bEnable);
--- 799,802 ----
***************
*** 841,861 ****
}
- void CItemEditDlg::OnSelchangeItementry()
- {
- int iSel = this->m_ccbEntry.GetCurSel();
- if ( iSel == -1 )
- return;
- if ( m_pItem )
- delete m_pItem;
- m_pItem = new CItem;
- CCategorizedScriptBase * pBase = (CCategorizedScriptBase *) m_ccbEntry.GetItemData(iSel);
- m_pItem->m_csValue = pBase->m_csValue;
- m_pItem->m_csFilename = pBase->m_csFilename;
- m_pItem->Load(_T(""));
- if ( m_pItem == NULL )
- return;
- InitData(m_pItem);
- }
-
bool CItemEditDlg::ValidateData()
{
--- 833,836 ----
***************
*** 1171,1186 ****
if ( m_csDispID == _T("") )
{
- int iSel = this->m_ccbEntry.GetCurSel();
- if ( iSel != -1 )
- {
- CItem * pItem = (CItem *) m_ccbEntry.GetItemData(iSel);
- if ( pItem )
- {
- if ( pItem->m_csDispID != _T("") )
- m_csDispID = pItem->m_csDispID;
- else
- m_csDispID = pItem->m_csValue;
- }
- }
}
m_pItem->m_csDispID = m_csDispID;
--- 1146,1149 ----
***************
*** 1205,1211 ****
CString csCaption;
csCaption.Format(_T("%s [%s]"), m_pItem->m_csDescription, m_pItem->m_csValue);
- int index = this->m_ccbEntry.AddString(csCaption);
- this->m_ccbEntry.SetItemDataPtr(index, (void *) m_pItem);
- this->m_ccbEntry.SelectString(-1, csCaption);
Main->m_pScripts->m_aItems.Insert(m_pItem);
Main->m_pScripts->m_wNextItemID++;
--- 1168,1171 ----
***************
*** 1294,1327 ****
void CItemEditDlg::FillCategoryTree()
{
! //m_ctcCategories.DeleteAllItems();
! //FillCategoryNode(m_pCategories, NULL);
}
void CItemEditDlg::FillCategoryNode(CCategoryTree * pCategory, HTREEITEM hParent)
{
! //if ( pCategory == NULL )
! // return;
! //HTREEITEM hItem;
! //if ( pCategory != m_pCategories )
! //{
! // // Insert this guy first
! // TV_INSERTSTRUCT InsertItem;
! // InsertItem.item.mask = TVIF_TEXT;
! // InsertItem.item.pszText = (TCHAR*)LPCTSTR(pCategory->GetName());
! // InsertItem.item.cchTextMax = pCategory->GetName().GetLength();
! // InsertItem.hParent = hParent;
! // InsertItem.hInsertAfter = TVI_SORT;
! // hItem = m_ctcCategories.InsertItem(&InsertItem);
! // m_ctcCategories.SetItemData(hItem, (DWORD) pCategory);
! //}
! //else
! // hItem = hParent;
! //// Now insert all of its children
! //for ( int i = 0; i < pCategory->ChildCount(); i++ )
! //{
! // CCategoryTree * pTree = pCategory->GetChild(i);
! // if ( pTree )
! // FillCategoryNode(pTree, hItem);
! //}
}
--- 1254,1287 ----
void CItemEditDlg::FillCategoryTree()
{
! m_tcItemTree.DeleteAllItems();
! FillCategoryNode(m_pCategories, NULL);
}
void CItemEditDlg::FillCategoryNode(CCategoryTree * pCategory, HTREEITEM hParent)
{
! if ( pCategory == NULL )
! return;
! HTREEITEM hItem;
! if ( pCategory != m_pCategories )
! {
! // Insert this guy first
! TV_INSERTSTRUCT InsertItem;
! InsertItem.item.mask = TVIF_TEXT;
! InsertItem.item.pszText = (TCHAR*)LPCTSTR(pCategory->GetName());
! InsertItem.item.cchTextMax = pCategory->GetName().GetLength();
! InsertItem.hParent = hParent;
! InsertItem.hInsertAfter = TVI_SORT;
! hItem = m_tcItemTree.InsertItem(&InsertItem);
! m_tcItemTree.SetItemData(hItem, (DWORD_PTR) pCategory);
! }
! else
! hItem = hParent;
! // Now insert all of its children
! for ( int i = 0; i < pCategory->ChildCount(); i++ )
! {
! CCategoryTree * pTree = pCategory->GetChild(i);
! if ( pTree )
! FillCategoryNode(pTree, hItem);
! }
}
***************
*** 1330,1334 ****
locale->LocalizeWindow(IDD, 0, NULL, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_ITEMDISPLAY, (CWnd*)&m_Display, (CWnd*)this);
- locale->LocalizeWindow(IDD, IDC_ITEMENTRY, (CWnd*)&m_ccbEntry, (CWnd*)this);
locale->LocalizeWindow(IDD, IDOK, (CWnd*)&m_cbOK, (CWnd*)this);
locale->LocalizeWindow(IDD, IDCANCEL, (CWnd*)&m_cbCancel, (CWnd*)this);
--- 1290,1293 ----
***************
*** 1368,1372 ****
locale->LocalizeWindow(IDD, IDC_ARMOURMAX, (CWnd*)&m_ceArmourMax, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_ARMOURBONUS, (CWnd*)&m_ceArmourBonus, (CWnd*)this);
- locale->LocalizeWindow(IDD, IDC_EI_SENTRY, (CWnd*)&m_sEntry, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_EI_SBASE, (CWnd*)&m_sBase, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_EI_SDUPE, (CWnd*)&m_sDupe, (CWnd*)this);
--- 1327,1330 ----
***************
*** 1396,1398 ****
--- 1354,1438 ----
locale->LocalizeWindow(IDD, IDC_EI_STATIC4, (CWnd*)&m_sStatic4, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_EI_STATIC5, (CWnd*)&m_sStatic5, (CWnd*)this);
+ locale->LocalizeWindow(IDD, IDC_ITEMDISPLAY, (CWnd*)&m_Display, (CWnd*)this);
+ locale->LocalizeWindow(IDD, IDC_ITEMTREE, (CWnd*)&m_tcItemTree, (CWnd*)this);
+ locale->LocalizeWindow(IDD, IDC_ITEMLIST, (CWnd*)&m_lcItemList, (CWnd*)this);
}
+
+ void CItemEditDlg::OnTvnSelchangedItemtree(NMHDR *pNMHDR, LRESULT *pResult)
+ {
+ NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;
+
+ m_lcItemList.SetHotItem(-1);
+
+ HTREEITEM hSelectedItem = NULL;
+ HTREEITEM hParentItem = NULL;
+ m_lcItemList.DeleteAllItems();
+ m_Display.SetArtIndex(-1);
+ m_Display.SetArtColor(0);
+
+ // Do the bold/nobold thing
+ if (pNMTreeView != NULL)
+ {
+ HTREEITEM hOldItem = pNMTreeView->itemOld.hItem;
+ if (hOldItem != NULL)
+ m_tcItemTree.SetItemState(hOldItem, 0, TVIS_BOLD);
+ }
+
+ hSelectedItem = m_tcItemTree.GetSelectedItem();
+ m_tcItemTree.SetItemState(hSelectedItem, TVIS_BOLD, TVIS_BOLD);
+
+ CCategoryTree * pCategory =(CCategoryTree *) m_tcItemTree.GetItemData(hSelectedItem);
+
+ int iCount = 0;
+ for ( int i = 0; i < pCategory->EntryCount(); i++ )
+ {
+ int iIndex = pCategory->GetEntry(i);
+ if ( iIndex == -1 )
+ continue;
+ CString sDescription, sID;
+ sDescription = Main->m_pScripts->ItemDescription(iIndex);
+ if ( sDescription == _T("") )
+ sDescription = _T("<unnamed>");
+ sID = Main->m_pScripts->ItemID(iIndex);
+ m_lcItemList.InsertItem(iCount, sDescription, 0);
+ m_lcItemList.SetItemText(iCount, 1, sID);
+ m_lcItemList.SetItemData(iCount, iIndex);
+ iCount++;
+ }
+
+ iNameSort = 1;
+ iIDSort = 1;
+ m_lcItemList.SortItems(CompareFunc, 1); // Sort by ItemID initially
+ iNameSort = -1;
+ }
+
+ int CALLBACK CItemEditDlg::CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort)
+ {
+ CString sID1, sID2;
+ CString sDesc1, sDesc2;
+
+ sID1 = Main->m_pScripts->ItemID((ULONG)lParam1);
+ sID2 = Main->m_pScripts->ItemID((ULONG)lParam2);
+ sDesc1 = Main->m_pScripts->ItemDescription((ULONG)lParam1);
+ sDesc2 = Main->m_pScripts->ItemDescription((ULONG)lParam2);
+
+ if (lParamSort == 0)
+ {
+ if (iNameSort == 0)
+ return (lParam1 < lParam2 ? 1 : -1);
+ if (iNameSort == 1)
+ return (sDesc1 < sDesc2 ? -1 : 1);
+ if (iNameSort == -1)
+ return (sDesc1 < sDesc2 ? 1 : -1);
+ }
+ else
+ {
+ if (iIDSort == 0)
+ return (lParam1 < lParam2 ? 1 : -1);
+ if (iIDSort == 1)
+ return (sID1 < sID2 ? -1 : 1);
+ if (iIDSort == -1)
+ return (sID1 < sID2 ? 1 : -1);
+ }
+ return 0;
+ }
\ No newline at end of file
Index: itemeditdlg.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/itemeditdlg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** itemeditdlg.h 10 Jul 2003 21:49:36 -0000 1.3
--- itemeditdlg.h 21 Jul 2003 14:13:57 -0000 1.4
***************
*** 34,37 ****
--- 34,38 ----
#include "CategoryTree.h"
#include "uoart.h"
+ #include "afxcmn.h"
/////////////////////////////////////////////////////////////////////////////
***************
*** 54,58 ****
//{{AFX_DATA(CItemEditDlg)
enum { IDD = IDD_ITEMEDIT };
- CComboBox m_ccbEntry;
CButton m_cbOK;
CButton m_cbCancel;
--- 55,58 ----
***************
*** 92,96 ****
CEdit m_ceArmourMax;
CEdit m_ceArmourBonus;
- CStatic m_sEntry;
CStatic m_sBase;
CStatic m_sDupe;
--- 92,95 ----
***************
*** 142,145 ****
--- 141,147 ----
void FillCategoryTree();
void FillCategoryNode(CCategoryTree * pCategory, HTREEITEM hParent);
+ static int iIDSort;
+ static int iNameSort;
+ static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort);
// Generated message map functions
***************
*** 156,160 ****
afx_msg void OnTrigedit();
afx_msg void OnIepalette();
- afx_msg void OnSelchangeItementry();
afx_msg void OnItemNew();
afx_msg void OnItemEdit();
--- 158,161 ----
***************
*** 175,178 ****
--- 176,182 ----
void Localize(void);
CUOArt m_Display;
+ CTreeCtrl m_tcItemTree;
+ CListCtrl m_lcItemList;
+ afx_msg void OnTvnSelchangedItemtree(NMHDR *pNMHDR, LRESULT *pResult);
};
Index: Resource.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Resource.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Resource.h 17 Jul 2003 22:09:06 -0000 1.10
--- Resource.h 21 Jul 2003 14:13:57 -0000 1.11
***************
*** 77,80 ****
--- 77,83 ----
#define IDC_UOMAPCTRL1 232
#define IDC_UOARTCTRL1 234
+ #define IDC_TREE1 235
+ #define IDC_ITEMTREE 235
+ #define IDC_ITEMLIST 236
#define IDI_UPARROW 237
#define IDI_DOWNARROW 238
***************
*** 689,693 ****
#define _APS_NEXT_RESOURCE_VALUE 206
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 235
#define _APS_NEXT_SYMED_VALUE 104
#endif
--- 692,696 ----
#define _APS_NEXT_RESOURCE_VALUE 206
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 237
#define _APS_NEXT_SYMED_VALUE 104
#endif
Index: S_Sphere52.rc
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/S_Sphere52.rc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** S_Sphere52.rc 17 Jul 2003 22:09:06 -0000 1.13
--- S_Sphere52.rc 21 Jul 2003 14:13:57 -0000 1.14
***************
*** 165,269 ****
END
! IDD_ITEMEDIT DIALOGEX 0, 0, 397, 343
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Edit Item"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
! EDITTEXT IDC_ITEMID,42,47,35,12,ES_AUTOHSCROLL | WS_DISABLED
! COMBOBOX IDC_DUPEITEM,120,47,69,81,CBS_DROPDOWN | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! EDITTEXT IDC_NAME,42,62,147,12,ES_AUTOHSCROLL | WS_DISABLED
! COMBOBOX IDC_ITEMTYPE,42,75,85,95,CBS_DROPDOWN | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! COMBOBOX IDC_COLORCOMBO,42,89,68,81,CBS_DROPDOWN | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! PUSHBUTTON "Palette",IDC_IEPALETTE,111,89,14,12,BS_ICON |
WS_DISABLED
CONTROL "Dyeable",IDC_DYEABLE,"Button",BS_AUTOCHECKBOX |
! BS_LEFTTEXT | WS_DISABLED | WS_TABSTOP,7,106,66,9
CONTROL "Repairable",IDC_REPAIRABLE,"Button",BS_AUTOCHECKBOX |
! BS_LEFTTEXT | WS_DISABLED | WS_TABSTOP,7,117,66,10
! COMBOBOX IDC_SKILL,57,142,67,52,CBS_DROPDOWNLIST | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! EDITTEXT IDC_DAMAGEMIN,57,156,20,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_DAMAGEMAX,91,156,20,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_ARMOURMIN,57,171,20,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_ARMOURMAX,91,171,20,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_REQSTR,57,185,20,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! COMBOBOX IDC_CATEGORY,56,216,102,40,CBS_DROPDOWNLIST | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! PUSHBUTTON "Add",IDC_ADDCATEGORY,163,216,22,13,WS_DISABLED
! EDITTEXT IDC_DESCRIPTION,56,231,102,12,ES_AUTOHSCROLL |
WS_DISABLED
CONTROL "Don't Index this Item",IDC_NOINDEX,"Button",
! BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,13,244,88,11
! EDITTEXT IDC_BUYVALUE,173,75,17,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_BUYVALUEMAX,205,75,17,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_SELLVALUE,173,89,17,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_SELLVALUEMAX,205,89,17,13,ES_AUTOHSCROLL | ES_NUMBER |
! WS_DISABLED
! EDITTEXT IDC_WEIGHT,173,103,50,13,ES_AUTOHSCROLL | WS_DISABLED
! EDITTEXT IDC_HPMIN,173,117,17,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_HPMAX,205,117,17,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
CONTROL "Magical",IDC_MAGICAL,"Button",BS_AUTOCHECKBOX |
! WS_DISABLED | WS_TABSTOP,133,135,41,10
! COMBOBOX IDC_SPELLID,157,155,74,53,CBS_DROPDOWNLIST | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! EDITTEXT IDC_CHARGES,198,171,33,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_ARMOURBONUS,198,187,33,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! PUSHBUTTON "Edit",IDC_TRIGEDIT,368,243,22,13,WS_DISABLED
! EDITTEXT IDC_TRIGGERS,7,261,383,75,ES_MULTILINE | ES_AUTOVSCROLL |
ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED | WS_VSCROLL
DEFPUSHBUTTON "OK",IDOK,340,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,340,21,50,14
! LTEXT "Name",IDC_EI_SNAME,7,64,20,8
! LTEXT "Based On",IDC_EI_SBASE,7,50,32,8
! LTEXT "Type",IDC_EI_STYPE,7,77,17,8
! LTEXT "Buy Value",IDC_EI_SBUY,131,77,33,8
! LTEXT "Sell Value",IDC_EI_SSELL,131,91,32,8
! LTEXT "Weight",IDC_EI_SWEIGHT,131,105,24,8
! LTEXT "Category",IDC_EI_SCAT,13,218,29,8
! LTEXT "Description",IDC_EI_SDESC,14,234,36,8
! GROUPBOX "Axis Classifications",IDC_EI_GCLASS,7,206,183,52
! GROUPBOX "Armour / Weapon Attributes",IDC_EI_GATTR,7,131,121,72
! LTEXT "Skill",IDC_EI_SSKILL,16,143,14,8
! LTEXT "Damage",IDC_EI_SDAMAGE,16,158,28,8
! LTEXT "Armour",IDC_EI_SAR,16,173,23,8
! LTEXT "Required Str",IDC_EI_SREQSTR,16,187,40,8
! LTEXT "HitPoints",IDC_EI_SHP,131,119,29,8
! LTEXT "Color",IDC_EI_SCOLOR,7,91,17,8
! GROUPBOX "Magical Attributes",IDC_EI_GMAGIC,130,146,107,57
! LTEXT "Spell",IDC_EI_SSPELL,136,157,16,8
! LTEXT "Charges",IDC_EI_SCHARGES,136,173,27,8
! LTEXT "Armour Bonus",IDC_EI_SARBONUS,136,189,45,8
! LTEXT "DupeItem",IDC_EI_SDUPE,83,49,32,8
! LTEXT "---",IDC_EI_STATIC1,194,77,8,8,0,WS_EX_TRANSPARENT
! LTEXT "Triggers",IDC_EI_STRIG,336,248,26,8
! LTEXT "---",IDC_EI_STATIC2,194,91,8,8,0,WS_EX_TRANSPARENT
! LTEXT "---",IDC_EI_STATIC4,81,158,8,8,0,WS_EX_TRANSPARENT
! LTEXT "---",IDC_EI_STATIC5,81,173,8,8,0,WS_EX_TRANSPARENT
! LTEXT "---",IDC_EI_STATIC3,194,120,8,8,0,WS_EX_TRANSPARENT
! COMBOBOX IDC_ITEMENTRY,42,7,152,103,CBS_DROPDOWNLIST | WS_VSCROLL |
! WS_TABSTOP
! LTEXT "Entry",IDC_EI_SENTRY,13,9,17,8
! PUSHBUTTON "New",IDC_ITEM_NEW,13,26,40,12
! PUSHBUTTON "Edit",IDC_ITEM_EDIT,57,26,40,12
! PUSHBUTTON "Apply",IDC_ITEM_APPLY,103,26,40,12,NOT WS_VISIBLE
! PUSHBUTTON "Cancel",IDC_ITEM_CANCEL,147,26,40,12,NOT WS_VISIBLE
CONTROL "",IDC_ITEMDISPLAY,
"{0904F7B3-2339-44C9-857C-6EB6CFEFA3B6}",WS_TABSTOP,238,
! 43,152,161
END
--- 165,273 ----
END
! IDD_ITEMEDIT DIALOGEX 0, 0, 397, 397
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Edit Item"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
! EDITTEXT IDC_ITEMID,42,102,35,12,ES_AUTOHSCROLL | WS_DISABLED
! COMBOBOX IDC_DUPEITEM,120,102,69,81,CBS_DROPDOWN | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! EDITTEXT IDC_NAME,42,117,147,12,ES_AUTOHSCROLL | WS_DISABLED
! COMBOBOX IDC_ITEMTYPE,42,130,85,95,CBS_DROPDOWN | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! COMBOBOX IDC_COLORCOMBO,42,144,68,81,CBS_DROPDOWN | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! PUSHBUTTON "Palette",IDC_IEPALETTE,111,144,14,12,BS_ICON |
WS_DISABLED
CONTROL "Dyeable",IDC_DYEABLE,"Button",BS_AUTOCHECKBOX |
! BS_LEFTTEXT | WS_DISABLED | WS_TABSTOP,7,161,66,9
CONTROL "Repairable",IDC_REPAIRABLE,"Button",BS_AUTOCHECKBOX |
! BS_LEFTTEXT | WS_DISABLED | WS_TABSTOP,7,172,66,10
! COMBOBOX IDC_SKILL,57,197,67,52,CBS_DROPDOWNLIST | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! EDITTEXT IDC_DAMAGEMIN,57,211,20,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_DAMAGEMAX,91,211,20,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_ARMOURMIN,57,226,20,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_ARMOURMAX,91,226,20,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_REQSTR,57,240,20,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! COMBOBOX IDC_CATEGORY,56,271,102,40,CBS_DROPDOWNLIST | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! PUSHBUTTON "Add",IDC_ADDCATEGORY,163,271,22,13,WS_DISABLED
! EDITTEXT IDC_DESCRIPTION,56,286,102,12,ES_AUTOHSCROLL |
WS_DISABLED
CONTROL "Don't Index this Item",IDC_NOINDEX,"Button",
! BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,13,299,88,11
! EDITTEXT IDC_BUYVALUE,173,130,17,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_BUYVALUEMAX,205,130,17,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_SELLVALUE,173,144,17,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_SELLVALUEMAX,205,144,17,13,ES_AUTOHSCROLL |
! ES_NUMBER | WS_DISABLED
! EDITTEXT IDC_WEIGHT,173,158,50,13,ES_AUTOHSCROLL | WS_DISABLED
! EDITTEXT IDC_HPMIN,173,172,17,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_HPMAX,205,172,17,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
CONTROL "Magical",IDC_MAGICAL,"Button",BS_AUTOCHECKBOX |
! WS_DISABLED | WS_TABSTOP,133,190,41,10
! COMBOBOX IDC_SPELLID,157,210,74,53,CBS_DROPDOWNLIST | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! EDITTEXT IDC_CHARGES,198,226,33,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_ARMOURBONUS,198,242,33,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! PUSHBUTTON "Edit",IDC_TRIGEDIT,368,298,22,13,WS_DISABLED
! EDITTEXT IDC_TRIGGERS,7,315,383,75,ES_MULTILINE | ES_AUTOVSCROLL |
ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED | WS_VSCROLL
DEFPUSHBUTTON "OK",IDOK,340,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,340,21,50,14
! LTEXT "Name",IDC_EI_SNAME,7,119,20,8
! LTEXT "Based On",IDC_EI_SBASE,7,105,32,8
! LTEXT "Type",IDC_EI_STYPE,7,132,17,8
! LTEXT "Buy Value",IDC_EI_SBUY,131,132,33,8
! LTEXT "Sell Value",IDC_EI_SSELL,131,146,32,8
! LTEXT "Weight",IDC_EI_SWEIGHT,131,160,24,8
! LTEXT "Category",IDC_EI_SCAT,13,273,29,8
! LTEXT "Description",IDC_EI_SDESC,14,289,36,8
! GROUPBOX "Axis Classifications",IDC_EI_GCLASS,7,261,183,52
! GROUPBOX "Armour / Weapon Attributes",IDC_EI_GATTR,7,186,121,72
! LTEXT "Skill",IDC_EI_SSKILL,16,198,14,8
! LTEXT "Damage",IDC_EI_SDAMAGE,16,213,28,8
! LTEXT "Armour",IDC_EI_SAR,16,228,23,8
! LTEXT "Required Str",IDC_EI_SREQSTR,16,242,40,8
! LTEXT "HitPoints",IDC_EI_SHP,131,174,29,8
! LTEXT "Color",IDC_EI_SCOLOR,7,146,17,8
! GROUPBOX "Magical Attributes",IDC_EI_GMAGIC,130,201,107,57
! LTEXT "Spell",IDC_EI_SSPELL,136,212,16,8
! LTEXT "Charges",IDC_EI_SCHARGES,136,228,27,8
! LTEXT "Armour Bonus",IDC_EI_SARBONUS,136,244,45,8
! LTEXT "DupeItem",IDC_EI_SDUPE,83,104,32,8
! LTEXT "---",IDC_EI_STATIC1,194,132,8,8,0,WS_EX_TRANSPARENT
! LTEXT "Triggers",IDC_EI_STRIG,336,303,26,8
! LTEXT "---",IDC_EI_STATIC2,194,146,8,8,0,WS_EX_TRANSPARENT
! LTEXT "---",IDC_EI_STATIC4,81,213,8,8,0,WS_EX_TRANSPARENT
! LTEXT "---",IDC_EI_STATIC5,81,228,8,8,0,WS_EX_TRANSPARENT
! LTEXT "---",IDC_EI_STATIC3,194,175,8,8,0,WS_EX_TRANSPARENT
! PUSHBUTTON "New",IDC_ITEM_NEW,340,53,50,14
! PUSHBUTTON "Edit",IDC_ITEM_EDIT,340,65,50,14
! PUSHBUTTON "Save Changes",IDC_ITEM_APPLY,245,103,66,12,NOT
! WS_VISIBLE
! PUSHBUTTON "Discard Changes",IDC_ITEM_CANCEL,324,103,66,12,NOT
! WS_VISIBLE
CONTROL "",IDC_ITEMDISPLAY,
"{0904F7B3-2339-44C9-857C-6EB6CFEFA3B6}",WS_TABSTOP,238,
! 119,152,140
! CONTROL "",IDC_ITEMTREE,"SysTreeView32",TVS_HASBUTTONS |
! TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS |
! WS_BORDER | WS_TABSTOP, 7,7,167,91
! CONTROL "",IDC_ITEMLIST,"SysListView32",LVS_REPORT |
! LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,176,7,162,91
END
***************
*** 1228,1232 ****
RIGHTMARGIN, 390
TOPMARGIN, 7
! BOTTOMMARGIN, 336
END
--- 1232,1236 ----
RIGHTMARGIN, 390
TOPMARGIN, 7
! BOTTOMMARGIN, 390
END
***************
*** 1489,1493 ****
0x7753, 0x726f, 0x7364, 0x616d, 0x736e, 0x6968, 0x0070,
IDC_ITEMDISPLAY, 0x376, 28, 0
! 0x0000, 0x0000, 0x0000, 0x0001, 0x1791, 0x0000, 0x1b14, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0
--- 1493,1497 ----
0x7753, 0x726f, 0x7364, 0x616d, 0x736e, 0x6968, 0x0070,
IDC_ITEMDISPLAY, 0x376, 28, 0
! 0x0000, 0x0000, 0x0000, 0x0001, 0x1791, 0x0000, 0x1791, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0
Index: ScriptsMain.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptsMain.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** ScriptsMain.cpp 16 Jul 2003 22:01:59 -0000 1.26
--- ScriptsMain.cpp 21 Jul 2003 14:13:57 -0000 1.27
***************
*** 36,39 ****
--- 36,40 ----
#include "TemplateEditDlg.h"
#include "TriggerEditDlg.h"
+ #include "WOPEditDlg.h"
#include "itemeditdlg.h"
#include "npceditdlg.h"
***************
*** 105,109 ****
_T("Stat Gain Rates"),
_T("Templates"),
! _T("Triggers")
};
--- 106,111 ----
_T("Stat Gain Rates"),
_T("Templates"),
! _T("Triggers"),
! _T("Words of Power"),
};
***************
*** 3321,3324 ****
--- 3323,3329 ----
pDlg = new CTriggerEditDlg;
break;
+ case Editor_WOP:
+ pDlg = new CWOPEditDlg;
+ break;
default:
break;
***************
*** 3475,3480 ****
if ( index >= MulCount )
return;
! if ( index > m_vFiles.size() )
! m_vMulFiles.resize(index, _T("") );
m_vMulFiles[index] = sFile;
}
--- 3480,3485 ----
if ( index >= MulCount )
return;
! if ( index >= m_vFiles.size() )
! m_vMulFiles.resize(index + 1, _T("") );
m_vMulFiles[index] = sFile;
}
***************
*** 3482,3486 ****
CString CScriptsMain::MulFile(ULONG index)
{
! if ( index < 0 || index > m_vMulFiles.size() )
return _T("");
else
--- 3487,3491 ----
CString CScriptsMain::MulFile(ULONG index)
{
! if ( index < 0 || index >= m_vMulFiles.size() )
return _T("");
else
Index: ScriptsMain.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptsMain.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** ScriptsMain.h 16 Jul 2003 22:01:59 -0000 1.17
--- ScriptsMain.h 21 Jul 2003 14:13:57 -0000 1.18
***************
*** 406,409 ****
--- 406,410 ----
Editor_Template,
Editor_Trigger,
+ Editor_WOP,
Editor_QTY
};
Index: SkillMenuEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/SkillMenuEditDlg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SkillMenuEditDlg.cpp 9 Jul 2003 19:57:25 -0000 1.2
--- SkillMenuEditDlg.cpp 21 Jul 2003 14:13:57 -0000 1.3
***************
*** 353,362 ****
m_ctcSkillTree.DeleteAllItems();
- for (int i = 0; i < (int) m_oRootMenus.GetSize(); i++)
- {
- CSkillMenuGroup * pGroup = (CSkillMenuGroup *) m_oRootMenus.GetAt(i);
- if ( pGroup )
- delete pGroup;
- }
m_oRootMenus.RemoveAll();
}
--- 353,356 ----
***************
*** 427,507 ****
{
// Read this info from the defs.
! CString csScriptPath = Main->m_pScripts->GetScriptPath();
! for ( int i = 0; i < 2; i++ )
! {
! CString csFile;
! switch (i)
! {
! case 0:
! if (csScriptPath == _T(""))
! csFile = DEFS_FILE;
! else
! csFile.Format(_T("%s%s"), csScriptPath, DEFS_FILE);
! break;
! case 1:
! if ( Main->GetProfileType() == PROFILE_REMOTE || csScriptPath == _T("") )
! csFile = Main->GetProfileType() == PROFILE_REMOTE ? RMT_DEFS_FILE : USER_DEFS_FILE;
! else
! csFile.Format(_T("%s%s"), csScriptPath, USER_DEFS_FILE);
! break;
! }
! CStdioFile csfDefs;
! if ( csfDefs.Open(csFile, CFile::modeRead | CFile::shareDenyNone) )
! {
! BOOL bStatus = TRUE;
! CString csLine, csUp;
! while ( bStatus )
! {
! if ( csLine == _T("") )
! bStatus = csfDefs.ReadString(csLine);
! if ( !bStatus )
! break;
! csUp = csLine;
! csUp.MakeUpper();
! if ( csUp.Find(_T("[ITEM")) != -1 )
! {
! while ( bStatus )
! {
! bStatus = csfDefs.ReadString(csLine);
! if (!bStatus)
! break;
! if ( csLine.Find(_T("[")) != -1 )
! break;
! if ( csLine.Find(_T("//")) != -1 )
! csLine = csLine.Left(csLine.Find(_T("//")));
! CString csName = csLine.SpanExcluding(_T(" \t"));
! CString csValue = _T("");
! if ( csName.GetLength() != csLine.GetLength() )
! csValue = csLine.Mid(csName.GetLength());
! csValue.TrimLeft();
! csValue.TrimRight();
! csValue = csValue.SpanExcluding(_T("{"));
! int iValue = 0;
! if (csValue == _T(""))
! continue;
! if (csValue.GetAt(0) == _T('0'))
! iValue = ahextoi(csValue);
! else
! iValue = _tstoi(csValue);
! if ( iValue > 0x8000 )
! continue;
! if ( m_ccbOptions.FindStringExact(-1, csName ) == -1 )
! this->m_ccbOptions.AddString(csName);
! if ( iValue < 0x4000 && m_ccbGraphics.FindStringExact(-1, csName) == -1 )
! this->m_ccbGraphics.AddString(csName);
! }
! }
! else
! csLine = _T("");
! }
! csfDefs.Close();
! }
! else
! {
! CString csMessage;
! csMessage.Format(locale->String(IDS_SCRIPTS_CANTOPEN), csFile);
! AfxMessageBox( csMessage, MB_OK | MB_ICONEXCLAMATION );
! }
! }
}
--- 421,501 ----
{
// Read this info from the defs.
! //CString csScriptPath = Main->m_pScripts->GetScriptPath();
! //for ( int i = 0; i < 2; i++ )
! //{
! // CString csFile;
! // switch (i)
! // {
! // case 0:
! // if (csScriptPath == _T(""))
! // csFile = DEFS_FILE;
! // else
! // csFile.Format(_T("%s%s"), csScriptPath, DEFS_FILE);
! // break;
! // case 1:
! // if ( Main->GetProfileType() == PROFILE_REMOTE || csScriptPath == _T("") )
! // csFile = Main->GetProfileType() == PROFILE_REMOTE ? RMT_DEFS_FILE : USER_DEFS_FILE;
! // else
! // csFile.Format(_T("%s%s"), csScriptPath, USER_DEFS_FILE);
! // break;
! // }
! // CStdioFile csfDefs;
! // if ( csfDefs.Open(csFile, CFile::modeRead | CFile::shareDenyNone) )
! // {
! // BOOL bStatus = TRUE;
! // CString csLine, csUp;
! // while ( bStatus )
! // {
! // if ( csLine == _T("") )
! // bStatus = csfDefs.ReadString(csLine);
! // if ( !bStatus )
! // break;
! // csUp = csLine;
! // csUp.MakeUpper();
! // if ( csUp.Find(_T("[ITEM")) != -1 )
! // {
! // while ( bStatus )
! // {
! // bStatus = csfDefs.ReadString(csLine);
! // if (!bStatus)
! // break;
! // if ( csLine.Find(_T("[")) != -1 )
! // break;
! // if ( csLine.Find(_T("//")) != -1 )
! // csLine = csLine.Left(csLine.Find(_T("//")));
! // CString csName = csLine.SpanExcluding(_T(" \t"));
! // CString csValue = _T("");
! // if ( csName.GetLength() != csLine.GetLength() )
! // csValue = csLine.Mid(csName.GetLength());
! // csValue.TrimLeft();
! // csValue.TrimRight();
! // csValue = csValue.SpanExcluding(_T("{"));
! // int iValue = 0;
! // if (csValue == _T(""))
! // continue;
! // if (csValue.GetAt(0) == _T('0'))
! // iValue = ahextoi(csValue);
! // else
! // iValue = _tstoi(csValue);
! // if ( iValue > 0x8000 )
! // continue;
! // if ( m_ccbOptions.FindStringExact(-1, csName ) == -1 )
! // this->m_ccbOptions.AddString(csName);
! // if ( iValue < 0x4000 && m_ccbGraphics.FindStringExact(-1, csName) == -1 )
! // this->m_ccbGraphics.AddString(csName);
! // }
! // }
! // else
! // csLine = _T("");
! // }
! // csfDefs.Close();
! // }
! // else
! // {
! // CString csMessage;
! // csMessage.Format(locale->String(IDS_SCRIPTS_CANTOPEN), csFile);
! // AfxMessageBox( csMessage, MB_OK | MB_ICONEXCLAMATION );
! // }
! //}
}
***************
*** 1027,1030 ****
--- 1021,1025 ----
void CSkillMenuEditDlg::LoadSkillMenu()
{
+ /* We really shouldn't be loading the skill menus here
CString csScriptPath = Main->m_pScripts->GetScriptPath();
CString csFile;
***************
*** 1259,1262 ****
--- 1254,1258 ----
}
return;
+ */
}
Index: strings.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/strings.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** strings.h 10 Jul 2003 21:49:37 -0000 1.7
--- strings.h 21 Jul 2003 14:13:57 -0000 1.8
***************
*** 181,184 ****
--- 181,185 ----
#define IDS_ACCTEDIT_CLOSEWARN 230
#define IDS_ACCTEDIT_CANTOPEN 231
+ #define IDS_ITEMGEN_DESCRIPTION 498
#define IDS_ITEMGEN_ID 511
#define IDS_SGEDIT_CAPTION 428
Index: WOPEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/WOPEditDlg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** WOPEditDlg.cpp 9 Jul 2003 19:57:25 -0000 1.2
--- WOPEditDlg.cpp 21 Jul 2003 14:13:57 -0000 1.3
***************
*** 175,180 ****
Localize();
- Main->m_pScripts->LoadTables();
-
for ( int i = 0; i < Main->m_pScripts->m_tables.m_runes.GetSize(); i++ )
{
--- 175,178 ----
|
