[Sphere-axis-commits] CVS: Axis/S_Sphere52 NameEditDlg.cpp,1.2,1.3 NameEditDlg.h,1.1,1.2 NotoTitleEd
Brought to you by:
pesterle
Menu
▾
▴
[Sphere-axis-commits] CVS: Axis/S_Sphere52 NameEditDlg.cpp,1.2,1.3 NameEditDlg.h,1.1,1.2 NotoTitleEditDlg.cpp,1.2,1.3 NotoTitleEditDlg.h,1.1,1.2 npceditdlg.cpp,1.3,1.4 OreEditDlg.cpp,1.2,1.3 PotionEdit.cpp,1.2,1.3 S_Sphere52.rc,1.11,1.12 SkillTableEditDlg.cpp,1.2,1.3 SpawnGroupEditDlg.cpp,1.1,1.2 SpawnGroupEditDlg.h,1.1,1.2 SpellEditDlg.cpp,1.2,1.3 StatRateEditDlg.cpp,1.2,1.3 TemplateEditDlg.cpp,1.2,1.3 TriggerEditDlg.cpp,1.1,1.2
|
From: Philip E. <pes...@us...> - 2003-07-11 17:25:29
|
Update of /cvsroot/sphere-axis/Axis/S_Sphere52
In directory sc8-pr-cvs1:/tmp/cvs-serv21560
Modified Files:
NameEditDlg.cpp NameEditDlg.h NotoTitleEditDlg.cpp
NotoTitleEditDlg.h npceditdlg.cpp OreEditDlg.cpp
PotionEdit.cpp S_Sphere52.rc SkillTableEditDlg.cpp
SpawnGroupEditDlg.cpp SpawnGroupEditDlg.h SpellEditDlg.cpp
StatRateEditDlg.cpp TemplateEditDlg.cpp TriggerEditDlg.cpp
Log Message:
no message
Index: NameEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/NameEditDlg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** NameEditDlg.cpp 9 Jul 2003 19:57:25 -0000 1.2
--- NameEditDlg.cpp 11 Jul 2003 17:25:25 -0000 1.3
***************
*** 59,63 ****
DDX_Control(pDX, IDC_NAMEENTRY, m_ceNameEntry);
DDX_Control(pDX, IDC_NAMEGROUPLIST, m_ccbGroupNames);
- DDX_Control(pDX, IDOK, m_bOK);
DDX_Control(pDX, IDCANCEL, m_bCancel);
DDX_Control(pDX, IDC_ADDNAMEGROUP, m_bAddGroup);
--- 59,62 ----
***************
*** 170,175 ****
Localize();
- Main->m_pScripts->LoadNames();
-
for ( int i = 0; i < (int) Main->m_pScripts->m_aNames.GetSize(); i++ )
{
--- 169,172 ----
***************
*** 258,262 ****
void CNameEditDlg::OnCancel()
{
- Main->m_pScripts->ReloadNames();
CDialog::OnCancel();
}
--- 255,258 ----
***************
*** 269,273 ****
locale->LocalizeWindow(IDD, IDC_NAMEENTRY, (CWnd*)&m_ceNameEntry, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_NAMEGROUPLIST, (CWnd*)&m_ccbGroupNames, (CWnd*)this);
- locale->LocalizeWindow(IDD, IDOK, (CWnd*)&m_bOK, (CWnd*)this);
locale->LocalizeWindow(IDD, IDCANCEL, (CWnd*)&m_bCancel, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_ADDNAMEGROUP, (CWnd*)&m_bAddGroup, (CWnd*)this);
--- 265,268 ----
Index: NameEditDlg.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/NameEditDlg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** NameEditDlg.h 3 Jul 2003 18:09:29 -0000 1.1
--- NameEditDlg.h 11 Jul 2003 17:25:25 -0000 1.2
***************
*** 48,52 ****
CEdit m_ceNameEntry;
CComboBox m_ccbGroupNames;
- CButton m_bOK;
CButton m_bCancel;
CButton m_bAddGroup;
--- 48,51 ----
Index: NotoTitleEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/NotoTitleEditDlg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** NotoTitleEditDlg.cpp 9 Jul 2003 19:57:25 -0000 1.2
--- NotoTitleEditDlg.cpp 11 Jul 2003 17:25:25 -0000 1.3
***************
*** 162,166 ****
DDX_Text(pDX, IDC_NOTO_8, m_csNoto8);
DDX_Text(pDX, IDC_NOTO_9, m_csNoto9);
- DDX_Control(pDX, IDOK, m_bOK);
DDX_Control(pDX, IDCANCEL, m_bCancel);
DDX_Control(pDX, IDC_NTE_STATIC1, m_sStatic1);
--- 162,165 ----
***************
*** 394,399 ****
CDialog::OnInitDialog();
- Main->m_pScripts->LoadTables();
-
int index = 0;
for ( int i = 0; i < Main->m_pScripts->m_tables.m_notoTitles.GetSize(); i++ )
--- 393,396 ----
***************
*** 471,475 ****
locale->LocalizeWindow(IDD, 0, NULL, (CWnd*)this);
locale->LocalizeWindow(IDD, IDOK, (CWnd*)&m_cbSave, (CWnd*)this);
- locale->LocalizeWindow(IDD, IDOK, (CWnd*)&m_bOK, (CWnd*)this);
locale->LocalizeWindow(IDD, IDCANCEL, (CWnd*)&m_bCancel, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_NTE_STATIC1, (CWnd*)&m_sStatic1, (CWnd*)this);
--- 468,471 ----
Index: NotoTitleEditDlg.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/NotoTitleEditDlg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** NotoTitleEditDlg.h 3 Jul 2003 18:09:29 -0000 1.1
--- NotoTitleEditDlg.h 11 Jul 2003 17:25:25 -0000 1.2
***************
*** 99,103 ****
CString m_csNoto8;
CString m_csNoto9;
- CButton m_bOK;
CButton m_bCancel;
CStatic m_sStatic1;
--- 99,102 ----
Index: npceditdlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/npceditdlg.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** npceditdlg.cpp 10 Jul 2003 21:49:36 -0000 1.3
--- npceditdlg.cpp 11 Jul 2003 17:25:25 -0000 1.4
***************
*** 235,246 ****
m_iEdits = 0;
- Main->m_pScripts->LoadDefs();
- Main->m_pScripts->LoadNPCs();
- Main->m_pScripts->LoadTables();
- Main->m_pScripts->LoadItems();
- Main->m_pScripts->LoadTemplates();
- Main->m_pScripts->LoadSpeechBlocks();
- Main->m_pScripts->LoadNames();
-
// Fill in the Combo Boxes with data from the Defs file
--- 235,238 ----
Index: OreEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/OreEditDlg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** OreEditDlg.cpp 9 Jul 2003 19:57:25 -0000 1.2
--- OreEditDlg.cpp 11 Jul 2003 17:25:25 -0000 1.3
***************
*** 259,264 ****
CDialog::OnInitDialog();
Localize();
! Main->m_pScripts->LoadTables();
!
this->m_clcOreList.InsertColumn(0, locale->String(IDS_GENERIC_NAME), LVCFMT_LEFT, 80);
this->m_clcOreList.InsertColumn(1, locale->String(IDS_GENERIC_COLOUR), LVCFMT_LEFT, 60);
--- 259,263 ----
CDialog::OnInitDialog();
Localize();
!
this->m_clcOreList.InsertColumn(0, locale->String(IDS_GENERIC_NAME), LVCFMT_LEFT, 80);
this->m_clcOreList.InsertColumn(1, locale->String(IDS_GENERIC_COLOUR), LVCFMT_LEFT, 60);
***************
*** 328,332 ****
void COreEditDlg::OnCancel()
{
- Main->m_pScripts->ReloadTables();
CDialog::OnCancel();
}
--- 327,330 ----
Index: PotionEdit.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/PotionEdit.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** PotionEdit.cpp 9 Jul 2003 19:57:25 -0000 1.2
--- PotionEdit.cpp 11 Jul 2003 17:25:25 -0000 1.3
***************
*** 91,96 ****
m_pCurrentPotion = NULL;
- Main->m_pScripts->LoadDefs();
- Main->m_pScripts->LoadTables();
for ( int i = 0; i < (int) Main->m_pScripts->m_tables.m_potions.GetSize(); i++ )
{
--- 91,94 ----
***************
*** 222,226 ****
void CPotionEdit::OnCancel()
{
- Main->m_pScripts->ReloadTables();
CDialog::OnCancel();
}
--- 220,223 ----
Index: S_Sphere52.rc
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/S_Sphere52.rc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** S_Sphere52.rc 10 Jul 2003 21:49:36 -0000 1.11
--- S_Sphere52.rc 11 Jul 2003 17:25:25 -0000 1.12
***************
*** 654,674 ****
DEFPUSHBUTTON "OK",IDOK,180,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,180,24,50,14
! LTEXT "Potion Entry",1716,23,9,39,8
COMBOBOX IDC_POTIONENTRY,65,7,98,56,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
! LTEXT "Name",1717,41,33,20,8
EDITTEXT IDC_POTIONNAME,65,31,98,12,ES_AUTOHSCROLL
! LTEXT "Item",1718,47,48,14,8
COMBOBOX IDC_POTIONITEM,65,46,98,68,CBS_DROPDOWN | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
! LTEXT "Reagent",1719,33,63,28,8
COMBOBOX IDC_POTIONREAGENT,65,61,98,68,CBS_DROPDOWN | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
! LTEXT "Reagent Amount",1720,7,78,54,8
EDITTEXT IDC_POTIONREAGENTAMOUNT,65,76,52,13,ES_AUTOHSCROLL |
ES_NUMBER
! LTEXT "Skill Required",1721,17,94,44,8
EDITTEXT IDC_POTIONSKILLREQUIRED,65,92,52,13,ES_AUTOHSCROLL
! LTEXT "Colour",1722,41,110,21,8
EDITTEXT IDC_POTIONCOLOUR,65,108,52,13,ES_AUTOHSCROLL
CONTROL "",IDC_POTIONCOLOURPALETTE,"Static",SS_BITMAP |
--- 654,674 ----
DEFPUSHBUTTON "OK",IDOK,180,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,180,24,50,14
! LTEXT "Potion Entry",IDC_PE_STATIC1,23,9,39,8
COMBOBOX IDC_POTIONENTRY,65,7,98,56,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
! LTEXT "Name",IDC_PE_STATIC2,41,33,20,8
EDITTEXT IDC_POTIONNAME,65,31,98,12,ES_AUTOHSCROLL
! LTEXT "Item",IDC_PE_STATIC3,47,48,14,8
COMBOBOX IDC_POTIONITEM,65,46,98,68,CBS_DROPDOWN | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
! LTEXT "Reagent",IDC_PE_STATIC4,33,63,28,8
COMBOBOX IDC_POTIONREAGENT,65,61,98,68,CBS_DROPDOWN | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
! LTEXT "Reagent Amount",IDC_PE_STATIC5,7,78,54,8
EDITTEXT IDC_POTIONREAGENTAMOUNT,65,76,52,13,ES_AUTOHSCROLL |
ES_NUMBER
! LTEXT "Skill Required",IDC_PE_STATIC6,17,94,44,8
EDITTEXT IDC_POTIONSKILLREQUIRED,65,92,52,13,ES_AUTOHSCROLL
! LTEXT "Colour",IDC_PE_STATIC7,41,110,21,8
EDITTEXT IDC_POTIONCOLOUR,65,108,52,13,ES_AUTOHSCROLL
CONTROL "",IDC_POTIONCOLOURPALETTE,"Static",SS_BITMAP |
Index: SkillTableEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/SkillTableEditDlg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SkillTableEditDlg.cpp 9 Jul 2003 19:57:25 -0000 1.2
--- SkillTableEditDlg.cpp 11 Jul 2003 17:25:25 -0000 1.3
***************
*** 126,130 ****
CWaitCursor hourglass;
- Main->m_pScripts->LoadTables();
// Throw the skills into the combo box
for (int i = 0; i < (int) Main->m_pScripts->m_tables.m_skills.GetSize(); i++)
--- 126,129 ----
***************
*** 351,355 ****
void CSkillTableEditDlg::OnCancel()
{
- Main->m_pScripts->ReloadTables();
CDialog::OnCancel();
}
--- 350,353 ----
Index: SpawnGroupEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/SpawnGroupEditDlg.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SpawnGroupEditDlg.cpp 10 Jul 2003 21:49:37 -0000 1.1
--- SpawnGroupEditDlg.cpp 11 Jul 2003 17:25:25 -0000 1.2
***************
*** 75,79 ****
DDX_Control(pDX, IDC_SGE_STATIC2, m_sStatic2);
DDX_Control(pDX, IDC_SGE_STATIC3, m_sStatic3);
- DDX_Control(pDX, IDC_SGE_STATIC4, m_sStatic4);
DDX_Control(pDX, IDC_SGE_STATIC5, m_sStatic5);
DDX_Control(pDX, IDC_SGE_STATIC6, m_sStatic6);
--- 75,78 ----
***************
*** 339,342 ****
--- 338,342 ----
void CSpawnGroupEditDlg::OnCancel()
{
+ CDialog::OnCancel();
}
***************
*** 518,522 ****
locale->LocalizeWindow(IDD, IDC_SGE_STATIC2, (CWnd*)&m_sStatic2, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_SGE_STATIC3, (CWnd*)&m_sStatic3, (CWnd*)this);
- locale->LocalizeWindow(IDD, IDC_SGE_STATIC4, (CWnd*)&m_sStatic4, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_SGE_STATIC5, (CWnd*)&m_sStatic5, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_SGE_STATIC6, (CWnd*)&m_sStatic6, (CWnd*)this);
--- 518,521 ----
Index: SpawnGroupEditDlg.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/SpawnGroupEditDlg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SpawnGroupEditDlg.h 10 Jul 2003 21:49:37 -0000 1.1
--- SpawnGroupEditDlg.h 11 Jul 2003 17:25:25 -0000 1.2
***************
*** 77,81 ****
CStatic m_sStatic2;
CStatic m_sStatic3;
- CStatic m_sStatic4;
CStatic m_sStatic5;
CStatic m_sStatic6;
--- 77,80 ----
Index: SpellEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/SpellEditDlg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SpellEditDlg.cpp 9 Jul 2003 19:57:25 -0000 1.2
--- SpellEditDlg.cpp 11 Jul 2003 17:25:25 -0000 1.3
***************
*** 162,168 ****
Localize();
- Main->m_pScripts->LoadDefs();
- Main->m_pScripts->LoadTables();
-
FillData();
FillReagents();
--- 162,165 ----
***************
*** 406,410 ****
void CSpellEditDlg::OnCancel()
{
- Main->m_pScripts->ReloadTables();
CDialog::OnCancel();
}
--- 403,406 ----
Index: StatRateEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/StatRateEditDlg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** StatRateEditDlg.cpp 9 Jul 2003 19:57:25 -0000 1.2
--- StatRateEditDlg.cpp 11 Jul 2003 17:25:25 -0000 1.3
***************
*** 135,140 ****
Localize();
- Main->m_pScripts->LoadTables();
-
CString csAdv;
csAdv.Format(_T("%ld"), Main->m_pScripts->m_tables.m_statAdvance[STAT_STR].m_Rate[0]);
--- 135,138 ----
Index: TemplateEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/TemplateEditDlg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** TemplateEditDlg.cpp 9 Jul 2003 19:57:25 -0000 1.2
--- TemplateEditDlg.cpp 11 Jul 2003 17:25:25 -0000 1.3
***************
*** 74,78 ****
DDX_Control(pDX, IDC_TMPL_ITEM, m_ccbItem);
DDX_Control(pDX, IDC_TMPL_CONTAINER, m_ccbContainer);
- DDX_Control(pDX, IDCANCEL, m_bCancel);
DDX_Control(pDX, IDC_TPLE_STATIC1, m_sStatic1);
DDX_Control(pDX, IDC_TPLE_STATIC2, m_sStatic2);
--- 74,77 ----
***************
*** 258,261 ****
--- 257,262 ----
{
// Show the values for the new selection
+ if ( m_ccbID.GetCurSel() == LB_ERR )
+ return;
this->m_pSelectedTemplate = ( CTemplate * ) this->m_ccbID.GetItemData( this->m_ccbID.GetCurSel() );
CopyItems(&(m_pSelectedTemplate->m_olItemList), &m_olItems);
***************
*** 505,509 ****
locale->LocalizeWindow(IDD, IDC_TMPL_ITEM, (CWnd*)&m_ccbItem, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_TMPL_CONTAINER, (CWnd*)&m_ccbContainer, (CWnd*)this);
- locale->LocalizeWindow(IDD, IDCANCEL, (CWnd*)&m_bCancel, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_TPLE_STATIC1, (CWnd*)&m_sStatic1, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_TPLE_STATIC2, (CWnd*)&m_sStatic2, (CWnd*)this);
--- 506,509 ----
Index: TriggerEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/TriggerEditDlg.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** TriggerEditDlg.cpp 9 Jul 2003 19:57:25 -0000 1.1
--- TriggerEditDlg.cpp 11 Jul 2003 17:25:25 -0000 1.2
***************
*** 48,51 ****
--- 48,52 ----
m_dwNextRegion = 65000;
m_dwNextTrig = 1400;
+ m_pCurrentTrigger = NULL;
}
|
