[Sphere-axis-commits] CVS: Axis CScriptObjects.cpp,1.16,1.17 drewsky.rc,1.36,1.37 drewskyps.cpp,1.6,
Brought to you by:
pesterle
Menu
▾
▴
[Sphere-axis-commits] CVS: Axis CScriptObjects.cpp,1.16,1.17 drewsky.rc,1.36,1.37 drewskyps.cpp,1.6,1.7 flagsbrainstab.cpp,1.5,1.6 itemgentab.cpp,1.11,1.12 MISCTAB.CPP,1.12,1.13 RemoteProfileDlg.cpp,1.4,1.5 SPAWNTAB.CPP,1.11,1.12 SPAWNTAB.H,1.5,1.6 traveltab.cpp,1.14,1.15
|
From: Philip E. <pes...@us...> - 2002-05-16 01:32:01
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv15894
Modified Files:
CScriptObjects.cpp drewsky.rc drewskyps.cpp flagsbrainstab.cpp
itemgentab.cpp MISCTAB.CPP RemoteProfileDlg.cpp SPAWNTAB.CPP
SPAWNTAB.H traveltab.cpp
Log Message:
bugfixes and new build (0.13.1.12)
Index: CScriptObjects.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/CScriptObjects.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** CScriptObjects.cpp 15 May 2002 22:18:48 -0000 1.16
--- CScriptObjects.cpp 16 May 2002 01:31:57 -0000 1.17
***************
*** 57,61 ****
m_pDlg = NULL;
! if ( Main->GetProfileType() == PROFILE_REMOTE && !Main->m_bNoScripts )
m_pRemote = new CRemoteConnection;
else
--- 57,61 ----
m_pDlg = NULL;
! if ( Main->GetProfileType() == PROFILE_REMOTE )
m_pRemote = new CRemoteConnection;
else
***************
*** 168,172 ****
void CScriptObjects::LoadDefs()
{
! if ( Main->m_bNoScripts )
return;
if ( m_bDefsLoaded )
--- 168,172 ----
void CScriptObjects::LoadDefs()
{
! if ( Main->GetProfileType() == PROFILE_NONE )
return;
if ( m_bDefsLoaded )
***************
*** 297,301 ****
void CScriptObjects::LoadItems()
{
! if ( Main->m_bNoScripts )
return;
if ( m_bItemsLoaded )
--- 297,301 ----
void CScriptObjects::LoadItems()
{
! if ( Main->GetProfileType() == PROFILE_NONE )
return;
if ( m_bItemsLoaded )
***************
*** 456,460 ****
void CScriptObjects::LoadNPCs()
{
! if ( Main->m_bNoScripts )
return;
if ( m_bNPCsLoaded )
--- 456,460 ----
void CScriptObjects::LoadNPCs()
{
! if ( Main->GetProfileType() == PROFILE_NONE )
return;
if ( m_bNPCsLoaded )
***************
*** 615,619 ****
void CScriptObjects::LoadTemplates()
{
! if ( Main->m_bNoScripts )
return;
if ( m_bTemplatesLoaded )
--- 615,619 ----
void CScriptObjects::LoadTemplates()
{
! if ( Main->GetProfileType() == PROFILE_NONE )
return;
if ( m_bTemplatesLoaded )
***************
*** 814,818 ****
void CScriptObjects::LoadMap()
{
! if ( Main->m_bNoScripts )
return;
if ( m_bMapLoaded )
--- 814,818 ----
void CScriptObjects::LoadMap()
{
! if ( Main->GetProfileType() == PROFILE_NONE )
return;
if ( m_bMapLoaded )
***************
*** 981,985 ****
void CScriptObjects::LoadTriggers()
{
! if ( Main->m_bNoScripts )
return;
if ( m_bTriggersLoaded )
--- 981,985 ----
void CScriptObjects::LoadTriggers()
{
! if ( Main->GetProfileType() == PROFILE_NONE )
return;
if ( m_bTriggersLoaded )
***************
*** 1135,1139 ****
void CScriptObjects::LoadLocations()
{
! if ( Main->m_bNoScripts )
return;
if ( m_bLocationsLoaded )
--- 1135,1139 ----
void CScriptObjects::LoadLocations()
{
! if ( Main->GetProfileType() == PROFILE_NONE )
return;
if ( m_bLocationsLoaded )
***************
*** 1236,1240 ****
void CScriptObjects::LoadNames()
{
! if ( Main->m_bNoScripts )
return;
if ( m_bNamesLoaded )
--- 1236,1240 ----
void CScriptObjects::LoadNames()
{
! if ( Main->GetProfileType() == PROFILE_NONE )
return;
if ( m_bNamesLoaded )
***************
*** 1372,1376 ****
void CScriptObjects::LoadSpeechBlocks()
{
! if ( Main->m_bNoScripts )
return;
if ( m_bSpeechLoaded )
--- 1372,1376 ----
void CScriptObjects::LoadSpeechBlocks()
{
! if ( Main->GetProfileType() == PROFILE_NONE )
return;
if ( m_bSpeechLoaded )
***************
*** 1967,1971 ****
bool CScriptObjects::LoadFile(CString csFile)
{
! if ( Main->m_bNoScripts )
return true;
csFile.Replace('/', '\\');
--- 1967,1971 ----
bool CScriptObjects::LoadFile(CString csFile)
{
! if ( Main->GetProfileType() == PROFILE_NONE )
return true;
csFile.Replace('/', '\\');
***************
*** 2473,2477 ****
void CScriptObjects::LoadAll()
{
! if ( Main->m_bNoScripts )
return;
CString csLoadFile;
--- 2473,2477 ----
void CScriptObjects::LoadAll()
{
! if ( Main->GetProfileType() == PROFILE_NONE )
return;
CString csLoadFile;
Index: drewsky.rc
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/drewsky.rc,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** drewsky.rc 15 May 2002 22:18:48 -0000 1.36
--- drewsky.rc 16 May 2002 01:31:57 -0000 1.37
***************
*** 1,4 ****
//Microsoft Developer Studio generated resource script.
! //
#include "resource.h"
--- 1,4 ----
//Microsoft Developer Studio generated resource script.
! // Last compiled 5/15/2002 at 19:22:53
#include "resource.h"
***************
*** 2325,2330 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 0,13,1,11
! PRODUCTVERSION 0,13,1,11
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 2325,2330 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 0,13,1,12
! PRODUCTVERSION 0,13,1,12
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 2344,2348 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "axis MFC Application\0"
! VALUE "FileVersion", "0, 13, 1, 11\0"
VALUE "InternalName", "axis\0"
VALUE "LegalCopyright", "Copyright (C) 1998-2002\0"
--- 2344,2348 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "axis MFC Application\0"
! VALUE "FileVersion", "0, 13, 1, 12\0"
VALUE "InternalName", "axis\0"
VALUE "LegalCopyright", "Copyright (C) 1998-2002\0"
***************
*** 2351,2355 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Axis\0"
! VALUE "ProductVersion", "0, 13, 1, 11\0"
VALUE "SpecialBuild", "\0"
END
--- 2351,2355 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Axis\0"
! VALUE "ProductVersion", "0, 13, 1, 12\0"
VALUE "SpecialBuild", "\0"
END
Index: drewskyps.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/drewskyps.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** drewskyps.cpp 10 May 2002 19:23:50 -0000 1.6
--- drewskyps.cpp 16 May 2002 01:31:57 -0000 1.7
***************
*** 245,253 ****
_unlink( RMT_TRIGGER_FILE );
*/
! if ( Main->m_bNoScripts )
return;
if ( Main->m_pScripts )
delete Main->m_pScripts;
! if ( !Main->m_bNoScripts )
{
Main->m_pScripts = new CScriptObjects;
--- 245,253 ----
_unlink( RMT_TRIGGER_FILE );
*/
! if ( Main->GetProfileType() == PROFILE_NONE )
return;
if ( Main->m_pScripts )
delete Main->m_pScripts;
! if ( Main->GetProfileType() != PROFILE_NONE )
{
Main->m_pScripts = new CScriptObjects;
Index: flagsbrainstab.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/flagsbrainstab.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** flagsbrainstab.cpp 5 May 2002 16:37:42 -0000 1.5
--- flagsbrainstab.cpp 16 May 2002 01:31:57 -0000 1.6
***************
*** 709,715 ****
this->m_ccbSkills.ResetContent();
- Main->m_pScripts->LoadDefs();
- Main->m_pScripts->LoadTables();
-
for ( int i = 0; i < Main->m_pScripts->m_tables.m_skills.GetSize(); i++ )
{
--- 709,712 ----
Index: itemgentab.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/itemgentab.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** itemgentab.cpp 6 May 2002 04:11:10 -0000 1.11
--- itemgentab.cpp 16 May 2002 01:31:57 -0000 1.12
***************
*** 615,627 ****
void CItemGenTab::LoadScripts()
{
- Main->m_pScripts->LoadItems();
- Main->m_pScripts->LoadTemplates();
-
- Main->m_pScripts->CategorizeItems();
-
- // Now add all of the categories to the category list box
-
FillCategoryTree();
-
}
--- 615,619 ----
Index: MISCTAB.CPP
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/MISCTAB.CPP,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** MISCTAB.CPP 15 May 2002 22:18:48 -0000 1.12
--- MISCTAB.CPP 16 May 2002 01:31:57 -0000 1.13
***************
*** 830,836 ****
this->m_ccSpellList.ResetContent();
- //Main->m_pScripts->LoadDefs();
- //Main->m_pScripts->LoadTables();
-
// Fill the spells list
for ( int i = 1; i < Main->m_pScripts->m_tables.m_spells.GetSize(); i++ )
--- 830,833 ----
Index: RemoteProfileDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/RemoteProfileDlg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** RemoteProfileDlg.cpp 15 May 2002 22:18:48 -0000 1.4
--- RemoteProfileDlg.cpp 16 May 2002 01:31:57 -0000 1.5
***************
*** 156,162 ****
m_bRemoteSpawns = this->m_cbRemoteSpawns.GetCheck() ? true : false;
! this->m_ceHogPort.EnableWindow(m_bRemoteSpawns);
! this->m_cePwd.EnableWindow(m_bRemoteSpawns);
! this->m_ceUsername.EnableWindow(m_bRemoteSpawns);
! this->m_ceReceiveTimeout.EnableWindow(m_bRemoteSpawns);
}
--- 156,165 ----
m_bRemoteSpawns = this->m_cbRemoteSpawns.GetCheck() ? true : false;
! if ( this->m_iProfile == 0 )
! {
! this->m_ceHogPort.EnableWindow(m_bRemoteSpawns);
! this->m_cePwd.EnableWindow(m_bRemoteSpawns);
! this->m_ceUsername.EnableWindow(m_bRemoteSpawns);
! this->m_ceReceiveTimeout.EnableWindow(m_bRemoteSpawns);
! }
}
Index: SPAWNTAB.CPP
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/SPAWNTAB.CPP,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** SPAWNTAB.CPP 10 May 2002 00:06:21 -0000 1.11
--- SPAWNTAB.CPP 16 May 2002 01:31:57 -0000 1.12
***************
*** 64,67 ****
--- 64,68 ----
//{{AFX_DATA_INIT(CSpawnTab)
//}}AFX_DATA_INIT
+ m_iCatSeq = 0;
}
***************
*** 462,466 ****
}
}
!
}
--- 463,467 ----
}
}
! m_iCatSeq = Main->m_pScripts->m_iMCatSeq;
}
***************
*** 506,512 ****
CWaitCursor hourglass;
- Main->m_pScripts->LoadNPCs();
- Main->m_pScripts->LoadTables();
-
CFileReadProgress dlg;
dlg.Create(IDD_FILEREAD_PROGRESS);
--- 507,510 ----
***************
*** 736,738 ****
--- 734,743 ----
{
SendToUO(".shrink");
+ }
+
+ BOOL CSpawnTab::OnSetActive()
+ {
+ if ( Main->m_pScripts->m_iMCatSeq != m_iCatSeq )
+ this->FillCategoryTree();
+ return CPropertyPage::OnSetActive();
}
Index: SPAWNTAB.H
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/SPAWNTAB.H,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** SPAWNTAB.H 8 May 2002 15:44:18 -0000 1.5
--- SPAWNTAB.H 16 May 2002 01:31:57 -0000 1.6
***************
*** 85,88 ****
--- 85,89 ----
public:
virtual BOOL PreTranslateMessage(MSG* pMsg);
+ virtual BOOL OnSetActive();
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
***************
*** 93,96 ****
--- 94,98 ----
CString m_csSearchValue;
int m_iSearchCrit;
+ int m_iCatSeq;
CCategory * m_pSearchCategory;
CSubsection * m_pSearchSubsection;
Index: traveltab.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/traveltab.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** traveltab.cpp 15 May 2002 22:18:48 -0000 1.14
--- traveltab.cpp 16 May 2002 01:31:57 -0000 1.15
***************
*** 884,888 ****
void CTravelTab::LoadScripts()
{
! if ( Main->m_bNoScripts )
return;
CWaitCursor hourglass;
--- 884,888 ----
void CTravelTab::LoadScripts()
{
! if ( Main->GetProfileType() == PROFILE_NONE )
return;
CWaitCursor hourglass;
***************
*** 894,905 ****
if (Main->m_dwShowSpawnpoints)
- {
- // Read the local NPC and Item tables
- Main->m_pScripts->LoadItems();
- Main->m_pScripts->LoadNPCs();
- Main->m_pScripts->LoadTables();
- Main->m_pScripts->LoadTemplates();
OnReloadspawns();
- }
dlgProgress.EndDialog(IDOK);
--- 894,898 ----
|
