[Sphere-axis-commits] CVS: Axis ABOUTDLG.CPP,1.4,1.5 AxisLog.cpp,1.4,1.5 common.cpp,1.15,1.16 CScrip
Brought to you by:
pesterle
Menu
▾
▴
[Sphere-axis-commits] CVS: Axis ABOUTDLG.CPP,1.4,1.5 AxisLog.cpp,1.4,1.5 common.cpp,1.15,1.16 CScriptObjects.cpp,1.13,1.14 Drewsky.cpp,1.10,1.11 Drewsky.h,1.7,1.8 drewskyps.cpp,1.5,1.6 MISCTAB.CPP,1.9,1.10 resource.h,1.23,1.24 settingstab.cpp,1.15,1.16 settingstab.h,1.9,1.10 Stdafx.cpp,1.7,1.8 STDAFX.H,1.10,1.11
|
From: Philip E. <pes...@us...> - 2002-05-10 19:23:53
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv21503
Modified Files:
ABOUTDLG.CPP AxisLog.cpp common.cpp CScriptObjects.cpp
Drewsky.cpp Drewsky.h drewskyps.cpp MISCTAB.CPP resource.h
settingstab.cpp settingstab.h Stdafx.cpp STDAFX.H
Log Message:
Changed the version naming scheme.
Index: ABOUTDLG.CPP
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/ABOUTDLG.CPP,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ABOUTDLG.CPP 1 May 2002 04:21:46 -0000 1.4
--- ABOUTDLG.CPP 10 May 2002 19:23:49 -0000 1.5
***************
*** 74,82 ****
CDialog::OnInitDialog();
! CString csTimestamp;
! csTimestamp.Format("%s %s", __DATE__, __TIME__);
! this->m_csTimestamp.SetWindowText(csTimestamp);
! csTimestamp.Format("%s", APP_TITLE);
! this->m_csTitle.SetWindowText(csTimestamp);
this->m_csServerVersion.SetWindowText(SERVER_VERSION);
--- 74,80 ----
CDialog::OnInitDialog();
! this->m_csTimestamp.SetWindowText(Main->GetBuildTimestamp());
!
! this->m_csTitle.SetWindowText(Main->GetVersionTitle());
this->m_csServerVersion.SetWindowText(SERVER_VERSION);
Index: AxisLog.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/AxisLog.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** AxisLog.cpp 1 May 2002 03:33:09 -0000 1.4
--- AxisLog.cpp 10 May 2002 19:23:49 -0000 1.5
***************
*** 67,71 ****
// Open a new log file
m_pLog = fopen(NEW_LOG, "w");
- Add("Starting %s, built %s, %s", APP_TITLE, __DATE__, __TIME__);
}
--- 67,70 ----
Index: common.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/common.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** common.cpp 6 May 2002 04:11:10 -0000 1.15
--- common.cpp 10 May 2002 19:23:49 -0000 1.16
***************
*** 1600,1604 ****
psfOutput->WriteString("//****************************************************************************\n");
CString csLine;
! csLine.Format("// %s written by %s\n", csFilename, APP_TITLE);
psfOutput->WriteString(csLine);
CTime time;
--- 1600,1604 ----
psfOutput->WriteString("//****************************************************************************\n");
CString csLine;
! csLine.Format("// %s written by %s\n", csFilename, Main->GetVersionTitle());
psfOutput->WriteString(csLine);
CTime time;
Index: CScriptObjects.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/CScriptObjects.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** CScriptObjects.cpp 1 May 2002 03:33:09 -0000 1.13
--- CScriptObjects.cpp 10 May 2002 19:23:50 -0000 1.14
***************
*** 1238,1242 ****
}
CString csLine;
! csLine.Format("// %s created by %s\n", USER_LOC_FILE, APP_TITLE);
csfOutput.WriteString(csLine);
CTime time;
--- 1238,1242 ----
}
CString csLine;
! csLine.Format("// %s created by %s\n", USER_LOC_FILE, Main->GetVersionTitle());
csfOutput.WriteString(csLine);
CTime time;
Index: Drewsky.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/Drewsky.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Drewsky.cpp 5 May 2002 01:51:04 -0000 1.10
--- Drewsky.cpp 10 May 2002 19:23:50 -0000 1.11
***************
*** 54,57 ****
--- 54,58 ----
CDrewskyApp::CDrewskyApp()
{
+ Main = this;
m_bKeepGoing = true;
m_bNoScripts = false;
***************
*** 88,94 ****
#endif
// Find the path to the UO files
- Main = this;
m_pRConsole = NULL;
m_log.Add("Looking for client installation");
--- 89,95 ----
#endif
+ m_log.Add("Starting %s, built %s, %s", Main->GetVersionTitle(), Main->GetBuildTimestamp());
// Find the path to the UO files
m_pRConsole = NULL;
m_log.Add("Looking for client installation");
***************
*** 270,274 ****
CString csTitle;
! csTitle.Format( "%s - Press F1 for help", APP_TITLE );
CDrewskyPS dlg(csTitle);
dlg.m_psh.dwFlags = PSH_HASHELP | PSH_NOAPPLYNOW | PSH_PROPSHEETPAGE;
--- 271,275 ----
CString csTitle;
! csTitle.Format( "%s - Press F1 for help", GetVersionTitle() );
CDrewskyPS dlg(csTitle);
dlg.m_psh.dwFlags = PSH_HASHELP | PSH_NOAPPLYNOW | PSH_PROPSHEETPAGE;
***************
*** 488,489 ****
--- 489,526 ----
return;
}
+
+ CString CDrewskyApp::GetVersionTitle()
+ {
+ // Get the version info from the exe itself
+ CString csExe = AfxGetAppName();
+ csExe += ".exe";
+ char * pszExe = new char [csExe.GetLength() + 1];
+ sprintf(pszExe, csExe);
+ DWORD dwHandle = 0;
+ DWORD dwSize = GetFileVersionInfoSize(pszExe, &dwHandle);
+ char * pBuffer = new char [dwSize];
+ GetFileVersionInfo(pszExe, dwHandle, dwSize, (LPVOID) pBuffer);
+ CString csVersionInfo;
+ unsigned int iDataSize = 80;
+ LPVOID pData;
+ VerQueryValue(pBuffer, _T("\\StringFileInfo\\040904B0\\ProductVersion"), &pData, &iDataSize);
+ csVersionInfo.Format("%s", pData);
+
+ delete [] pszExe;
+ delete [] pBuffer;
+
+ csVersionInfo.Replace(",", ".");
+ csVersionInfo.Replace(" ", "");
+
+ CString csVersionTitle;
+ csVersionTitle.Format("Axis version %s", csVersionInfo);
+
+ return csVersionTitle;
+ }
+
+ CString CDrewskyApp::GetBuildTimestamp()
+ {
+ CString csTimestamp;
+ csTimestamp.Format("%s %s", __DATE__, __TIME__);
+ return csTimestamp;
+ }
\ No newline at end of file
Index: Drewsky.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/Drewsky.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Drewsky.h 2 May 2002 22:19:57 -0000 1.7
--- Drewsky.h 10 May 2002 19:23:50 -0000 1.8
***************
*** 63,66 ****
--- 63,68 ----
{
public:
+ CString GetVersionTitle();
+ CString GetBuildTimestamp();
void DeleteRegistryKey(CString csKeyName, HKEY hRootKey = HKEY_LOCAL_MACHINE);
void PutRegistryDword(CString csValue, DWORD dwValue, HKEY hMainKey = HKEY_LOCAL_MACHINE, CString csSubKey = "SOFTWARE\\Menasoft\\GM Tools");
Index: drewskyps.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/drewskyps.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** drewskyps.cpp 1 May 2002 03:33:11 -0000 1.5
--- drewskyps.cpp 10 May 2002 19:23:50 -0000 1.6
***************
*** 165,169 ****
{
CString csTitle;
! csTitle.Format( "%s - Press F1 for Help", APP_TITLE );
CDrewskyPS(LPCTSTR(csTitle));
}
--- 165,169 ----
{
CString csTitle;
! csTitle.Format( "%s - Press F1 for Help", Main->GetVersionTitle() );
CDrewskyPS(LPCTSTR(csTitle));
}
***************
*** 177,181 ****
m_nid.uCallbackMessage = WM_USER;
m_nid.hIcon = m_hIcon;
! strcpy(m_nid.szTip, APP_TITLE);
Shell_NotifyIcon(NIM_ADD, &m_nid);
m_bModeless = 1;
--- 177,181 ----
m_nid.uCallbackMessage = WM_USER;
m_nid.hIcon = m_hIcon;
! strcpy(m_nid.szTip, Main->GetVersionTitle());
Shell_NotifyIcon(NIM_ADD, &m_nid);
m_bModeless = 1;
Index: MISCTAB.CPP
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/MISCTAB.CPP,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** MISCTAB.CPP 8 May 2002 15:44:18 -0000 1.9
--- MISCTAB.CPP 10 May 2002 19:23:50 -0000 1.10
***************
*** 652,655 ****
--- 652,657 ----
// NOTE: the ClassWizard will add member initialization here
//}}AFX_DATA_INIT
+ this->m_bRemoteConsoleCreated = false;
+ this->m_bRemoteConsoleVisible = false;
}
Index: resource.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/resource.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** resource.h 8 May 2002 15:44:18 -0000 1.23
--- resource.h 10 May 2002 19:23:50 -0000 1.24
***************
*** 86,89 ****
--- 86,90 ----
#define IDD_STATIC_ART_CRITERIA 229
#define IDD_REMOTE_CONSOLE_LOGIN_DLG 232
+ #define IDD_ADDITIONAL_SETTINGS 233
#define IDC_BUTTON1 1001
#define IDC_BLOCK 1001
***************
*** 116,119 ****
--- 117,121 ----
#define IDC_STATIC_ADD 1001
#define IDC_STATIC_ART_ADD 1001
+ #define IDC_AS_CLIENTBROWSE 1001
#define IDC_BUTTON6 1002
#define IDC_SETHEARALL 1002
***************
*** 138,141 ****
--- 140,144 ----
#define IDC_STATIC_REMOVE 1002
#define IDC_STATIC_ART_REMOVE 1002
+ #define IDC_AS_MULBROWSE 1002
#define IDC_BUTTON2 1003
#define IDC_SETALLMOVE 1003
***************
*** 160,163 ****
--- 163,167 ----
#define IDC_MOREP 1003
#define IDC_CHANGECLIENT 1003
+ #define IDC_AS_NEWPROFILE 1003
#define IDC_BUTTON3 1004
#define IDC_UNBLOCK 1004
***************
*** 175,178 ****
--- 179,183 ----
#define IDC_RC_LOG 1004
#define IDC_LAUNCH_STATIC_TOOL 1004
+ #define IDC_AS_EDITPROFILE 1004
#define IDC_BUTTON4 1005
#define IDC_FIX 1005
***************
*** 189,192 ****
--- 194,198 ----
#define IDC_RC_VERBOSE 1005
#define IDC_REFRESHCATEGORIES 1005
+ #define IDC_AS_DELETEPROFILE 1005
#define IDC_BUTTON5 1006
#define IDC_SETDETAIL 1006
***************
*** 351,354 ****
--- 357,361 ----
#define IDC_STATIC_REGION_INCLUDES 1031
#define IDC_ARTLIST 1031
+ #define IDC_AS_CUSTOMMULS 1031
#define IDC_BUTTON31 1032
#define IDC_LIST2 1032
***************
*** 368,371 ****
--- 375,379 ----
#define IDC_STATIC_REGION_EXCLUDES 1032
#define IDC_SELECTARTLIST 1032
+ #define IDC_AS_PROFILES 1032
#define IDC_BUTTON32 1033
#define IDC_LIST3 1033
***************
*** 391,394 ****
--- 399,403 ----
#define IDC_STATIC_EXISTING 1033
#define IDC_SAVEPWD 1033
+ #define IDC_AS_SPAWNMSG 1033
#define IDC_BUTTON33 1034
#define IDC_CHECK2 1034
***************
*** 412,415 ****
--- 421,425 ----
#define IDC_CUSTOM_CMD_35 1035
#define IDC_NPCNOINDEX 1035
+ #define IDC_AS_DISPLAYITEMS 1035
#define IDC_BUTTON35 1036
#define IDC_CHECK4 1036
***************
*** 420,423 ****
--- 430,434 ----
#define IDC_REQUIREREAGENTS 1036
#define IDC_CUSTOM_CMD_36 1036
+ #define IDC_AS_SCALE 1036
#define IDC_BUTTON36 1037
#define IDC_CHECK5 1037
***************
*** 426,429 ****
--- 437,441 ----
#define IDC_GATEIN 1037
#define IDC_MONSTERFIGHT 1037
+ #define IDC_AS_ONTOP 1037
#define IDC_BUTTON37 1038
#define IDC_CHECK6 1038
***************
*** 434,437 ****
--- 446,450 ----
#define IDC_FLIPDROPPEDITEMS 1038
#define IDC_ADD_CMD 1038
+ #define IDC_AS_3DROOMVIEW 1038
#define IDC_BUTTON38 1039
#define IDC_CHECK7 1039
***************
*** 443,446 ****
--- 456,460 ----
#define IDC_CHANGE_CMD 1039
#define IDC_RESOURCEONLY 1039
+ #define IDC_AS_RADAR 1039
#define IDC_BUTTON39 1040
#define IDC_CHECK8 1040
***************
*** 451,454 ****
--- 465,469 ----
#define IDC_WOPSTAFF 1040
#define IDC_REMOVE_CMD 1040
+ #define IDC_AS_SYSCLOSE 1040
#define IDC_BUTTON40 1041
#define IDC_CHECK9 1041
***************
*** 458,461 ****
--- 473,477 ----
#define IDC_BUILDABLE 1041
#define IDC_SAVEACCOUNTSTATS 1041
+ #define IDC_AS_SHOWSPAWNS 1041
#define IDC_BUTTON41 1042
#define IDC_CHECK10 1042
***************
*** 464,467 ****
--- 480,484 ----
#define IDC_UNDERGROUND 1042
#define IDC_FREESHARD 1042
+ #define IDC_AS_SHOWCHARS 1042
#define IDC_BUTTON42 1043
#define IDC_CHECK11 1043
***************
*** 471,474 ****
--- 488,492 ----
#define IDC_SAFE 1043
#define IDC_IPSNIFF 1043
+ #define IDC_AS_USESAMEPATHASCLIENT 1043
#define IDC_BUTTON43 1044
#define IDC_CHECK12 1044
***************
*** 996,999 ****
--- 1014,1018 ----
#define IDC_SEND 1127
#define IDC_CONFIGSERVER 1127
+ #define IDC_ADDITIONALSETTINGS 1127
#define IDC_ADD_LOC 1128
#define IDC_REMOVE_LOC 1129
***************
*** 1253,1256 ****
--- 1272,1279 ----
#define IDC_COLORPREVIEW 1392
#define IDC_TEST 1393
+ #define IDC_AS_STARTLAUNCHER 1394
+ #define IDC_AS_DEFUALTCLIENT 1395
+ #define IDC_AS_DEFUALTMULPATH 1396
+ #define IDC_AS_AVAILABLESCRIPTS 1398
#define IDM_RC_START_LOGGING 32779
#define IDM_RC_STOP_LOGGING 32780
***************
*** 1285,1291 ****
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE 233
#define _APS_NEXT_COMMAND_VALUE 32809
! #define _APS_NEXT_CONTROL_VALUE 1394
#define _APS_NEXT_SYMED_VALUE 101
#endif
--- 1308,1314 ----
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE 234
#define _APS_NEXT_COMMAND_VALUE 32809
! #define _APS_NEXT_CONTROL_VALUE 1399
#define _APS_NEXT_SYMED_VALUE 101
#endif
Index: settingstab.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/settingstab.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** settingstab.cpp 2 May 2002 22:19:57 -0000 1.15
--- settingstab.cpp 10 May 2002 19:23:50 -0000 1.16
***************
*** 145,152 ****
ON_BN_CLICKED(IDC_CMDMODE0, OnCmdMode)
ON_BN_CLICKED(IDC_LAUNCH_STATIC_TOOL, OnLaunchStaticTool)
ON_BN_CLICKED(IDC_SAVESETTINGS, SaveSettings)
ON_BN_CLICKED(IDC_CMDMODE1, OnCmdMode)
ON_BN_CLICKED(IDC_CMDMODE2, OnCmdMode)
! ON_BN_CLICKED(IDC_REFRESHCATEGORIES, OnRefreshcategories)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
--- 145,153 ----
ON_BN_CLICKED(IDC_CMDMODE0, OnCmdMode)
ON_BN_CLICKED(IDC_LAUNCH_STATIC_TOOL, OnLaunchStaticTool)
+ ON_BN_CLICKED(IDC_REFRESHCATEGORIES, OnRefreshcategories)
ON_BN_CLICKED(IDC_SAVESETTINGS, SaveSettings)
ON_BN_CLICKED(IDC_CMDMODE1, OnCmdMode)
ON_BN_CLICKED(IDC_CMDMODE2, OnCmdMode)
! ON_BN_CLICKED(IDC_ADDITIONALSETTINGS, OnAdditionalSettings)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
***************
*** 692,694 ****
--- 693,701 ----
Main->m_pScripts->RecategorizeLocations();
Main->m_pScripts->RecategorizeNPCs();
+ }
+
+ void CSettingsTab::OnAdditionalSettings()
+ {
+ // Open up the main configuration dialog.
+ AfxMessageBox("This function is still in development.", MB_OK);
}
Index: settingstab.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/settingstab.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** settingstab.h 2 May 2002 22:19:57 -0000 1.9
--- settingstab.h 10 May 2002 19:23:50 -0000 1.10
***************
*** 134,137 ****
--- 134,138 ----
afx_msg void OnLaunchStaticTool();
afx_msg void OnRefreshcategories();
+ afx_msg void OnAdditionalSettings();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
Index: Stdafx.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/Stdafx.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Stdafx.cpp 1 May 2002 03:33:11 -0000 1.7
--- Stdafx.cpp 10 May 2002 19:23:50 -0000 1.8
***************
*** 79,83 ****
CString csTitle;
pWnd->GetWindowText(csTitle);
! if (csTitle.Find(APP_TITLE) != -1)
{
hwndHoGInstance = hWnd;
--- 79,83 ----
CString csTitle;
pWnd->GetWindowText(csTitle);
! if (csTitle.Find(Main->GetVersionTitle()) != -1)
{
hwndHoGInstance = hWnd;
Index: STDAFX.H
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/STDAFX.H,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** STDAFX.H 1 May 2002 03:33:10 -0000 1.10
--- STDAFX.H 10 May 2002 19:23:50 -0000 1.11
***************
*** 53,58 ****
#define KS_ALT_F4 2
#define SPAWN_MESSAGE_DELAY 700
! #ifndef APP_TITLE
! #define APP_TITLE "Axis v0.13b"
#define SERVER_VERSION "0.99"
#endif
--- 53,57 ----
#define KS_ALT_F4 2
#define SPAWN_MESSAGE_DELAY 700
! #ifndef SERVER_VERSION
#define SERVER_VERSION "0.99"
#endif
|
