sphere-axis-commits Mailing List for Axis for Sphere (Page 28)
Brought to you by:
pesterle
Menu
▾
▴
sphere-axis-commits — Sends log information when files are committed to CVS
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(71) |
Jun
(4) |
Jul
(26) |
Aug
(23) |
Sep
(6) |
Oct
(2) |
Nov
(74) |
Dec
(89) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(88) |
Feb
(51) |
Mar
(26) |
Apr
(8) |
May
(55) |
Jun
(67) |
Jul
(37) |
Aug
(46) |
Sep
(12) |
Oct
(6) |
Nov
|
Dec
|
| 2004 |
Jan
|
Feb
|
Mar
(13) |
Apr
(8) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Philip E. <pes...@us...> - 2002-05-15 03:22:32
|
Update of /cvsroot/sphere-axis/axissvr
In directory usw-pr-cvs1:/tmp/cvs-serv25507
Modified Files:
gwhogsvr.cpp
Log Message:
Validating length of incoming packets.
Index: gwhogsvr.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/gwhogsvr.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** gwhogsvr.cpp 8 May 2002 18:33:46 -0000 1.10
--- gwhogsvr.cpp 15 May 2002 03:22:29 -0000 1.11
***************
*** 39,43 ****
#endif
! #define SVR_VERSION "0.13"
#ifdef WIN32
#define SVR_PLATFORM "Win32"
--- 39,43 ----
#endif
! #define SVR_VERSION "0.13.0.1"
#ifdef WIN32
#define SVR_PLATFORM "Win32"
***************
*** 1216,1222 ****
{
memset(szBuf, 0x00, sizeof(szBuf));
! memcpy(szBuf, g_pszSpawns + dwBytesSent, MAX_BUFFER);
! dwBytesSent += strlen(szBuf);
! Send(sock, szBuf, strlen(szBuf));
}
sprintf(szBuf, ".%c%c", 0x0d, 0x0a );
--- 1216,1225 ----
{
memset(szBuf, 0x00, sizeof(szBuf));
! int bytesToCopy = MAX_BUFFER;
! if ( dwBytesSent + MAX_BUFFER > strlen(g_pszSpawns) )
! bytesToCopy = strlen(g_pszSpawns) - dwBytesSent;
! memcpy(szBuf, g_pszSpawns + dwBytesSent, bytesToCopy);
! dwBytesSent += bytesToCopy;
! Send(sock, szBuf, bytesToCopy);
}
sprintf(szBuf, ".%c%c", 0x0d, 0x0a );
***************
*** 1790,1793 ****
--- 1793,1802 ----
}
i = 0;
+ // Make sure the length is valid
+ if ( iLength > iMaxLength )
+ {
+ SysMessage("Error receiving data from socket %ld. The packet length (%ld) is greater than the buffer length.(%ld)", sock, iLength, iMaxLength);
+ return -4;
+ }
while ( nBytes < iLength )
{
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv10434
Modified Files:
AccountDlg.cpp AdditionalSettingsDlg.cpp
AdditionalSettingsDlg.h ChooseProfileDlg.cpp CITEM.CPP
CNPC.CPP common.cpp CScriptObjects.cpp DefEditDlg.cpp
Drewsky.cpp Drewsky.h drewsky.rc EditorTab.cpp
ItemScriptEditDlg.cpp MISCTAB.CPP remoteconnection.cpp
RemoteConsole.cpp RemoteFileDlg.cpp resource.h
ScriptEditDlg.cpp serverconfigdlg.cpp settingstab.cpp
settingstab.h SkillMenuEditDlg.cpp Stdafx.cpp STDAFX.H
TABLES.CPP traveltab.cpp TriggerEditDlg.cpp uoart.cpp uoart.h
uomap.cpp uomap.h
Log Message:
Changes to the way profiles are read and stored.
A few minor bug fixes as well.
Index: AccountDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/AccountDlg.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** AccountDlg.cpp 1 May 2002 03:33:09 -0000 1.6
--- AccountDlg.cpp 14 May 2002 20:03:34 -0000 1.7
***************
*** 228,233 ****
CStdioFile csfIniFile;
CString csFile;
! if ( Main->m_dwUseRemoteScripts )
! csFile.Format("%s\\%s", Main->m_csRemoteProfile, "sphereacct.rmt");
else
{
--- 228,233 ----
CStdioFile csfIniFile;
CString csFile;
! if ( Main->GetProfileType() == PROFILE_REMOTE )
! csFile.Format("%s\\%s", Main->GetProfileString(), "sphereacct.rmt");
else
{
***************
*** 299,303 ****
}
csfAcctFile.Close();
! if ( Main->m_dwUseRemoteScripts )
{
CRemoteConnection remote;
--- 299,303 ----
}
csfAcctFile.Close();
! if ( Main->GetProfileType() == PROFILE_REMOTE )
{
CRemoteConnection remote;
***************
*** 477,484 ****
CStdioFile csfIniFile;
CString csFile;
! if ( Main->m_dwUseRemoteScripts )
{
CRemoteConnection remote;
! csFile.Format("%s\\%s", Main->m_csRemoteProfile, RMT_ACCU_FILE);
remote.GetCustomFile("grayacct", csFile);
}
--- 477,484 ----
CStdioFile csfIniFile;
CString csFile;
! if ( Main->GetProfileType() == PROFILE_REMOTE )
{
CRemoteConnection remote;
! csFile.Format("%s\\%s", Main->GetProfileString(), RMT_ACCU_FILE);
remote.GetCustomFile("grayacct", csFile);
}
Index: AdditionalSettingsDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/AdditionalSettingsDlg.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** AdditionalSettingsDlg.cpp 12 May 2002 16:23:59 -0000 1.1
--- AdditionalSettingsDlg.cpp 14 May 2002 20:03:34 -0000 1.2
***************
*** 30,33 ****
--- 30,34 ----
m_bStartLauncher = FALSE;
m_bSysClose = FALSE;
+ m_bAllowMultiple = FALSE;
//}}AFX_DATA_INIT
}
***************
*** 38,41 ****
--- 39,43 ----
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CAdditionalSettingsDlg)
+ DDX_Control(pDX, IDC_AS_CLIENTBROWSE, m_cbClientBrowse);
DDX_Control(pDX, IDC_AS_USESAMEPATHASCLIENT, m_cbMulPathFromClient);
DDX_Control(pDX, IDC_AS_PROFILES, m_clbProfiles);
***************
*** 58,61 ****
--- 60,64 ----
DDX_Check(pDX, IDC_AS_STARTLAUNCHER, m_bStartLauncher);
DDX_Check(pDX, IDC_AS_SYSCLOSE, m_bSysClose);
+ DDX_Check(pDX, IDC_AS_ALLOWMULTIPLE, m_bAllowMultiple);
//}}AFX_DATA_MAP
}
***************
*** 64,68 ****
BEGIN_MESSAGE_MAP(CAdditionalSettingsDlg, CDialog)
//{{AFX_MSG_MAP(CAdditionalSettingsDlg)
- // NOTE: the ClassWizard will add message map macros here
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
--- 67,70 ----
***************
*** 70,71 ****
--- 72,176 ----
/////////////////////////////////////////////////////////////////////////////
// CAdditionalSettingsDlg message handlers
+
+ BOOL CAdditionalSettingsDlg::OnInitDialog()
+ {
+ CDialog::OnInitDialog();
+
+ m_bSpawnMessage = (BOOL) Main->m_dwSpawnMessage;
+ m_bStartLauncher = (BOOL) Main->m_dwStartLauncher;
+ m_bDisplayItems = (BOOL) Main->m_dwDrawItems;
+ m_bShowChars = (BOOL) Main->m_dwDrawChars;
+ m_b3DRoomView = (BOOL) Main->m_dw3DRoomView;
+ m_bScaleItems = (BOOL) Main->m_dwScaleItems;
+ m_bAlwaysOnTop = (BOOL) Main->m_dwAlwaysOnTop;
+ m_bShowRadarMap = (BOOL) Main->m_dwShowRadar;
+ m_bShowSpawns = (BOOL) Main->m_dwShowSpawnpoints;
+ m_bSysClose = (BOOL) Main->m_dwSysClose;
+ m_bAllowMultiple = (BOOL) Main->m_dwAllowMultiple;
+
+ CString csText;
+ csText.Format("%s%s", csUOPath, csUOExe);
+ m_csDefaultClient.SetWindowText(csText);
+ m_csDefaultMulPath.SetWindowText(csUOPath);
+
+ // List the mulfiles
+ m_clcMuls.InsertColumn(0, "Mulfile", LVCFMT_LEFT, 75, 0);
+ m_clcMuls.InsertColumn(1, "Custom Filename", LVCFMT_LEFT, 255, 1);
+
+ m_clcMuls.InsertItem(0, "map0");
+ m_clcMuls.InsertItem(1, "staidx0");
+ m_clcMuls.InsertItem(2, "statics0");
+ m_clcMuls.InsertItem(3, "artidx");
+ m_clcMuls.InsertItem(4, "art");
+ m_clcMuls.InsertItem(5, "animidx");
+ m_clcMuls.InsertItem(6, "anim");
+ m_clcMuls.InsertItem(7, "soundidx");
+ m_clcMuls.InsertItem(8, "sound");
+ m_clcMuls.InsertItem(9, "texidx");
+ m_clcMuls.InsertItem(10, "texmaps");
+ m_clcMuls.InsertItem(11, "gumpidx");
+ m_clcMuls.InsertItem(12, "gumpart");
+ m_clcMuls.InsertItem(13, "multiidx");
+ m_clcMuls.InsertItem(14, "multi");
+ m_clcMuls.InsertItem(15, "skillsidx");
+ m_clcMuls.InsertItem(16, "skills");
+ m_clcMuls.InsertItem(17, "lightidx");
+ m_clcMuls.InsertItem(18, "light");
+ m_clcMuls.InsertItem(30, "tiledata");
+ m_clcMuls.InsertItem(31, "animdata");
+ m_clcMuls.InsertItem(32, "hues");
+ m_clcMuls.InsertItem(33, "animinfo");
+ m_clcMuls.InsertItem(34, "fonts");
+ m_clcMuls.InsertItem(35, "radarcol");
+ m_clcMuls.InsertItem(36, "verdata");
+ m_clcMuls.InsertItem(37, "map2");
+ m_clcMuls.InsertItem(38, "staidx2");
+ m_clcMuls.InsertItem(39, "statics2");
+
+ // Are there any local profiles in the registry?
+ HKEY hKey;
+ LONG lStatus;
+ int iIndex = 0;
+ lStatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Menasoft\\GM Tools\\Local Profiles", 0, KEY_ALL_ACCESS, &hKey);
+ if ( lStatus == ERROR_SUCCESS )
+ {
+ while (lStatus == ERROR_SUCCESS)
+ {
+ char szBuffer[MAX_PATH];
+ DWORD dwSize = sizeof(szBuffer);
+ lStatus = RegEnumKeyEx(hKey, iIndex, &szBuffer[0], &dwSize, 0, NULL, NULL, NULL);
+ if (lStatus == ERROR_SUCCESS)
+ {
+ CString csProfile;
+ csProfile.Format("Local: %s", szBuffer);
+ this->m_clbProfiles.AddString(szBuffer);
+ }
+ iIndex++;
+ }
+ RegCloseKey(hKey);
+ }
+
+ // Are there any remote profiles in the registry?
+ lStatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Menasoft\\GM Tools\\Remote Profiles", 0, KEY_ALL_ACCESS, &hKey);
+ iIndex = 0;
+ if ( lStatus == ERROR_SUCCESS )
+ {
+ while (lStatus == ERROR_SUCCESS)
+ {
+ char szBuffer[MAX_PATH];
+ DWORD dwSize = sizeof(szBuffer);
+ lStatus = RegEnumKeyEx(hKey, iIndex, &szBuffer[0], &dwSize, 0, NULL, NULL, NULL);
+ if (lStatus == ERROR_SUCCESS)
+ {
+ CString csProfile;
+ csProfile.Format("Remote: %s", szBuffer);
+ this->m_clbProfiles.AddString(szBuffer);
+ }
+ iIndex++;
+ }
+ RegCloseKey(hKey);
+ }
+
+ UpdateData(FALSE);
+ return TRUE;
+ }
Index: AdditionalSettingsDlg.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/AdditionalSettingsDlg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** AdditionalSettingsDlg.h 12 May 2002 16:23:59 -0000 1.1
--- AdditionalSettingsDlg.h 14 May 2002 20:03:34 -0000 1.2
***************
*** 20,23 ****
--- 20,24 ----
//{{AFX_DATA(CAdditionalSettingsDlg)
enum { IDD = IDD_ADDITIONAL_SETTINGS };
+ CButton m_cbClientBrowse;
CButton m_cbMulPathFromClient;
CListBox m_clbProfiles;
***************
*** 40,43 ****
--- 41,45 ----
BOOL m_bStartLauncher;
BOOL m_bSysClose;
+ BOOL m_bAllowMultiple;
//}}AFX_DATA
***************
*** 55,59 ****
// Generated message map functions
//{{AFX_MSG(CAdditionalSettingsDlg)
! // NOTE: the ClassWizard will add member functions here
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
--- 57,61 ----
// Generated message map functions
//{{AFX_MSG(CAdditionalSettingsDlg)
! virtual BOOL OnInitDialog();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
Index: ChooseProfileDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/ChooseProfileDlg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ChooseProfileDlg.cpp 1 May 2002 03:33:09 -0000 1.4
--- ChooseProfileDlg.cpp 14 May 2002 20:03:34 -0000 1.5
***************
*** 69,76 ****
CDialog::OnInitDialog();
- this->m_clbProfiles.AddString("< Local >");
this->m_clbProfiles.AddString("< NONE >");
DWORD dwUseRemote = 0;
char szProfile[MAX_PATH];
HKEY hKey;
LONG lStatus;
--- 69,77 ----
CDialog::OnInitDialog();
this->m_clbProfiles.AddString("< NONE >");
+ m_clbProfiles.AddString("< DEFAULT >");
DWORD dwUseRemote = 0;
char szProfile[MAX_PATH];
+ CString csProfileDisp;
HKEY hKey;
LONG lStatus;
***************
*** 79,103 ****
dwSize = sizeof(DWORD);
lStatus = RegCreateKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Menasoft\\GM Tools", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, &dwDisp);
- lStatus = RegQueryValueEx(hKey, "UseRemoteScripts", 0, &dwType, (BYTE *)&dwUseRemote, &dwSize);
dwSize = sizeof(szProfile);
! lStatus = RegQueryValueEx( hKey, "Remote Profile", 0, &dwType, (BYTE *)&szProfile, &dwSize);
RegCloseKey(hKey);
// Enumerate the remote profiles
lStatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Menasoft\\GM Tools\\Remote Profiles", 0, KEY_ALL_ACCESS, &hKey);
! int iIndex = 0;
! while (lStatus == ERROR_SUCCESS)
{
! char szBuffer[MAX_PATH];
! DWORD dwSize = sizeof(szBuffer);
! lStatus = RegEnumKeyEx(hKey, iIndex, &szBuffer[0], &dwSize, 0, NULL, NULL, NULL);
! if (lStatus == ERROR_SUCCESS)
! this->m_clbProfiles.AddString(szBuffer);
! iIndex++;
}
! RegCloseKey(hKey);
! if ( dwUseRemote )
! m_clbProfiles.SelectString(-1, szProfile);
! else
! m_clbProfiles.SelectString(-1, "< Local >");
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
--- 80,128 ----
dwSize = sizeof(DWORD);
lStatus = RegCreateKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Menasoft\\GM Tools", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, &dwDisp);
dwSize = sizeof(szProfile);
! memset(&szProfile[0], 0x00, MAX_PATH);
! lStatus = RegQueryValueEx( hKey, "Script Profile", 0, &dwType, (BYTE *)&szProfile, &dwSize);
RegCloseKey(hKey);
+ // Enumerate the local profiles
+ lStatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Menasoft\\GM Tools\\Local Profiles", 0, KEY_ALL_ACCESS, &hKey);
+ int iIndex = 0;
+ if ( lStatus == ERROR_SUCCESS )
+ {
+ while (lStatus == ERROR_SUCCESS)
+ {
+ char szBuffer[MAX_PATH];
+ DWORD dwSize = sizeof(szBuffer);
+ lStatus = RegEnumKeyEx(hKey, iIndex, &szBuffer[0], &dwSize, 0, NULL, NULL, NULL);
+ if (lStatus == ERROR_SUCCESS)
+ {
+ CString csProfile;
+ csProfile.Format("Local: %s", szBuffer);
+ this->m_clbProfiles.AddString(csProfile);
+ }
+ iIndex++;
+ }
+ RegCloseKey(hKey);
+ }
// Enumerate the remote profiles
lStatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Menasoft\\GM Tools\\Remote Profiles", 0, KEY_ALL_ACCESS, &hKey);
! iIndex = 0;
! if ( lStatus == ERROR_SUCCESS )
{
! while (lStatus == ERROR_SUCCESS)
! {
! char szBuffer[MAX_PATH];
! DWORD dwSize = sizeof(szBuffer);
! lStatus = RegEnumKeyEx(hKey, iIndex, &szBuffer[0], &dwSize, 0, NULL, NULL, NULL);
! if (lStatus == ERROR_SUCCESS)
! {
! CString csProfile;
! csProfile.Format("Remote: %s", szBuffer);
! this->m_clbProfiles.AddString(csProfile);
! }
! iIndex++;
! }
! RegCloseKey(hKey);
}
! m_clbProfiles.SelectString(-1, szProfile);
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
***************
*** 111,129 ****
CString csProfile;
m_clbProfiles.GetText(iSel, csProfile);
- if ( csProfile == "< Local >")
- csProfile = "";
- if ( csProfile == "< NONE >")
- Main->m_bNoScripts = true;
// Set the registry key
HKEY hKey;
LONG lStatus;
DWORD dwDisp;
- int Yes = 1;
- int No = 0;
lStatus = RegCreateKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Menasoft\\GM Tools\\", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, &dwDisp);
if (lStatus == ERROR_SUCCESS)
{
! lStatus+= RegSetValueEx(hKey, "Remote Profile", 0, REG_SZ, ((BYTE *) csProfile.GetBuffer(csProfile.GetLength())), csProfile.GetLength());
! lStatus+= RegSetValueEx(hKey, "UseRemoteScripts", 0, REG_DWORD, (BYTE *) (csProfile.GetLength() ? &Yes : &No), sizeof(DWORD));
RegCloseKey(hKey);
}
--- 136,147 ----
CString csProfile;
m_clbProfiles.GetText(iSel, csProfile);
// Set the registry key
HKEY hKey;
LONG lStatus;
DWORD dwDisp;
lStatus = RegCreateKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Menasoft\\GM Tools\\", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, &dwDisp);
if (lStatus == ERROR_SUCCESS)
{
! lStatus+= RegSetValueEx(hKey, "Script Profile", 0, REG_SZ, ((BYTE *) csProfile.GetBuffer(csProfile.GetLength())), csProfile.GetLength());
RegCloseKey(hKey);
}
Index: CITEM.CPP
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/CITEM.CPP,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** CITEM.CPP 6 May 2002 04:11:10 -0000 1.6
--- CITEM.CPP 14 May 2002 20:03:34 -0000 1.7
***************
*** 148,152 ****
#ifdef _AXIS
CString csFileName, csTmpFileName;
! if (Main->m_dwUseRemoteScripts)
csFileRoot = "remoteaxis";
csFileName.Format("%s.scp", csFileRoot);
--- 148,152 ----
#ifdef _AXIS
CString csFileName, csTmpFileName;
! if (Main->GetProfileType() == PROFILE_REMOTE)
csFileRoot = "remoteaxis";
csFileName.Format("%s.scp", csFileRoot);
***************
*** 156,160 ****
if (!csfInput.Open(csFileName, CFile::modeRead | CFile::modeCreate | CFile::modeNoTruncate | CFile::shareDenyWrite))
return false;
! if (Main->m_dwUseRemoteScripts)
{
if (!csfOutput.Open(csTmpFileName, CFile::modeWrite | CFile::modeCreate | CFile::shareDenyWrite | CFile::typeBinary))
--- 156,160 ----
if (!csfInput.Open(csFileName, CFile::modeRead | CFile::modeCreate | CFile::modeNoTruncate | CFile::shareDenyWrite))
return false;
! if (Main->GetProfileType() == PROFILE_REMOTE)
{
if (!csfOutput.Open(csTmpFileName, CFile::modeWrite | CFile::modeCreate | CFile::shareDenyWrite | CFile::typeBinary))
***************
*** 244,248 ****
csfInput.Close();
csfOutput.Close();
! if (Main->m_dwUseRemoteScripts)
{
CRemoteConnection crRemote;
--- 244,248 ----
csfInput.Close();
csfOutput.Close();
! if (Main->GetProfileType() == PROFILE_REMOTE)
{
CRemoteConnection crRemote;
***************
*** 253,257 ****
}
}
! if (Main->m_dwUseRemoteScripts)
{
CFile::Remove(csFileName);
--- 253,257 ----
}
}
! if (Main->GetProfileType() == PROFILE_REMOTE)
{
CFile::Remove(csFileName);
Index: CNPC.CPP
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/CNPC.CPP,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** CNPC.CPP 6 May 2002 04:11:10 -0000 1.8
--- CNPC.CPP 14 May 2002 20:03:34 -0000 1.9
***************
*** 681,686 ****
#ifndef _AXIS
CString csFileName, csTmpFileName;
! csFileName.Format(Main->m_dwUseRemoteScripts ? "%s.rmt" : "%s.scp", csFileRoot);
! if (Main->m_dwUseRemoteScripts)
csTmpFileName.Format("remoteaxis.tmp");
else
--- 681,686 ----
#ifndef _AXIS
CString csFileName, csTmpFileName;
! csFileName.Format(Main->GetProfileType() == PROFILE_REMOTE ? "%s.rmt" : "%s.scp", csFileRoot);
! if (Main->GetProfileType() == PROFILE_REMOTE)
csTmpFileName.Format("remoteaxis.tmp");
else
***************
*** 727,731 ****
csLine = csLine.SpanExcluding("]");
DWORD dwThisItem = ahextoi(csLine);
! if (dwThisItem < ahextoi(this->m_csValue) && !Main->m_dwUseRemoteScripts)
{
csfOutput.WriteString(csIn);
--- 727,731 ----
csLine = csLine.SpanExcluding("]");
DWORD dwThisItem = ahextoi(csLine);
! if (dwThisItem < ahextoi(this->m_csValue) && !Main->GetProfileType() == PROFILE_REMOTE)
{
csfOutput.WriteString(csIn);
***************
*** 765,769 ****
// otherwise, at this point, it's either a comment, or a tag in an item preceding the one we want, or we've already written the new item
// so write the line to the new file
! if (bStatus && !Main->m_dwUseRemoteScripts)
{
csfOutput.WriteString(csIn);
--- 765,769 ----
// otherwise, at this point, it's either a comment, or a tag in an item preceding the one we want, or we've already written the new item
// so write the line to the new file
! if (bStatus && !Main->GetProfileType() == PROFILE_REMOTE)
{
csfOutput.WriteString(csIn);
***************
*** 773,777 ****
csfInput.Close();
csfOutput.Close();
! if (Main->m_dwUseRemoteScripts)
{
CRemoteConnection crRemote;
--- 773,777 ----
csfInput.Close();
csfOutput.Close();
! if (Main->GetProfileType() == PROFILE_REMOTE)
{
CRemoteConnection crRemote;
Index: common.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/common.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** common.cpp 10 May 2002 19:23:49 -0000 1.16
--- common.cpp 14 May 2002 20:03:34 -0000 1.17
***************
*** 2768,2772 ****
bool bStatus = false;
#ifdef _AXIS
! if ( Main->m_dwUseRemoteScripts )
{
bStatus = ReplaceFiles( csNewFile, csRemoteFile );
--- 2768,2772 ----
bool bStatus = false;
#ifdef _AXIS
! if ( Main->GetProfileType() == PROFILE_REMOTE )
{
bStatus = ReplaceFiles( csNewFile, csRemoteFile );
Index: CScriptObjects.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/CScriptObjects.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** CScriptObjects.cpp 10 May 2002 19:23:50 -0000 1.14
--- CScriptObjects.cpp 14 May 2002 20:03:34 -0000 1.15
***************
*** 57,61 ****
m_pDlg = NULL;
! if ( Main->m_dwUseRemoteScripts && ! Main->m_bNoScripts )
m_pRemote = new CRemoteConnection;
else
--- 57,61 ----
m_pDlg = NULL;
! if ( Main->GetProfileType() == PROFILE_REMOTE && !Main->m_bNoScripts )
m_pRemote = new CRemoteConnection;
else
***************
*** 180,189 ****
// Grab the custom file from the remote server if necessary.
#ifdef _AXIS
! if (Main->m_dwUseRemoteScripts)
{
CFileStatus st;
if ( !CFile::GetStatus(RMT_DEFS_FILE, st) )
{
! if (m_pRemote->IsValid())
m_pRemote->GetCustomFile("graydefs");
}
--- 180,189 ----
// Grab the custom file from the remote server if necessary.
#ifdef _AXIS
! if (Main->GetProfileType() == PROFILE_REMOTE)
{
CFileStatus st;
if ( !CFile::GetStatus(RMT_DEFS_FILE, st) )
{
! if (m_pRemote && m_pRemote->IsValid())
m_pRemote->GetCustomFile("graydefs");
}
***************
*** 202,206 ****
case 0:
// This is the regular file
! if ( Main->m_dwUseRemoteScripts || csScpPath == "" )
csFilename = DEFS_FILE;
else
--- 202,206 ----
case 0:
// This is the regular file
! if ( Main->GetProfileType() == PROFILE_REMOTE || csScpPath == "" )
csFilename = DEFS_FILE;
else
***************
*** 209,214 ****
case 1:
// This is the custom file
! if ( Main->m_dwUseRemoteScripts )
! csFilename.Format("%s\\%s", Main->m_csRemoteProfile, RMT_DEFS_FILE);
else if ( csScpPath == "" )
csFilename = USER_DEFS_FILE;
--- 209,214 ----
case 1:
// This is the custom file
! if ( Main->GetProfileType() == PROFILE_REMOTE )
! csFilename.Format("%s\\%s", Main->GetProfileString(), RMT_DEFS_FILE);
else if ( csScpPath == "" )
csFilename = USER_DEFS_FILE;
***************
*** 228,236 ****
}
Main->m_log.Add("Unable to open file %s", csFilename);
- if ( i == 0 )
- {
- csMessage.Format("Unable to open file %s for input.", csFilename);
- AfxMessageBox(csMessage, MB_OK | MB_ICONEXCLAMATION);
- }
break;
}
--- 228,231 ----
***************
*** 318,322 ****
// Grab the custom file from the remote server if necessary.
#ifdef _AXIS
! if (Main->m_dwUseRemoteScripts)
{
CFileStatus st;
--- 313,317 ----
// Grab the custom file from the remote server if necessary.
#ifdef _AXIS
! if (Main->GetProfileType() == PROFILE_REMOTE)
{
CFileStatus st;
***************
*** 340,344 ****
case 0:
// This is the regular file
! if ( Main->m_dwUseRemoteScripts || csScpPath == "" )
csFilename = ITEM_FILE;
else
--- 335,339 ----
case 0:
// This is the regular file
! if ( Main->GetProfileType() == PROFILE_REMOTE || csScpPath == "" )
csFilename = ITEM_FILE;
else
***************
*** 347,352 ****
case 1:
// This is the custom file
! if ( Main->m_dwUseRemoteScripts )
! csFilename.Format("%s\\%s", Main->m_csRemoteProfile, RMT_ITEM_FILE);
else if ( csScpPath == "" )
csFilename = USER_ITEM_FILE;
--- 342,347 ----
case 1:
// This is the custom file
! if ( Main->GetProfileType() == PROFILE_REMOTE )
! csFilename.Format("%s\\%s", Main->GetProfileString(), RMT_ITEM_FILE);
else if ( csScpPath == "" )
csFilename = USER_ITEM_FILE;
***************
*** 366,374 ****
}
Main->m_log.Add("Unable to open file %s", csFilename);
- if ( i == 0 )
- {
- csMessage.Format("Unable to open file %s for input.", csFilename);
- AfxMessageBox(csMessage, MB_OK | MB_ICONEXCLAMATION);
- }
break;
}
--- 361,364 ----
***************
*** 484,488 ****
// Grab the custom file from the remote server if necessary.
#ifdef _AXIS
! if (Main->m_dwUseRemoteScripts)
{
CFileStatus st;
--- 474,478 ----
// Grab the custom file from the remote server if necessary.
#ifdef _AXIS
! if (Main->GetProfileType() == PROFILE_REMOTE)
{
CFileStatus st;
***************
*** 505,509 ****
case 0:
// This is the regular file
! if ( Main->m_dwUseRemoteScripts || csScpPath == "" )
csFilename = NPC_FILE;
else
--- 495,499 ----
case 0:
// This is the regular file
! if ( Main->GetProfileType() == PROFILE_REMOTE || csScpPath == "" )
csFilename = NPC_FILE;
else
***************
*** 512,517 ****
case 1:
// This is the custom file
! if ( Main->m_dwUseRemoteScripts )
! csFilename.Format("%s\\%s", Main->m_csRemoteProfile, RMT_NPC_FILE);
else if ( csScpPath == "" )
csFilename = USER_NPC_FILE;
--- 502,507 ----
case 1:
// This is the custom file
! if ( Main->GetProfileType() == PROFILE_REMOTE )
! csFilename.Format("%s\\%s", Main->GetProfileString(), RMT_NPC_FILE);
else if ( csScpPath == "" )
csFilename = USER_NPC_FILE;
***************
*** 531,539 ****
}
Main->m_log.Add("Unable to open file %s", csFilename);
- if ( i == 0 )
- {
- csMessage.Format("Unable to open file %s for input.", csFilename);
- AfxMessageBox(csMessage, MB_OK | MB_ICONEXCLAMATION);
- }
break;
}
--- 521,524 ----
***************
*** 647,651 ****
// Grab the custom file from the remote server if necessary.
#ifdef _AXIS
! if (Main->m_dwUseRemoteScripts)
{
CFileStatus st;
--- 632,636 ----
// Grab the custom file from the remote server if necessary.
#ifdef _AXIS
! if (Main->GetProfileType() == PROFILE_REMOTE)
{
CFileStatus st;
***************
*** 668,672 ****
case 0:
// This is the regular file
! if ( Main->m_dwUseRemoteScripts || csScpPath == "" )
csFilename = TEMPLATE_FILE;
else
--- 653,657 ----
case 0:
// This is the regular file
! if ( Main->GetProfileType() == PROFILE_REMOTE || csScpPath == "" )
csFilename = TEMPLATE_FILE;
else
***************
*** 675,682 ****
case 1:
// This is the custom file
! if ( Main->m_dwUseRemoteScripts )
! csFilename.Format("%s\\%s", Main->m_csRemoteProfile, RMT_TEMPLATE_FILE);
else if ( csScpPath == "" )
! csFilename = Main->m_dwUseRemoteScripts ? RMT_TEMPLATE_FILE : USER_TEMPLATE_FILE;
else
csFilename.Format("%s%s", csScpPath, USER_TEMPLATE_FILE);
--- 660,667 ----
case 1:
// This is the custom file
! if ( Main->GetProfileType() == PROFILE_REMOTE )
! csFilename.Format("%s\\%s", Main->GetProfileString(), RMT_TEMPLATE_FILE);
else if ( csScpPath == "" )
! csFilename = Main->GetProfileType() == PROFILE_REMOTE ? RMT_TEMPLATE_FILE : USER_TEMPLATE_FILE;
else
csFilename.Format("%s%s", csScpPath, USER_TEMPLATE_FILE);
***************
*** 694,702 ****
}
Main->m_log.Add("Unable to open file %s", csFilename);
- if ( i == 0 )
- {
- csMessage.Format("Unable to open file %s for input.", csFilename);
- AfxMessageBox(csMessage, MB_OK | MB_ICONEXCLAMATION);
- }
break;
}
--- 679,682 ----
***************
*** 821,825 ****
this->LoadDefs();
CreateProgressDialog();
! this->LoadFile(Main->m_dwUseRemoteScripts ? RMT_TABLE_FILE : TABLE_FILE, &m_pDlg);
*/
m_bTablesLoaded = true;
--- 801,805 ----
this->LoadDefs();
CreateProgressDialog();
! this->LoadFile(Main->GetProfileType() == PROFILE_REMOTE ? RMT_TABLE_FILE : TABLE_FILE, &m_pDlg);
*/
m_bTablesLoaded = true;
***************
*** 852,856 ****
#ifdef _AXIS
! if (Main->m_dwUseRemoteScripts)
{
CFileStatus st;
--- 832,836 ----
#ifdef _AXIS
! if (Main->GetProfileType() == PROFILE_REMOTE)
{
CFileStatus st;
***************
*** 874,878 ****
case 0:
// This is the regular file
! if ( Main->m_dwUseRemoteScripts || csScpPath == "" )
csFilename = MAP_FILE;
else
--- 854,858 ----
case 0:
// This is the regular file
! if ( Main->GetProfileType() == PROFILE_REMOTE || csScpPath == "" )
csFilename = MAP_FILE;
else
***************
*** 881,886 ****
case 1:
// This is the custom file
! if ( Main->m_dwUseRemoteScripts )
! csFilename.Format("%s\\%s", Main->m_csRemoteProfile, RMT_MAP_FILE);
else if ( csScpPath == "" )
csFilename = USER_MAP_FILE;
--- 861,866 ----
case 1:
// This is the custom file
! if ( Main->GetProfileType() == PROFILE_REMOTE )
! csFilename.Format("%s\\%s", Main->GetProfileString(), RMT_MAP_FILE);
else if ( csScpPath == "" )
csFilename = USER_MAP_FILE;
***************
*** 901,909 ****
}
Main->m_log.Add("Unable to open file %s", csFilename);
- if ( i == 0 )
- {
- csMessage.Format("Unable to open file %s for input.", csFilename);
- AfxMessageBox(csMessage, MB_OK | MB_ICONEXCLAMATION);
- }
break;
}
--- 881,884 ----
***************
*** 1019,1023 ****
#ifdef _AXIS
! if (Main->m_dwUseRemoteScripts)
{
CFileStatus st;
--- 994,998 ----
#ifdef _AXIS
! if (Main->GetProfileType() == PROFILE_REMOTE)
{
CFileStatus st;
***************
*** 1041,1045 ****
case 0:
// This is the regular file
! if ( Main->m_dwUseRemoteScripts || csScpPath == "" )
csFilename = TRIGGER_FILE;
else
--- 1016,1020 ----
case 0:
// This is the regular file
! if ( Main->GetProfileType() == PROFILE_REMOTE || csScpPath == "" )
csFilename = TRIGGER_FILE;
else
***************
*** 1048,1055 ****
case 1:
// This is the custom file
! if ( Main->m_dwUseRemoteScripts )
! csFilename.Format("%s\\%s", Main->m_csRemoteProfile, RMT_TRIGGER_FILE);
else if ( csScpPath == "" )
! csFilename = Main->m_dwUseRemoteScripts ? RMT_TRIGGER_FILE : USER_TRIGGER_FILE;
else
csFilename.Format("%s%s", csScpPath, USER_TRIGGER_FILE);
--- 1023,1030 ----
case 1:
// This is the custom file
! if ( Main->GetProfileType() == PROFILE_REMOTE )
! csFilename.Format("%s\\%s", Main->GetProfileString(), RMT_TRIGGER_FILE);
else if ( csScpPath == "" )
! csFilename = Main->GetProfileType() == PROFILE_REMOTE ? RMT_TRIGGER_FILE : USER_TRIGGER_FILE;
else
csFilename.Format("%s%s", csScpPath, USER_TRIGGER_FILE);
***************
*** 1068,1076 ****
}
Main->m_log.Add("Unable to open file %s", csFilename);
- if ( i == 0 )
- {
- csMessage.Format("Unable to open file %s for input.", csFilename);
- AfxMessageBox(csMessage, MB_OK | MB_ICONEXCLAMATION);
- }
break;
}
--- 1043,1046 ----
***************
*** 1187,1195 ****
{
Main->m_log.Add("Unable to open file %s", i ? USER_LOC_FILE : LOC_FILE );
- if ( i == 0 )
- {
- csMessage.Format("Unable to open file %s for input.", LOC_FILE);
- AfxMessageBox(csMessage, MB_OK | MB_ICONEXCLAMATION);
- }
break;
}
--- 1157,1160 ----
***************
*** 1285,1289 ****
#ifdef _AXIS
! if (Main->m_dwUseRemoteScripts)
{
CFileStatus st;
--- 1250,1254 ----
#ifdef _AXIS
! if (Main->GetProfileType() == PROFILE_REMOTE)
{
CFileStatus st;
***************
*** 1300,1305 ****
CStdioFile csfNames;
! if ( Main->m_dwUseRemoteScripts )
! csFilename.Format("%s\\%s", Main->m_csRemoteProfile, RMT_NAME_FILE);
else if ( csScpPath == "" )
csFilename = NAME_FILE;
--- 1265,1270 ----
CStdioFile csfNames;
! if ( Main->GetProfileType() == PROFILE_REMOTE )
! csFilename.Format("%s\\%s", Main->GetProfileString(), RMT_NAME_FILE);
else if ( csScpPath == "" )
csFilename = NAME_FILE;
***************
*** 1317,1322 ****
}
Main->m_log.Add("Unable to open file %s", csFilename);
- csMessage.Format("Unable to open file %s for input.", csFilename);
- AfxMessageBox(csMessage, MB_OK | MB_ICONEXCLAMATION);
return;
}
--- 1282,1285 ----
***************
*** 1423,1427 ****
#ifdef _AXIS
! if (Main->m_dwUseRemoteScripts)
{
CFileStatus st;
--- 1386,1390 ----
#ifdef _AXIS
! if (Main->GetProfileType() == PROFILE_REMOTE)
{
CFileStatus st;
***************
*** 1438,1443 ****
CStdioFile csfSpeech;
! if ( Main->m_dwUseRemoteScripts )
! csFilename.Format("%s\\%s", Main->m_csRemoteProfile, RMT_SPEECH_FILE);
else if ( csScpPath == "" )
csFilename = SPEECH_FILE;
--- 1401,1406 ----
CStdioFile csfSpeech;
! if ( Main->GetProfileType() == PROFILE_REMOTE )
! csFilename.Format("%s\\%s", Main->GetProfileString(), RMT_SPEECH_FILE);
else if ( csScpPath == "" )
csFilename = SPEECH_FILE;
***************
*** 1455,1460 ****
}
Main->m_log.Add("Unable to open file %s", csFilename);
- csMessage.Format("Unable to open file %s for input.", csFilename);
- AfxMessageBox(csMessage, MB_OK | MB_ICONEXCLAMATION);
return;
}
--- 1418,1421 ----
***************
*** 2015,2023 ****
if ( !csfInput.Open(csFile, CFile::modeRead | CFile::shareDenyNone) )
{
- #if 0
- CString csMessage;
- csMessage.Format("Unable to open script file %s", csFile);
- AfxMessageBox(csMessage, MB_OK | MB_ICONEXCLAMATION);
- #endif
Main->m_log.Add("Unable to open file %s", csFile);
return false;
--- 1976,1979 ----
***************
*** 2528,2532 ****
CreateProgressDialog();
m_bDeleteDialog = false;
! if ( Main->m_dwUseRemoteScripts )
{
#ifdef _AXIS
--- 2484,2488 ----
CreateProgressDialog();
m_bDeleteDialog = false;
! if ( Main->GetProfileType() == PROFILE_REMOTE )
{
#ifdef _AXIS
***************
*** 2582,2586 ****
}
// Some of the resource entries may be directories
! if ( !Main->m_dwUseRemoteScripts )
{
int i = 0;
--- 2538,2542 ----
}
// Some of the resource entries may be directories
! if ( Main->GetProfileType() != PROFILE_REMOTE )
{
int i = 0;
***************
*** 2646,2650 ****
if ( csFilename == "" )
continue;
! if ( Main->m_dwUseRemoteScripts )
{
CString csFile;
--- 2602,2606 ----
if ( csFilename == "" )
continue;
! if ( Main->GetProfileType() == PROFILE_REMOTE )
{
CString csFile;
***************
*** 2672,2684 ****
else
csLoadFile = csFilename;
! if ( Main->m_dwUseRemoteScripts )
csFilename = csLoadFile;
}
else
csLoadFile = csFilename;
! if ( Main->m_dwUseRemoteScripts )
{
csFilename.Replace(':', '!');
! csLoadFile.Format("%s\\%s\\%s", cwd, Main->m_csRemoteProfile, csFilename);
}
CString csTest = csFilename;
--- 2628,2640 ----
else
csLoadFile = csFilename;
! if ( Main->GetProfileType() == PROFILE_REMOTE )
csFilename = csLoadFile;
}
else
csLoadFile = csFilename;
! if ( Main->GetProfileType() == PROFILE_REMOTE )
{
csFilename.Replace(':', '!');
! csLoadFile.Format("%s\\%s\\%s", cwd, Main->GetProfileString(), csFilename);
}
CString csTest = csFilename;
***************
*** 2697,2702 ****
GetPrivateProfileString("SPHERE", "SCPFILES", "", szScriptPath, sizeof(szScriptPath), INI_FILE);
CString csTestPath;
! if ( Main->m_dwUseRemoteScripts )
! csTestPath.Format("%s\\", Main->m_csRemoteProfile);
else
{
--- 2653,2658 ----
GetPrivateProfileString("SPHERE", "SCPFILES", "", szScriptPath, sizeof(szScriptPath), INI_FILE);
CString csTestPath;
! if ( Main->GetProfileType() == PROFILE_REMOTE )
! csTestPath.Format("%s\\", Main->GetProfileString());
else
{
Index: DefEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/DefEditDlg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** DefEditDlg.cpp 1 May 2002 03:33:09 -0000 1.4
--- DefEditDlg.cpp 14 May 2002 20:03:34 -0000 1.5
***************
*** 143,148 ****
return;
}
! if ( Main->m_dwUseRemoteScripts || csScpPath == "")
! csFile = Main->m_dwUseRemoteScripts ? RMT_DEFS_FILE : USER_DEFS_FILE;
else
csFile.Format("%s%s", csScpPath, USER_DEFS_FILE);
--- 143,148 ----
return;
}
! if ( Main->GetProfileType() == PROFILE_REMOTE || csScpPath == "")
! csFile = Main->GetProfileType() == PROFILE_REMOTE ? RMT_DEFS_FILE : USER_DEFS_FILE;
else
csFile.Format("%s%s", csScpPath, USER_DEFS_FILE);
***************
*** 223,227 ****
// Make sure we have the tusdefs.scp file
! if ( Main->m_dwUseRemoteScripts )
{
CRemoteConnection remote;
--- 223,227 ----
// Make sure we have the tusdefs.scp file
! if ( Main->GetProfileType() == PROFILE_REMOTE )
{
CRemoteConnection remote;
***************
*** 271,276 ****
csfDefsFile.Close();
}
! if ( Main->m_dwUseRemoteScripts || csScpPath == "" )
! csFile = Main->m_dwUseRemoteScripts ? RMT_DEFS_FILE : USER_DEFS_FILE;
else
csFile.Format("%s%s", csScpPath, USER_DEFS_FILE);
--- 271,276 ----
csfDefsFile.Close();
}
! if ( Main->GetProfileType() == PROFILE_REMOTE || csScpPath == "" )
! csFile = Main->GetProfileType() == PROFILE_REMOTE ? RMT_DEFS_FILE : USER_DEFS_FILE;
else
csFile.Format("%s%s", csScpPath, USER_DEFS_FILE);
Index: Drewsky.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/Drewsky.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Drewsky.cpp 10 May 2002 19:23:50 -0000 1.11
--- Drewsky.cpp 14 May 2002 20:03:34 -0000 1.12
***************
*** 89,93 ****
#endif
! m_log.Add("Starting %s, built %s, %s", Main->GetVersionTitle(), Main->GetBuildTimestamp());
// Find the path to the UO files
--- 89,93 ----
#endif
! m_log.Add("Starting %s, built %s", Main->GetVersionTitle(), Main->GetBuildTimestamp());
// Find the path to the UO files
***************
*** 107,115 ****
m_dwSpawnMessage = 0;
m_dwStartLauncher = 0;
! m_dwDrawItems = 0;
! m_dw3DRoomView = 0;
! m_dwScaleItems = 0;
m_dwAlwaysOnTop = 0;
! m_dwShowRadar = 0;
m_dwUseRemoteScripts = 0;
m_dwShowSpawnpoints = 0;
--- 107,116 ----
m_dwSpawnMessage = 0;
m_dwStartLauncher = 0;
! m_dwDrawItems = 1;
! m_dwDrawChars = 1;
! m_dw3DRoomView = 1;
! m_dwScaleItems = 1;
m_dwAlwaysOnTop = 0;
! m_dwShowRadar = 1;
m_dwUseRemoteScripts = 0;
m_dwShowSpawnpoints = 0;
***************
*** 184,194 ****
m_csPosition = GetRegistryString("Position");
! m_csRemoteProfile = GetRegistryString("Remote Profile");
! if ( m_csRemoteProfile != "" )
{
CString csKey;
m_log.Add("Retrieving remote profiles");
! csKey.Format("SOFTWARE\\Menasoft\\GM Tools\\Remote Profiles\\%s", m_csRemoteProfile);
m_csUserID = GetRegistryString("Username", "", HKEY_LOCAL_MACHINE, csKey);
m_csPassword = GetRegistryString("Password", "", HKEY_LOCAL_MACHINE, csKey);
--- 185,195 ----
m_csPosition = GetRegistryString("Position");
! m_csProfile = GetRegistryString("Script Profile");
! if ( GetProfileType() == PROFILE_REMOTE )
{
CString csKey;
m_log.Add("Retrieving remote profiles");
! csKey.Format("SOFTWARE\\Menasoft\\GM Tools\\Remote Profiles\\%s", GetProfileString());
m_csUserID = GetRegistryString("Username", "", HKEY_LOCAL_MACHINE, csKey);
m_csPassword = GetRegistryString("Password", "", HKEY_LOCAL_MACHINE, csKey);
***************
*** 312,324 ****
// Read the scripts
m_pScripts = new CScriptObjects;
! if ( !m_bNoScripts )
{
m_log.Add("Loading scripts");
this->m_pScripts->LoadAll();
}
- else
- {
- this->m_pScripts->LoadAll();
- }
m_log.Add("Ready to display main window");
int nResponse = dlg.DoModal();
--- 313,321 ----
// Read the scripts
m_pScripts = new CScriptObjects;
! if ( GetProfileType() != PROFILE_NONE )
{
m_log.Add("Loading scripts");
this->m_pScripts->LoadAll();
}
m_log.Add("Ready to display main window");
int nResponse = dlg.DoModal();
***************
*** 524,526 ****
--- 521,552 ----
csTimestamp.Format("%s %s", __DATE__, __TIME__);
return csTimestamp;
+ }
+
+ CString CDrewskyApp::GetProfileString()
+ {
+ if ( m_csProfile.Find(": ", 0) != -1 )
+ return m_csProfile.Mid(m_csProfile.Find(": ") + 2);
+ else
+ return "";
+ }
+
+ int CDrewskyApp::GetProfileType()
+ {
+ if ( m_csProfile.Find(": ", 0) != -1 )
+ {
+ CString csType;
+ csType = m_csProfile.SpanExcluding(": ");
+ if ( csType.CompareNoCase("Local") == 0 )
+ return PROFILE_LOCAL;
+ if ( csType.CompareNoCase("Remote") == 0 )
+ return PROFILE_REMOTE;
+ }
+ else
+ {
+ if ( m_csProfile.Find("NONE") != -1 )
+ return PROFILE_NONE;
+ if ( m_csProfile.Find("DEFAULT") != -1 )
+ return PROFILE_DEFAULT;
+ }
+ return PROFILE_UNDEFINED;
}
Index: Drewsky.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/Drewsky.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** Drewsky.h 10 May 2002 19:23:50 -0000 1.8
--- Drewsky.h 14 May 2002 20:03:34 -0000 1.9
***************
*** 65,68 ****
--- 65,70 ----
CString GetVersionTitle();
CString GetBuildTimestamp();
+ CString GetProfileString();
+ int GetProfileType();
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");
***************
*** 80,83 ****
--- 82,86 ----
DWORD m_dwStartLauncher;
DWORD m_dwDrawItems;
+ DWORD m_dwDrawChars;
DWORD m_dw3DRoomView;
DWORD m_dwScaleItems;
***************
*** 107,111 ****
CString m_csSpherePort;
CString m_csAxissvrPort;
! CString m_csRemoteProfile;
CString m_csMonPassword;
CRemoteConsole * m_pRConsole;
--- 110,114 ----
CString m_csSpherePort;
CString m_csAxissvrPort;
! CString m_csProfile;
CString m_csMonPassword;
CRemoteConsole * m_pRConsole;
Index: drewsky.rc
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/drewsky.rc,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** drewsky.rc 12 May 2002 16:24:18 -0000 1.34
--- drewsky.rc 14 May 2002 20:03:34 -0000 1.35
***************
*** 1,4 ****
//Microsoft Developer Studio generated resource script.
! // Last compiled 5/12/2002 at 10:22:58
#include "resource.h"
--- 1,4 ----
//Microsoft Developer Studio generated resource script.
! //
#include "resource.h"
***************
*** 622,628 ****
CONTROL "Only load RESOURCE scripts",IDC_RESOURCEONLY,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,100,109,10
! CONTROL "Read from Remote Server",IDC_USEREMOTE,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,173,12,103,10
! LISTBOX IDC_REMOTEPROFILES,174,25,103,71,LBS_SORT |
LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "New",IDC_RP_NEW,179,98,30,14
--- 622,626 ----
CONTROL "Only load RESOURCE scripts",IDC_RESOURCEONLY,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,100,109,10
! LISTBOX IDC_REMOTEPROFILES,174,12,103,84,LBS_SORT |
LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "New",IDC_RP_NEW,179,98,30,14
***************
*** 642,646 ****
PUSHBUTTON "Refresh Categories",IDC_REFRESHCATEGORIES,369,29,85,13
GROUPBOX "Actions",IDC_STATIC,283,2,75,112
! GROUPBOX "Remote Profiles",IDC_STATIC,168,2,113,112
LTEXT "NPC Spawn Color",IDC_STATIC,374,69,58,8,NOT WS_GROUP
LTEXT "Item Spawn Color",IDC_STATIC,374,80,56,8,NOT WS_GROUP
--- 640,644 ----
PUSHBUTTON "Refresh Categories",IDC_REFRESHCATEGORIES,369,29,85,13
GROUPBOX "Actions",IDC_STATIC,283,2,75,112
! GROUPBOX "Profiles",IDC_STATIC,168,2,113,112
LTEXT "NPC Spawn Color",IDC_STATIC,374,69,58,8,NOT WS_GROUP
LTEXT "Item Spawn Color",IDC_STATIC,374,80,56,8,NOT WS_GROUP
***************
*** 2249,2262 ****
END
! IDD_ADDITIONAL_SETTINGS DIALOG DISCARDABLE 0, 0, 374, 270
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Axis Configuration"
FONT 8, "MS Sans Serif"
BEGIN
! DEFPUSHBUTTON "OK",IDOK,317,7,50,14
! PUSHBUTTON "Cancel",IDCANCEL,317,24,50,14
! GROUPBOX "Display Settings",IDC_STATIC,7,120,170,143
! GROUPBOX "Basic Axis Settings",IDC_STATIC,7,7,170,111
! GROUPBOX "Script Profiles",IDC_STATIC,180,39,187,224
CONTROL "Display message when spawnpoint is initialized",
IDC_AS_SPAWNMSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,
--- 2247,2260 ----
END
! IDD_ADDITIONAL_SETTINGS DIALOG DISCARDABLE 0, 0, 378, 310
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Axis Configuration"
FONT 8, "MS Sans Serif"
BEGIN
! DEFPUSHBUTTON "OK",IDOK,321,7,50,14
! PUSHBUTTON "Cancel",IDCANCEL,321,24,50,14
! GROUPBOX "Display Settings",IDC_STATIC,7,133,170,176
! GROUPBOX "Basic Axis Settings",IDC_STATIC,7,7,169,122
! GROUPBOX "Script Profiles",IDC_STATIC,184,44,187,259
CONTROL "Display message when spawnpoint is initialized",
IDC_AS_SPAWNMSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,
***************
*** 2281,2309 ****
CONTROL "Display pictures in Spawn Tab",IDC_AS_SHOWCHARS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,10,106,111,10
! GROUPBOX "Default Ultima Online Client file",IDC_STATIC,12,130,
162,25
! GROUPBOX "Default Mulfile Path",IDC_STATIC,12,156,162,38
CONTROL "Use same path as default client",
IDC_AS_USESAMEPATHASCLIENT,"Button",BS_AUTOCHECKBOX |
! WS_TABSTOP,16,181,131,11
! GROUPBOX "Mulfile Overrides",IDC_STATIC,12,195,162,64
! PUSHBUTTON "Browse",IDC_AS_CLIENTBROWSE,140,138,30,13
! PUSHBUTTON "Browse",IDC_AS_MULBROWSE,140,166,30,13
CONTROL "List1",IDC_AS_CUSTOMMULS,"SysListView32",LVS_REPORT |
! LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,15,205,155,51
! LTEXT "Default Client EXE",IDC_AS_DEFUALTCLIENT,16,139,108,10,
SS_CENTERIMAGE
! LTEXT "Default Mulfile Path",IDC_AS_DEFUALTMULPATH,16,168,108,
10,SS_CENTERIMAGE
! LTEXT "Profiles",IDC_STATIC,185,47,24,8
! LISTBOX IDC_AS_PROFILES,184,55,180,55,LBS_SORT |
LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
! LTEXT "Available Scripts",IDC_STATIC,187,126,53,8
! PUSHBUTTON "New",IDC_AS_NEWPROFILE,208,113,33,11
! PUSHBUTTON "Edit",IDC_AS_EDITPROFILE,257,113,33,11
! PUSHBUTTON "Delete",IDC_AS_DELETEPROFILE,306,113,33,11
CONTROL "Tree1",IDC_AS_AVAILABLESCRIPTS,"SysTreeView32",
TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT |
! TVS_CHECKBOXES | WS_BORDER | WS_TABSTOP,186,134,178,127
END
--- 2279,2309 ----
CONTROL "Display pictures in Spawn Tab",IDC_AS_SHOWCHARS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,10,106,111,10
! GROUPBOX "Default Ultima Online Client file",IDC_STATIC,12,142,
162,25
! GROUPBOX "Default Mulfile Path",IDC_STATIC,12,168,162,38
CONTROL "Use same path as default client",
IDC_AS_USESAMEPATHASCLIENT,"Button",BS_AUTOCHECKBOX |
! WS_TABSTOP,16,193,131,11
! GROUPBOX "Mulfile Overrides",IDC_STATIC,12,206,162,93
! PUSHBUTTON "Browse",IDC_AS_CLIENTBROWSE,140,150,30,13
! PUSHBUTTON "Browse",IDC_AS_MULBROWSE,140,178,30,13
CONTROL "List1",IDC_AS_CUSTOMMULS,"SysListView32",LVS_REPORT |
! LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,15,216,155,80
! LTEXT "Default Client EXE",IDC_AS_DEFUALTCLIENT,16,151,108,10,
SS_CENTERIMAGE
! LTEXT "Default Mulfile Path",IDC_AS_DEFUALTMULPATH,16,180,108,
10,SS_CENTERIMAGE
! LTEXT "Profiles",IDC_STATIC,189,53,24,8
! LISTBOX IDC_AS_PROFILES,188,61,180,55,LBS_SORT |
LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
! LTEXT "Available Scripts",IDC_STATIC,191,131,53,8
! PUSHBUTTON "New",IDC_AS_NEWPROFILE,212,119,33,11
! PUSHBUTTON "Edit",IDC_AS_EDITPROFILE,261,119,33,11
! PUSHBUTTON "Delete",IDC_AS_DELETEPROFILE,310,119,33,11
CONTROL "Tree1",IDC_AS_AVAILABLESCRIPTS,"SysTreeView32",
TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT |
! TVS_CHECKBOXES | WS_BORDER | WS_TABSTOP,190,140,178,160
! CONTROL "Allow Multiple Instances of Axis",IDC_AS_ALLOWMULTIPLE,
! "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,116,112,9
END
***************
*** 2886,2892 ****
BEGIN
LEFTMARGIN, 7
! RIGHTMARGIN, 367
TOPMARGIN, 7
! BOTTOMMARGIN, 263
END
END
--- 2886,2892 ----
BEGIN
LEFTMARGIN, 7
! RIGHTMARGIN, 371
TOPMARGIN, 7
! BOTTOMMARGIN, 303
END
END
Index: EditorTab.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/EditorTab.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** EditorTab.cpp 1 May 2002 03:33:10 -0000 1.4
--- EditorTab.cpp 14 May 2002 20:03:34 -0000 1.5
***************
*** 176,180 ****
CPropertyPage::OnShowWindow(bShow, nStatus);
! //this->m_cbRawEdit.ShowWindow( Main->m_dwUseRemoteScripts ? SW_HIDE : SW_SHOW );
}
--- 176,180 ----
CPropertyPage::OnShowWindow(bShow, nStatus);
! //this->m_cbRawEdit.ShowWindow( Main->GetProfileType() == PROFILE_REMOTE ? SW_HIDE : SW_SHOW );
}
Index: ItemScriptEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/ItemScriptEditDlg.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ItemScriptEditDlg.cpp 1 May 2002 03:33:10 -0000 1.5
--- ItemScriptEditDlg.cpp 14 May 2002 20:03:34 -0000 1.6
***************
*** 883,887 ****
}
}
! if ( Main->m_dwUseRemoteScripts )
{
CRemoteConnection remote;
--- 883,887 ----
}
}
! if ( Main->GetProfileType() == PROFILE_REMOTE )
{
CRemoteConnection remote;
Index: MISCTAB.CPP
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/MISCTAB.CPP,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** MISCTAB.CPP 10 May 2002 19:23:50 -0000 1.10
--- MISCTAB.CPP 14 May 2002 20:03:34 -0000 1.11
***************
*** 933,937 ****
{
Main->m_log.Add("Trying to start Sphere server");
! if ( Main->m_dwUseRemoteScripts )
{
CRemoteConnection remote;
--- 933,937 ----
{
Main->m_log.Add("Trying to start Sphere server");
! if ( Main->GetProfileType() == PROFILE_REMOTE )
{
CRemoteConnection remote;
Index: remoteconnection.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/remoteconnection.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** remoteconnection.cpp 10 May 2002 00:05:45 -0000 1.18
--- remoteconnection.cpp 14 May 2002 20:03:34 -0000 1.19
***************
*** 432,436 ****
csRemoteFileName = csFile;
if ( csLocalFile == "" )
! csLocalFile.Format("%s\\%s", Main->m_csRemoteProfile, csRemoteFileName);
csLocalFile.Replace(':', '!');
csLocalFile.Replace('/', '\\');
--- 432,436 ----
csRemoteFileName = csFile;
if ( csLocalFile == "" )
! csLocalFile.Format("%s\\%s", Main->GetProfileString(), csRemoteFileName);
csLocalFile.Replace(':', '!');
csLocalFile.Replace('/', '\\');
***************
*** 632,637 ****
break;
default:
! if (csFile.Find(Main->m_csRemoteProfile) != -1 )
! csFileName = csFile.Mid(csFile.Find(Main->m_csRemoteProfile) + Main->m_csRemoteProfile.GetLength() + 1);
else
csFileName = csFile;
--- 632,637 ----
break;
default:
! if (csFile.Find(Main->GetProfileString()) != -1 )
! csFileName = csFile.Mid(csFile.Find(Main->GetProfileString()) + Main->GetProfileString().GetLength() + 1);
else
csFileName = csFile;
***************
*** 916,923 ****
// Try to read files that are already here...
CString csFile;
! csFile.Format("%s\\%s", Main->m_csRemoteProfile, INI_FILE);
Main->m_pScripts->LoadFile(csFile);
Main->m_pScripts->m_config.Read();
! csFile.Format("%s\\%s", Main->m_csRemoteProfile, TABLE_FILE);
if ( !Main->m_pScripts->LoadFile(csFile) )
{
--- 916,923 ----
// Try to read files that are already here...
CString csFile;
! csFile.Format("%s\\%s", Main->GetProfileString(), INI_FILE);
Main->m_pScripts->LoadFile(csFile);
Main->m_pScripts->m_config.Read();
! csFile.Format("%s\\%s", Main->GetProfileString(), TABLE_FILE);
if ( !Main->m_pScripts->LoadFile(csFile) )
{
***************
*** 925,929 ****
if ( csScpPath.GetLength() > 0 && ( csScpPath.GetAt(csScpPath.GetLength() - 1) == '\\' || csScpPath.GetAt(csScpPath.GetLength() -1) == '/' ) )
csScpPath.SetAt(csScpPath.GetLength() - 1, 0x00);
! csFile.Format("%s\\%s\\%s", Main->m_csRemoteProfile, csScpPath, TABLE_FILE);
Main->m_pScripts->LoadFile(csFile);
}
--- 925,929 ----
if ( csScpPath.GetLength() > 0 && ( csScpPath.GetAt(csScpPath.GetLength() - 1) == '\\' || csScpPath.GetAt(csScpPath.GetLength() -1) == '/' ) )
csScpPath.SetAt(csScpPath.GetLength() - 1, 0x00);
! csFile.Format("%s\\%s\\%s", Main->GetProfileString(), csScpPath, TABLE_FILE);
Main->m_pScripts->LoadFile(csFile);
}
***************
*** 941,945 ****
unsigned int iChk = atoi(szBuffer);
CString csFileName;
! csFileName.Format("%s\\%s", Main->m_csRemoteProfile, INI_FILE);
csMessage.Format("Checking for an updated version of %s", INI_FILE);
if ( m_pDlg )
--- 941,945 ----
unsigned int iChk = atoi(szBuffer);
CString csFileName;
! csFileName.Format("%s\\%s", Main->GetProfileString(), INI_FILE);
csMessage.Format("Checking for an updated version of %s", INI_FILE);
if ( m_pDlg )
***************
*** 958,963 ****
Receive(&szBuffer[0], sizeof(szBuffer));
iChk = atoi(szBuffer);
! csFileName.Format("%s\\%s", Main->m_csRemoteProfile, TABLE_FILE);
! CreateDirectory(Main->m_csRemoteProfile, NULL);
iTest = GetChecksum(csFileName);
if ( iChk != iTest )
--- 958,963 ----
Receive(&szBuffer[0], sizeof(szBuffer));
iChk = atoi(szBuffer);
! csFileName.Format("%s\\%s", Main->GetProfileString(), TABLE_FILE);
! CreateDirectory(Main->GetProfileString(), NULL);
iTest = GetChecksum(csFileName);
if ( iChk != iTest )
***************
*** 977,981 ****
sprintf(szCmd, "GFCS%s\\%s", csScpPath, TABLE_FILE);
csRemoteFile.Format("%s\\%s", csScpPath, TABLE_FILE);
! csFileName.Format("%s\\%s\\%s", Main->m_csRemoteProfile, csScpPath, TABLE_FILE);
csMessage.Format("Checking for an updated version of %s", TABLE_FILE);
if ( m_pDlg )
--- 977,981 ----
sprintf(szCmd, "GFCS%s\\%s", csScpPath, TABLE_FILE);
csRemoteFile.Format("%s\\%s", csScpPath, TABLE_FILE);
! csFileName.Format("%s\\%s\\%s", Main->GetProfileString(), csScpPath, TABLE_FILE);
csMessage.Format("Checking for an updated version of %s", TABLE_FILE);
if ( m_pDlg )
***************
*** 999,1003 ****
memset(&szScriptPath[0], 0x00, sizeof(szScriptPath));
CString csConfigFile;
! csConfigFile.Format("%s\\%s", Main->m_csRemoteProfile, INI_FILE);
GetPrivateProfileString("SPHERE", "SCPFILES", "", &szScriptPath[0], sizeof(szScriptPath), csConfigFile);
*/
--- 999,1003 ----
memset(&szScriptPath[0], 0x00, sizeof(szScriptPath));
CString csConfigFile;
! csConfigFile.Format("%s\\%s", Main->GetProfileString(), INI_FILE);
GetPrivateProfileString("SPHERE", "SCPFILES", "", &szScriptPath[0], sizeof(szScriptPath), csConfigFile);
*/
***************
*** 1040,1048 ****
if ( csFile.Find('\\') == -1 )
{
! csLocalFile.Format("%s\\%s\\%s", Main->m_csRemoteProfile, csScpPath, csFile);
csFilename.Format("%s\\%s", csScpPath, csFilename);
}
else
! csLocalFile.Format("%s\\%s", Main->m_csRemoteProfile, csFile);
sprintf(szCmd, "GFCS%s", csFilename);
Send(szCmd, strlen(szCmd));
--- 1040,1048 ----
if ( csFile.Find('\\') == -1 )
{
! csLocalFile.Format("%s\\%s\\%s", Main->GetProfileString(), csScpPath, csFile);
csFilename.Format("%s\\%s", csScpPath, csFilename);
}
else
! csLocalFile.Format("%s\\%s", Main->GetProfileString(), csFile);
sprintf(szCmd, "GFCS%s", csFilename);
Send(szCmd, strlen(szCmd));
Index: RemoteConsole.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/RemoteConsole.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** RemoteConsole.cpp 10 May 2002 19:22:47 -0000 1.8
--- RemoteConsole.cpp 14 May 2002 20:03:35 -0000 1.9
***************
*** 44,48 ****
CString csSavePath;
// Try to find out where to connect to
! if (Main->m_dwUseRemoteScripts)
{
m_csHostAddress = Main->m_csServerIP;
--- 44,48 ----
CString csSavePath;
// Try to find out where to connect to
! if (Main->GetProfileType() == PROFILE_REMOTE)
{
m_csHostAddress = Main->m_csServerIP;
***************
*** 504,516 ****
void CRemoteConsole::Pause()
{
! // Check first to see if it is connected
! if ( ! this->m_bIsConnected )
! Reconnect();
! m_bCommandPending = true;
if ( this->m_bIsConnected )
{
- this->m_csCommand.Format( "R%c", 0x0d );
int i = 0;
! while (m_bCommandPending && i < 100)
{
Sleep(100);
--- 504,513 ----
void CRemoteConsole::Pause()
{
! this->m_csCommand.Format( "R%c", 0x0d );
! this->m_bCommandPending = true;
if ( this->m_bIsConnected )
{
int i = 0;
! while(this->m_bCommandPending && i < 100)
{
Sleep(100);
***************
*** 521,525 ****
{
CString csMessage;
! csMessage.Format("Axis is not connected to the Sphere Server.\nIf it is running, please pause/resync it manually.\n\nTo pause/resync the Sphere server, type 'R' at the console.\nIf it ins't running, ignore this message.");
AfxMessageBox( csMessage, MB_OK | MB_ICONEXCLAMATION );
m_bCommandPending = false;
--- 518,522 ----
{
CString csMessage;
! csMessage.Format("Axis is not connected to the Sphere Server.\nIf it is running, please pause/resync it manually.\n\nTo pause/resync the Sphere server, type 'R' at the console.\nIf it isn't running, ignore this message.");
AfxMessageBox( csMessage, MB_OK | MB_ICONEXCLAMATION );
m_bCommandPending = false;
Index: RemoteFileDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/RemoteFileDlg.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** RemoteFileDlg.cpp 1 May 2002 03:33:10 -0000 1.5
--- RemoteFileDlg.cpp 14 May 2002 20:03:35 -0000 1.6
***************
*** 117,121 ****
else
m_csRemoteFile.Format("%s\\%s", m_csPath, m_csFilename);
! m_csFilename.Format("%s\\%s", Main->m_csRemoteProfile, m_csRemoteFile);
//m_csFilename.Replace("\\", "_");
//m_csFilename.Replace(".", "-");
--- 117,121 ----
else
m_csRemoteFile.Format("%s\\%s", m_csPath, m_csFilename);
! m_csFilename.Format("%s\\%s", Main->GetProfileString(), m_csRemoteFile);
//m_csFilename.Replace("\\", "_");
//m_csFilename.Replace(".", "-");
Index: resource.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/resource.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** resource.h 10 May 2002 19:23:50 -0000 1.24
--- resource.h 14 May 2002 20:03:35 -0000 1.25
***************
*** 1276,1279 ****
--- 1276,1280 ----
#define IDC_AS_DEFUALTMULPATH 1396
#define IDC_AS_AVAILABLESCRIPTS 1398
+ #define IDC_AS_ALLOWMULTIPLE 1399
#define IDM_RC_START_LOGGING 32779
#define IDM_RC_STOP_LOGGING 32780
***************
*** 1310,1314 ****
#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
--- 1311,1315 ----
#define _APS_NEXT_RESOURCE_VALUE 234
#define _APS_NEXT_COMMAND_VALUE 32809
! #define _APS_NEXT_CONTROL_VALUE 1400
#define _APS_NEXT_SYMED_VALUE 101
#endif
Index: ScriptEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/ScriptEditDlg.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ScriptEditDlg.cpp 1 May 2002 03:33:10 -0000 1.5
--- ScriptEditDlg.cpp 14 May 2002 20:03:35 -0000 1.6
***************
*** 98,102 ****
{
CDialog::OnInitDialog();
! if ( Main->m_dwUseRemoteScripts )
{
CRemoteFileDlg dlg;
--- 98,102 ----
{
CDialog::OnInitDialog();
! if ( Main->GetProfileType() == PROFILE_REMOTE )
{
CRemoteFileDlg dlg;
***************
*** 177,181 ****
else
pConsole = new (CRemoteConsole);
! if ( !Main->m_dwUseRemoteScripts )
pConsole->Pause();
--- 177,181 ----
else
pConsole = new (CRemoteConsole);
! if ( Main->GetProfileType() != PROFILE_REMOTE )
pConsole->Pause();
***************
*** 201,205 ****
}
}
! if ( Main->m_dwUseRemoteScripts )
{
CRemoteConnection remote;
--- 201,205 ----
}
}
! if ( Main->GetProfileType() == PROFILE_REMOTE )
{
CRemoteConnection remote;
***************
*** 207,211 ****
CFile::Remove(m_csFilename);
}
! if ( !Main->m_dwUseRemoteScripts )
pConsole->Resync();
if ( bDeleteConsole )
--- 207,211 ----
CFile::Remove(m_csFilename);
}
! if ( Main->GetProfileType() != PROFILE_REMOTE )
pConsole->Resync();
if ( bDeleteConsole )
***************
*** 216,220 ****
void CScriptEditDlg::OnCancel()
{
! if ( Main->m_dwUseRemoteScripts && m_csFilename != "" ...
[truncated message content] |
|
From: Philip E. <pes...@us...> - 2002-05-12 18:58:23
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv22138
Modified Files:
Drewsky.dsp
Added Files:
install.bat
Log Message:
Incorporating patches by Phantom (piotrbanasik)
--- NEW FILE: install.bat ---
@echo off
rem %1 is the build type (to get the path to the files)
rem %2 is the build type for the OCX controls
rem %3 is the build type for AMPATCH.exe
echo Installing...
md install
copy %1\axis.exe install\
copy axis.txt install\
copy hlp\axis.hlp install\
copy hlp\axis.cnt install\
copy ..\axissvr\gwhogsvr\axissvr.exe install\
copy ..\axissvr\axissvr.cfg install\
copy ..\UOMap\%2\UOMap.ocx install\
copy ..\UOArt\%2\UOArt.ocx install\
copy AMPatch\%3\AMPatch.exe install\
copy LICENSE install\
Index: Drewsky.dsp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/Drewsky.dsp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** Drewsky.dsp 12 May 2002 16:23:59 -0000 1.23
--- Drewsky.dsp 12 May 2002 18:58:18 -0000 1.24
***************
*** 59,63 ****
# Begin Special Build Tool
SOURCE="$(InputPath)"
! PostBuild_Cmds=copy Release\axis.exe install\ copy axis.txt install\ copy hlp\axis.hlp install\ copy hlp\axis.cnt install\ copy ..\axissvr\gwhogsvr\axissvr.exe install\ copy ..\axissvr\axissvr.cfg install\ copy ..\UOMap\Release\UOMap.ocx install\ copy ..\UOArt\Release\UOArt.ocx install\ copy AMPatch\Release\AMPatch.exe install\ copy LICENSE install\
# End Special Build Tool
--- 59,63 ----
# Begin Special Build Tool
SOURCE="$(InputPath)"
! PostBuild_Cmds=install.bat Release Release Release
# End Special Build Tool
***************
*** 118,122 ****
SOURCE="$(InputPath)"
PostBuild_Desc=Moving files to install directory
! PostBuild_Cmds=copy Release\axis.exe install\ copy axis.txt install\ copy hlp\axis.hlp install\ copy hlp\axis.cnt install\ copy ..\axissvr\gwhogsvr\axissvr.exe install\ copy ..\axissvr\axissvr.cfg install\
# End Special Build Tool
--- 118,122 ----
SOURCE="$(InputPath)"
PostBuild_Desc=Moving files to install directory
! PostBuild_Cmds=install.bat Release Release Release
# End Special Build Tool
***************
*** 977,985 ****
# End Target
# End Project
- # Section drewsky : {2B360722-F116-4004-A71A-5E14B4C4873E}
- # 2:5:Class:CUOMap
- # 2:10:HeaderFile:uomap.h
- # 2:8:ImplFile:uomap.cpp
- # End Section
# Section drewsky : {EF8782A5-4E77-4990-A8C7-0E28C52E90CF}
# 2:5:Class:CUOArt
--- 977,980 ----
***************
*** 987,996 ****
# 2:8:ImplFile:uoart.cpp
# End Section
# Section drewsky : {0904F7B3-2339-44C9-857C-6EB6CFEFA3B6}
# 2:21:DefaultSinkHeaderFile:uoart.h
# 2:16:DefaultSinkClass:CUOArt
# End Section
! # Section drewsky : {2AC21540-4C63-4663-BF24-D1DBD9205223}
! # 2:21:DefaultSinkHeaderFile:uomap.h
! # 2:16:DefaultSinkClass:CUOMap
# End Section
--- 982,996 ----
# 2:8:ImplFile:uoart.cpp
# End Section
+ # Section drewsky : {2AC21540-4C63-4663-BF24-D1DBD9205223}
+ # 2:21:DefaultSinkHeaderFile:uomap.h
+ # 2:16:DefaultSinkClass:CUOMap
+ # End Section
# Section drewsky : {0904F7B3-2339-44C9-857C-6EB6CFEFA3B6}
# 2:21:DefaultSinkHeaderFile:uoart.h
# 2:16:DefaultSinkClass:CUOArt
# End Section
! # Section drewsky : {2B360722-F116-4004-A71A-5E14B4C4873E}
! # 2:5:Class:CUOMap
! # 2:10:HeaderFile:uomap.h
! # 2:8:ImplFile:uomap.cpp
# End Section
|
|
From: Philip E. <pes...@us...> - 2002-05-12 18:58:23
|
Update of /cvsroot/sphere-axis/Axis/HLP In directory usw-pr-cvs1:/tmp/cvs-serv22138/HLP Modified Files: Gwhog.hpj Log Message: Incorporating patches by Phantom (piotrbanasik) Index: Gwhog.hpj =================================================================== RCS file: /cvsroot/sphere-axis/Axis/HLP/Gwhog.hpj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Gwhog.hpj 3 Aug 2001 05:44:12 -0000 1.3 --- Gwhog.hpj 12 May 2002 18:58:18 -0000 1.4 *************** *** 55,58 **** [MAP] ! #include <d:\Program Files\Microsoft Visual Studio\VC98\MFC\include\afxhelp.hm> ! #include <d:\CVS\axis\hlp\gwhog.hm> --- 55,57 ---- [MAP] ! #include gwhog.hm |
|
From: Philip E. <pes...@us...> - 2002-05-12 16:24:22
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv17012
Modified Files:
drewsky.rc
Log Message:
Updated version number
Index: drewsky.rc
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/drewsky.rc,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** drewsky.rc 10 May 2002 19:29:25 -0000 1.33
--- drewsky.rc 12 May 2002 16:24:18 -0000 1.34
***************
*** 1,4 ****
//Microsoft Developer Studio generated resource script.
! // Last compiled 5/10/2002 at 13:24:35
#include "resource.h"
--- 1,4 ----
//Microsoft Developer Studio generated resource script.
! // Last compiled 5/12/2002 at 10:22:58
#include "resource.h"
***************
*** 2256,2309 ****
DEFPUSHBUTTON "OK",IDOK,317,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,317,24,50,14
! GROUPBOX "Display Settings",IDC_STATIC,7,120,156,143
! GROUPBOX "Basic Axis Settings",IDC_STATIC,7,7,156,111
! GROUPBOX "Script Profiles",IDC_STATIC,166,39,201,224
CONTROL "Display message when spawnpoint is initialized",
IDC_AS_SPAWNMSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,
! 16,152,9
CONTROL "Startup with launcher tab in focus",
IDC_AS_STARTLAUNCHER,"Button",BS_AUTOCHECKBOX |
! WS_TABSTOP,10,26,152,9
CONTROL "Display pictures in Item Generator",IDC_AS_DISPLAYITEMS,
! "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,36,152,9
CONTROL "Scale pictures of tall items",IDC_AS_SCALE,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,10,46,152,9
CONTROL "Always on top",IDC_AS_ONTOP,"Button",BS_AUTOCHECKBOX |
! WS_TABSTOP,10,56,152,9
CONTROL "Item Generator 3D Room View",IDC_AS_3DROOMVIEW,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,10,66,152,9
CONTROL "Show Radar Map in Travel Guide",IDC_AS_RADAR,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,10,76,152,9
CONTROL "Allow Close from system menu",IDC_AS_SYSCLOSE,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,10,86,152,9
CONTROL "Show Spawnpoints on Radar Map",IDC_AS_SHOWSPAWNS,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,10,96,152,9
CONTROL "Display pictures in Spawn Tab",IDC_AS_SHOWCHARS,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,10,106,152,9
GROUPBOX "Default Ultima Online Client file",IDC_STATIC,12,130,
! 146,25
! GROUPBOX "Default Mulfile Path",IDC_STATIC,12,156,146,38
CONTROL "Use same path as default client",
IDC_AS_USESAMEPATHASCLIENT,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,16,181,131,11
! GROUPBOX "Mulfile Overrides",IDC_STATIC,12,195,146,64
! PUSHBUTTON "Browse",IDC_AS_CLIENTBROWSE,125,138,30,13
! PUSHBUTTON "Browse",IDC_AS_MULBROWSE,125,166,30,13
CONTROL "List1",IDC_AS_CUSTOMMULS,"SysListView32",LVS_REPORT |
! LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,15,205,139,51
LTEXT "Default Client EXE",IDC_AS_DEFUALTCLIENT,16,139,108,10,
SS_CENTERIMAGE
LTEXT "Default Mulfile Path",IDC_AS_DEFUALTMULPATH,16,168,108,
10,SS_CENTERIMAGE
! LTEXT "Profiles",IDC_STATIC,172,47,24,8
! LISTBOX IDC_AS_PROFILES,171,55,190,55,LBS_SORT |
LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
! LTEXT "Available Scripts",IDC_STATIC,174,126,53,8
! PUSHBUTTON "New",IDC_AS_NEWPROFILE,195,113,33,11
! PUSHBUTTON "Edit",IDC_AS_EDITPROFILE,244,113,33,11
! PUSHBUTTON "Delete",IDC_AS_DELETEPROFILE,293,113,33,11
CONTROL "Tree1",IDC_AS_AVAILABLESCRIPTS,"SysTreeView32",
TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT |
! TVS_CHECKBOXES | WS_BORDER | WS_TABSTOP,173,134,191,127
END
--- 2256,2309 ----
DEFPUSHBUTTON "OK",IDOK,317,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,317,24,50,14
! GROUPBOX "Display Settings",IDC_STATIC,7,120,170,143
! GROUPBOX "Basic Axis Settings",IDC_STATIC,7,7,170,111
! GROUPBOX "Script Profiles",IDC_STATIC,180,39,187,224
CONTROL "Display message when spawnpoint is initialized",
IDC_AS_SPAWNMSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,
! 16,163,10
CONTROL "Startup with launcher tab in focus",
IDC_AS_STARTLAUNCHER,"Button",BS_AUTOCHECKBOX |
! WS_TABSTOP,10,26,121,10
CONTROL "Display pictures in Item Generator",IDC_AS_DISPLAYITEMS,
! "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,36,121,10
CONTROL "Scale pictures of tall items",IDC_AS_SCALE,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,10,46,97,10
CONTROL "Always on top",IDC_AS_ONTOP,"Button",BS_AUTOCHECKBOX |
! WS_TABSTOP,10,56,60,10
CONTROL "Item Generator 3D Room View",IDC_AS_3DROOMVIEW,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,10,66,112,10
CONTROL "Show Radar Map in Travel Guide",IDC_AS_RADAR,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,10,76,121,10
CONTROL "Allow Close from system menu",IDC_AS_SYSCLOSE,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,10,86,110,10
CONTROL "Show Spawnpoints on Radar Map",IDC_AS_SHOWSPAWNS,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,10,96,124,10
CONTROL "Display pictures in Spawn Tab",IDC_AS_SHOWCHARS,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,10,106,111,10
GROUPBOX "Default Ultima Online Client file",IDC_STATIC,12,130,
! 162,25
! GROUPBOX "Default Mulfile Path",IDC_STATIC,12,156,162,38
CONTROL "Use same path as default client",
IDC_AS_USESAMEPATHASCLIENT,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,16,181,131,11
! GROUPBOX "Mulfile Overrides",IDC_STATIC,12,195,162,64
! PUSHBUTTON "Browse",IDC_AS_CLIENTBROWSE,140,138,30,13
! PUSHBUTTON "Browse",IDC_AS_MULBROWSE,140,166,30,13
CONTROL "List1",IDC_AS_CUSTOMMULS,"SysListView32",LVS_REPORT |
! LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,15,205,155,51
LTEXT "Default Client EXE",IDC_AS_DEFUALTCLIENT,16,139,108,10,
SS_CENTERIMAGE
LTEXT "Default Mulfile Path",IDC_AS_DEFUALTMULPATH,16,168,108,
10,SS_CENTERIMAGE
! LTEXT "Profiles",IDC_STATIC,185,47,24,8
! LISTBOX IDC_AS_PROFILES,184,55,180,55,LBS_SORT |
LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
! LTEXT "Available Scripts",IDC_STATIC,187,126,53,8
! PUSHBUTTON "New",IDC_AS_NEWPROFILE,208,113,33,11
! PUSHBUTTON "Edit",IDC_AS_EDITPROFILE,257,113,33,11
! PUSHBUTTON "Delete",IDC_AS_DELETEPROFILE,306,113,33,11
CONTROL "Tree1",IDC_AS_AVAILABLESCRIPTS,"SysTreeView32",
TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT |
! TVS_CHECKBOXES | WS_BORDER | WS_TABSTOP,186,134,178,127
END
***************
*** 2316,2321 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 0,13,1,10
! PRODUCTVERSION 0,13,1,10
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 2316,2321 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 0,13,1,11
! PRODUCTVERSION 0,13,1,11
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 2335,2339 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "axis MFC Application\0"
! VALUE "FileVersion", "0, 13, 1, 10\0"
VALUE "InternalName", "axis\0"
VALUE "LegalCopyright", "Copyright (C) 1998-2002\0"
--- 2335,2339 ----
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"
***************
*** 2342,2346 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Axis\0"
! VALUE "ProductVersion", "0, 13, 1, 10\0"
VALUE "SpecialBuild", "\0"
END
--- 2342,2346 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Axis\0"
! VALUE "ProductVersion", "0, 13, 1, 11\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: Philip E. <pes...@us...> - 2002-05-12 16:24:06
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv16891
Modified Files:
Drewsky.dsp
Added Files:
AdditionalSettingsDlg.cpp AdditionalSettingsDlg.h
Log Message:
adding two new files and fixed missing library
--- NEW FILE: AdditionalSettingsDlg.cpp ---
// AdditionalSettingsDlg.cpp : implementation file
//
#include "stdafx.h"
#include "drewsky.h"
#include "AdditionalSettingsDlg.h"
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
static char THIS_FILE[] = __FILE__;
#endif
/////////////////////////////////////////////////////////////////////////////
// CAdditionalSettingsDlg dialog
CAdditionalSettingsDlg::CAdditionalSettingsDlg(CWnd* pParent /*=NULL*/)
: CDialog(CAdditionalSettingsDlg::IDD, pParent)
{
//{{AFX_DATA_INIT(CAdditionalSettingsDlg)
m_b3DRoomView = FALSE;
m_bDisplayItems = FALSE;
m_bAlwaysOnTop = FALSE;
m_bShowRadarMap = FALSE;
m_bScaleItems = FALSE;
m_bShowChars = FALSE;
m_bShowSpawns = FALSE;
m_bSpawnMessage = FALSE;
m_bStartLauncher = FALSE;
m_bSysClose = FALSE;
//}}AFX_DATA_INIT
}
void CAdditionalSettingsDlg::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CAdditionalSettingsDlg)
DDX_Control(pDX, IDC_AS_USESAMEPATHASCLIENT, m_cbMulPathFromClient);
DDX_Control(pDX, IDC_AS_PROFILES, m_clbProfiles);
DDX_Control(pDX, IDC_AS_NEWPROFILE, m_cbNewProfile);
DDX_Control(pDX, IDC_AS_MULBROWSE, m_cbMulBrowse);
DDX_Control(pDX, IDC_AS_EDITPROFILE, m_cbEditProfile);
DDX_Control(pDX, IDC_AS_DELETEPROFILE, m_cbDeleteProfile);
DDX_Control(pDX, IDC_AS_DEFUALTMULPATH, m_csDefaultMulPath);
DDX_Control(pDX, IDC_AS_DEFUALTCLIENT, m_csDefaultClient);
DDX_Control(pDX, IDC_AS_CUSTOMMULS, m_clcMuls);
DDX_Control(pDX, IDC_AS_AVAILABLESCRIPTS, m_ctcScripts);
DDX_Check(pDX, IDC_AS_3DROOMVIEW, m_b3DRoomView);
DDX_Check(pDX, IDC_AS_DISPLAYITEMS, m_bDisplayItems);
DDX_Check(pDX, IDC_AS_ONTOP, m_bAlwaysOnTop);
DDX_Check(pDX, IDC_AS_RADAR, m_bShowRadarMap);
DDX_Check(pDX, IDC_AS_SCALE, m_bScaleItems);
DDX_Check(pDX, IDC_AS_SHOWCHARS, m_bShowChars);
DDX_Check(pDX, IDC_AS_SHOWSPAWNS, m_bShowSpawns);
DDX_Check(pDX, IDC_AS_SPAWNMSG, m_bSpawnMessage);
DDX_Check(pDX, IDC_AS_STARTLAUNCHER, m_bStartLauncher);
DDX_Check(pDX, IDC_AS_SYSCLOSE, m_bSysClose);
//}}AFX_DATA_MAP
}
BEGIN_MESSAGE_MAP(CAdditionalSettingsDlg, CDialog)
//{{AFX_MSG_MAP(CAdditionalSettingsDlg)
// NOTE: the ClassWizard will add message map macros here
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
// CAdditionalSettingsDlg message handlers
--- NEW FILE: AdditionalSettingsDlg.h ---
#if !defined(AFX_ADDITIONALSETTINGSDLG_H__3DEA5C6A_693B_47A9_834D_DB6297F788C1__INCLUDED_)
#define AFX_ADDITIONALSETTINGSDLG_H__3DEA5C6A_693B_47A9_834D_DB6297F788C1__INCLUDED_
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
// AdditionalSettingsDlg.h : header file
//
/////////////////////////////////////////////////////////////////////////////
// CAdditionalSettingsDlg dialog
class CAdditionalSettingsDlg : public CDialog
{
// Construction
public:
CAdditionalSettingsDlg(CWnd* pParent = NULL); // standard constructor
// Dialog Data
//{{AFX_DATA(CAdditionalSettingsDlg)
enum { IDD = IDD_ADDITIONAL_SETTINGS };
CButton m_cbMulPathFromClient;
CListBox m_clbProfiles;
CButton m_cbNewProfile;
CButton m_cbMulBrowse;
CButton m_cbEditProfile;
CButton m_cbDeleteProfile;
CStatic m_csDefaultMulPath;
CStatic m_csDefaultClient;
CListCtrl m_clcMuls;
CTreeCtrl m_ctcScripts;
BOOL m_b3DRoomView;
BOOL m_bDisplayItems;
BOOL m_bAlwaysOnTop;
BOOL m_bShowRadarMap;
BOOL m_bScaleItems;
BOOL m_bShowChars;
BOOL m_bShowSpawns;
BOOL m_bSpawnMessage;
BOOL m_bStartLauncher;
BOOL m_bSysClose;
//}}AFX_DATA
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CAdditionalSettingsDlg)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation
protected:
// Generated message map functions
//{{AFX_MSG(CAdditionalSettingsDlg)
// NOTE: the ClassWizard will add member functions here
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
#endif // !defined(AFX_ADDITIONALSETTINGSDLG_H__3DEA5C6A_693B_47A9_834D_DB6297F788C1__INCLUDED_)
Index: Drewsky.dsp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/Drewsky.dsp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** Drewsky.dsp 1 May 2002 04:21:46 -0000 1.22
--- Drewsky.dsp 12 May 2002 16:23:59 -0000 1.23
***************
*** 56,63 ****
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
! # ADD LINK32 /nologo /subsystem:windows /machine:I386 /out:"Release/axis.exe"
# Begin Special Build Tool
SOURCE="$(InputPath)"
! PostBuild_Cmds=copy Release\axis.exe install\ copy axis.txt install\ copy hlp\axis.hlp install\ copy hlp\axis.cnt install\ copy ..\axissvr\gwhogsvr\axissvr.exe install\ copy ..\axissvr\axissvr.cfg install\ copy ..\UOMap\Release\UOMap.ocx install\ copy ..\UOArt\Release\UOArt.ocx install\ copy AMPatch\Release\AMPatch.exe install\ copy LICENSE install\
# End Special Build Tool
--- 56,63 ----
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
! # ADD LINK32 version.lib /nologo /subsystem:windows /machine:I386 /out:"Release/axis.exe"
# Begin Special Build Tool
SOURCE="$(InputPath)"
! PostBuild_Cmds=copy Release\axis.exe install\ copy axis.txt install\ copy hlp\axis.hlp install\ copy hlp\axis.cnt install\ copy ..\axissvr\gwhogsvr\axissvr.exe install\ copy ..\axissvr\axissvr.cfg install\ copy ..\UOMap\Release\UOMap.ocx install\ copy ..\UOArt\Release\UOArt.ocx install\ copy AMPatch\Release\AMPatch.exe install\ copy LICENSE install\
# End Special Build Tool
***************
*** 86,90 ****
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /out:"Debug/axis.exe" /pdbtype:sept
# SUBTRACT LINK32 /incremental:no /nodefaultlib
--- 86,90 ----
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 version.lib /nologo /subsystem:windows /debug /machine:I386 /out:"Debug/axis.exe" /pdbtype:sept
# SUBTRACT LINK32 /incremental:no /nodefaultlib
***************
*** 118,122 ****
SOURCE="$(InputPath)"
PostBuild_Desc=Moving files to install directory
! PostBuild_Cmds=copy Release\axis.exe install\ copy axis.txt install\ copy hlp\axis.hlp install\ copy hlp\axis.cnt install\ copy ..\axissvr\gwhogsvr\axissvr.exe install\ copy ..\axissvr\axissvr.cfg install\
# End Special Build Tool
--- 118,122 ----
SOURCE="$(InputPath)"
PostBuild_Desc=Moving files to install directory
! PostBuild_Cmds=copy Release\axis.exe install\ copy axis.txt install\ copy hlp\axis.hlp install\ copy hlp\axis.cnt install\ copy ..\axissvr\gwhogsvr\axissvr.exe install\ copy ..\axissvr\axissvr.cfg install\
# End Special Build Tool
***************
*** 175,178 ****
--- 175,182 ----
# Begin Source File
+ SOURCE=.\AdditionalSettingsDlg.cpp
+ # End Source File
+ # Begin Source File
+
SOURCE=.\AddServer.cpp
# End Source File
***************
*** 553,556 ****
--- 557,564 ----
SOURCE=.\AddDestination.h
+ # End Source File
+ # Begin Source File
+
+ SOURCE=.\AdditionalSettingsDlg.h
# End Source File
# Begin Source File
|
|
From: Philip E. <pes...@us...> - 2002-05-12 16:20:59
|
Update of /cvsroot/sphere-axis/UOArt In directory usw-pr-cvs1:/tmp/cvs-serv16054 Modified Files: UOArt.opt Log Message: no message Index: UOArt.opt =================================================================== RCS file: /cvsroot/sphere-axis/UOArt/UOArt.opt,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 Binary files /tmp/cvsLl7gAC and /tmp/cvsMAZPQ6 differ |
|
From: Philip E. <pes...@us...> - 2002-05-12 16:20:18
|
Update of /cvsroot/sphere-axis/UOArt
In directory usw-pr-cvs1:/tmp/cvs-serv15903
Modified Files:
UOArt.rc
Log Message:
Updated version number
Index: UOArt.rc
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArt.rc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** UOArt.rc 11 May 2002 05:49:42 -0000 1.6
--- UOArt.rc 12 May 2002 16:20:15 -0000 1.7
***************
*** 1,4 ****
/*
! // Last compiled 5/10/2002 at 23:49:0
**********************************************************************
--- 1,4 ----
/*
! // Last compiled 5/12/2002 at 10:19:9
**********************************************************************
***************
*** 101,106 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,2,0,3
! PRODUCTVERSION 1,2,0,3
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 101,106 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,2,0,4
! PRODUCTVERSION 1,2,0,4
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 120,124 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "UOArt ActiveX Control Module\0"
! VALUE "FileVersion", "1, 2, 0, 3\0"
VALUE "InternalName", "UOArt\0"
VALUE "LegalCopyright", "Copyright (C) 2000, 2001\0"
--- 120,124 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "UOArt ActiveX Control Module\0"
! VALUE "FileVersion", "1, 2, 0, 4\0"
VALUE "InternalName", "UOArt\0"
VALUE "LegalCopyright", "Copyright (C) 2000, 2001\0"
***************
*** 128,132 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "UOArt ActiveX Control Module\0"
! VALUE "ProductVersion", "1, 2, 0, 3\0"
VALUE "SpecialBuild", "\0"
END
--- 128,132 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "UOArt ActiveX Control Module\0"
! VALUE "ProductVersion", "1, 2, 0, 4\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: Philip E. <pes...@us...> - 2002-05-12 16:20:00
|
Update of /cvsroot/sphere-axis/UOArt
In directory usw-pr-cvs1:/tmp/cvs-serv15708
Modified Files:
UOArtCtl.cpp UOArtCtl.h UOArt.opt
Log Message:
Fixed crash bug and made unicode compatability fixes.
Index: UOArtCtl.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArtCtl.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** UOArtCtl.cpp 11 May 2002 18:35:45 -0000 1.11
--- UOArtCtl.cpp 12 May 2002 16:19:57 -0000 1.12
***************
*** 2170,2174 ****
void CUOArtCtrl::SetMulPath(LPCTSTR pszNewPath)
{
! m_csUOPath = _T(pszNewPath);
if ( m_csUOPath.GetAt(m_csUOPath.GetLength() - 1) != '\\')
m_csUOPath += _T("\\");
--- 2170,2174 ----
void CUOArtCtrl::SetMulPath(LPCTSTR pszNewPath)
{
! m_csUOPath = pszNewPath;
if ( m_csUOPath.GetAt(m_csUOPath.GetLength() - 1) != '\\')
m_csUOPath += _T("\\");
***************
*** 2178,2270 ****
void CUOArtCtrl::InitializeMulPaths()
{
! m_saMulPaths.SetSize(37);
CString csPath;
! csPath.Format("%smap0.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_MAP0, csPath);
! csPath.Format("%sstaidx0.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_STAIDX0, csPath);
! csPath.Format("%sstatics0.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_STATICS0, csPath);
! csPath.Format("%sartidx.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_ARTIDX, csPath);
! csPath.Format("%sart.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_ART, csPath);
! csPath.Format("%sanim.idx", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_ANIMIDX, csPath);
! csPath.Format("%sanim.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_ANIM, csPath);
! csPath.Format("%ssoundidx.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_SOUNDIDX, csPath);
! csPath.Format("%ssound.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_SOUND, csPath);
! csPath.Format("%stexidx.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_TEXIDX, csPath);
! csPath.Format("%stexmaps.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_TEXMAPS, csPath);
! csPath.Format("%sgumpidx.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_GUMPIDX, csPath);
! csPath.Format("%sgumpart.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_GUMPART, csPath);
! csPath.Format("%smulti.idx", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_MULTIIDX, csPath);
! csPath.Format("%smulti.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_MULTI, csPath);
! csPath.Format("%sskills.idx", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_SKILLSIDX, csPath);
! csPath.Format("%sskills.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_SKILLS, csPath);
! csPath.Format("%slightidx.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_LIGHTIDX, csPath);
! csPath.Format("%slight.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_LIGHT, csPath);
! csPath.Format("%stiledata.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_TILEDATA, csPath);
! csPath.Format("%sanimdata.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_ANIMDATA, csPath);
! csPath.Format("%shues.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_HUES, csPath);
! csPath.Format("%saniminfo.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_ANIMINFO, csPath);
! csPath.Format("%sfonts.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_FONTS, csPath);
! csPath.Format("%sradarcol.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_RADARCOL, csPath);
! csPath.Format("%sverdata.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_VERDATA, csPath);
! csPath.Format("%smap2.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_MAP2, csPath);
! csPath.Format("%sstaidx2.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_STAIDX2, csPath);
! csPath.Format("%sstatics2.mul", m_csUOPath);
m_saMulPaths.SetAt(VERFILE_STATICS2, csPath);
}
--- 2178,2270 ----
void CUOArtCtrl::InitializeMulPaths()
{
! m_saMulPaths.SetSize(VERFILE_ENDOFTABLE);
CString csPath;
! csPath.Format(_T("%smap0.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_MAP0, csPath);
! csPath.Format(_T("%sstaidx0.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_STAIDX0, csPath);
! csPath.Format(_T("%sstatics0.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_STATICS0, csPath);
! csPath.Format(_T("%sartidx.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_ARTIDX, csPath);
! csPath.Format(_T("%sart.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_ART, csPath);
! csPath.Format(_T("%sanim.idx"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_ANIMIDX, csPath);
! csPath.Format(_T("%sanim.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_ANIM, csPath);
! csPath.Format(_T("%ssoundidx.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_SOUNDIDX, csPath);
! csPath.Format(_T("%ssound.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_SOUND, csPath);
! csPath.Format(_T("%stexidx.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_TEXIDX, csPath);
! csPath.Format(_T("%stexmaps.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_TEXMAPS, csPath);
! csPath.Format(_T("%sgumpidx.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_GUMPIDX, csPath);
! csPath.Format(_T("%sgumpart.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_GUMPART, csPath);
! csPath.Format(_T("%smulti.idx"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_MULTIIDX, csPath);
! csPath.Format(_T("%smulti.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_MULTI, csPath);
! csPath.Format(_T("%sskills.idx"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_SKILLSIDX, csPath);
! csPath.Format(_T("%sskills.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_SKILLS, csPath);
! csPath.Format(_T("%slightidx.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_LIGHTIDX, csPath);
! csPath.Format(_T("%slight.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_LIGHT, csPath);
! csPath.Format(_T("%stiledata.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_TILEDATA, csPath);
! csPath.Format(_T("%sanimdata.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_ANIMDATA, csPath);
! csPath.Format(_T("%shues.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_HUES, csPath);
! csPath.Format(_T("%saniminfo.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_ANIMINFO, csPath);
! csPath.Format(_T("%sfonts.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_FONTS, csPath);
! csPath.Format(_T("%sradarcol.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_RADARCOL, csPath);
! csPath.Format(_T("%sverdata.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_VERDATA, csPath);
! csPath.Format(_T("%smap2.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_MAP2, csPath);
! csPath.Format(_T("%sstaidx2.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_STAIDX2, csPath);
! csPath.Format(_T("%sstatics2.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_STATICS2, csPath);
}
Index: UOArtCtl.h
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArtCtl.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** UOArtCtl.h 11 May 2002 18:35:45 -0000 1.9
--- UOArtCtl.h 12 May 2002 16:19:57 -0000 1.10
***************
*** 156,160 ****
#define VERFILE_STAIDX2 0x26
#define VERFILE_STATICS2 0x27
!
class CItemCache
--- 156,160 ----
#define VERFILE_STAIDX2 0x26
#define VERFILE_STATICS2 0x27
! #define VERFILE_ENDOFTABLE 0x28
class CItemCache
Index: UOArt.opt
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArt.opt,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
Binary files /tmp/cvsZiQ9JM and /tmp/cvsiBZt2o differ
|
|
From: Philip E. <pes...@us...> - 2002-05-12 16:18:21
|
Update of /cvsroot/sphere-axis/UOMap
In directory usw-pr-cvs1:/tmp/cvs-serv15348
Modified Files:
UOMap.rc
Log Message:
Updated version number
Index: UOMap.rc
===================================================================
RCS file: /cvsroot/sphere-axis/UOMap/UOMap.rc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** UOMap.rc 11 May 2002 05:52:48 -0000 1.5
--- UOMap.rc 12 May 2002 16:18:18 -0000 1.6
***************
*** 1,4 ****
/*
! // Last compiled 5/10/2002 at 23:52:6
**********************************************************************
--- 1,4 ----
/*
! // Last compiled 5/12/2002 at 10:17:1
**********************************************************************
***************
*** 78,83 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,2,0,2
! PRODUCTVERSION 1,2,0,2
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 78,83 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,2,0,3
! PRODUCTVERSION 1,2,0,3
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 97,101 ****
VALUE "CompanyName", "MCI WorldCom\0"
VALUE "FileDescription", "UOMap ActiveX Control Module\0"
! VALUE "FileVersion", "1, 2, 0, 2\0"
VALUE "InternalName", "UOMap\0"
VALUE "LegalCopyright", "Copyright (C) 2001\0"
--- 97,101 ----
VALUE "CompanyName", "MCI WorldCom\0"
VALUE "FileDescription", "UOMap ActiveX Control Module\0"
! VALUE "FileVersion", "1, 2, 0, 3\0"
VALUE "InternalName", "UOMap\0"
VALUE "LegalCopyright", "Copyright (C) 2001\0"
***************
*** 105,109 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "UOMap ActiveX Control Module\0"
! VALUE "ProductVersion", "1, 2, 0, 2\0"
VALUE "SpecialBuild", "\0"
END
--- 105,109 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "UOMap ActiveX Control Module\0"
! VALUE "ProductVersion", "1, 2, 0, 3\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: Philip E. <pes...@us...> - 2002-05-12 16:17:56
|
Update of /cvsroot/sphere-axis/UOMap
In directory usw-pr-cvs1:/tmp/cvs-serv15186
Modified Files:
UOMapCtl.cpp
Log Message:
Unicode compatibility fix
Index: UOMapCtl.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/UOMap/UOMapCtl.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** UOMapCtl.cpp 11 May 2002 05:33:31 -0000 1.5
--- UOMapCtl.cpp 12 May 2002 16:17:52 -0000 1.6
***************
*** 1015,1019 ****
catch (...)
{
! AfxMessageBox("UOMap.ocx caught an exception while trying to draw the map. You may need to close the application.", MB_OK);
}
}
--- 1015,1019 ----
catch (...)
{
! AfxMessageBox(_T("UOMap.ocx caught an exception while trying to draw the map. You may need to close the application."), MB_OK);
}
}
|
|
From: Philip E. <pes...@us...> - 2002-05-11 18:35:49
|
Update of /cvsroot/sphere-axis/UOArt
In directory usw-pr-cvs1:/tmp/cvs-serv16048
Modified Files:
UOArtCtl.cpp UOArtCtl.h UOArt.opt
Log Message:
Fixed problem with cached items not being read from custom mul files.
Index: UOArtCtl.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArtCtl.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** UOArtCtl.cpp 11 May 2002 05:47:58 -0000 1.10
--- UOArtCtl.cpp 11 May 2002 18:35:45 -0000 1.11
***************
*** 59,63 ****
}
! CItemCache::CItemCache(WORD wIndex, CString csClientPath, CVerdataIdx * pVerdata)
{
m_wIndex = wIndex;
--- 59,63 ----
}
! CItemCache::CItemCache(WORD wIndex, CString csVerdata, CString csIdxFile, CString csMulFile, CVerdataIdx * pVerdata)
{
m_wIndex = wIndex;
***************
*** 68,73 ****
// Load this from the verdata.mul file
CFile fVerdata;
- CString csVerdata;
- csVerdata.Format("%sverdata.mul", csClientPath);
if ( fVerdata.Open(csVerdata, CFile::typeBinary | CFile::modeRead |CFile::shareDenyNone) )
{
--- 68,71 ----
***************
*** 81,88 ****
{
CFile fIdx, fMul;
- CString csIdxFile, csMulFile;
-
- csIdxFile.Format("%sartidx.mul", csClientPath);
- csMulFile.Format("%sart.mul", csClientPath);
if ( fIdx.Open(csIdxFile, CFile::typeBinary | CFile::modeRead | CFile::shareDenyNone) )
--- 79,82 ----
***************
*** 2131,2137 ****
DWORD dwVerdataIdx = FindVerdata(VERFILE_ART, (DWORD) wIndex);
if ( dwVerdataIdx != 0xFFFFFFFF )
! pNewCache = new CItemCache(wIndex, m_csUOPath, &m_pVerdataIdx[dwVerdataIdx]);
else
! pNewCache = new CItemCache(wIndex, m_csUOPath, NULL);
// Move the oldest item out of cache, if we are over our limit
--- 2125,2131 ----
DWORD dwVerdataIdx = FindVerdata(VERFILE_ART, (DWORD) wIndex);
if ( dwVerdataIdx != 0xFFFFFFFF )
! pNewCache = new CItemCache(wIndex, m_saMulPaths.GetAt(VERFILE_VERDATA), m_saMulPaths.GetAt(VERFILE_ARTIDX), m_saMulPaths.GetAt(VERFILE_ART), &m_pVerdataIdx[dwVerdataIdx]);
else
! pNewCache = new CItemCache(wIndex, m_saMulPaths.GetAt(VERFILE_VERDATA), m_saMulPaths.GetAt(VERFILE_ARTIDX), m_saMulPaths.GetAt(VERFILE_ART), NULL);
// Move the oldest item out of cache, if we are over our limit
Index: UOArtCtl.h
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArtCtl.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** UOArtCtl.h 11 May 2002 05:47:58 -0000 1.8
--- UOArtCtl.h 11 May 2002 18:35:45 -0000 1.9
***************
*** 162,166 ****
public:
CItemCache();
! CItemCache(WORD wIndex, CString csClientPath, CVerdataIdx * pVerdata = NULL);
~CItemCache();
BYTE * GetBuffer() { return &m_pBuffer[0]; }
--- 162,166 ----
public:
CItemCache();
! CItemCache(WORD wIndex, CString csVerdataFile, CString csIdxFile, CString csMulFile, CVerdataIdx * pVerdata = NULL);
~CItemCache();
BYTE * GetBuffer() { return &m_pBuffer[0]; }
Index: UOArt.opt
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArt.opt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
Binary files /tmp/cvsx64T3U and /tmp/cvsORRd1H differ
|
|
From: Philip E. <pes...@us...> - 2002-05-11 05:52:51
|
Update of /cvsroot/sphere-axis/UOMap
In directory usw-pr-cvs1:/tmp/cvs-serv32582
Modified Files:
UOMap.rc
Log Message:
Updated build number to 1.2.0.2
Index: UOMap.rc
===================================================================
RCS file: /cvsroot/sphere-axis/UOMap/UOMap.rc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** UOMap.rc 11 May 2002 05:33:31 -0000 1.4
--- UOMap.rc 11 May 2002 05:52:48 -0000 1.5
***************
*** 1,4 ****
/*
! $Id$
**********************************************************************
--- 1,4 ----
/*
! // Last compiled 5/10/2002 at 23:52:6
**********************************************************************
***************
*** 78,83 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,2,0,1
! PRODUCTVERSION 1,2,0,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 78,83 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,2,0,2
! PRODUCTVERSION 1,2,0,2
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 97,101 ****
VALUE "CompanyName", "MCI WorldCom\0"
VALUE "FileDescription", "UOMap ActiveX Control Module\0"
! VALUE "FileVersion", "1, 2, 0, 1\0"
VALUE "InternalName", "UOMap\0"
VALUE "LegalCopyright", "Copyright (C) 2001\0"
--- 97,101 ----
VALUE "CompanyName", "MCI WorldCom\0"
VALUE "FileDescription", "UOMap ActiveX Control Module\0"
! VALUE "FileVersion", "1, 2, 0, 2\0"
VALUE "InternalName", "UOMap\0"
VALUE "LegalCopyright", "Copyright (C) 2001\0"
***************
*** 105,109 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "UOMap ActiveX Control Module\0"
! VALUE "ProductVersion", "1, 2, 0, 1\0"
VALUE "SpecialBuild", "\0"
END
--- 105,109 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "UOMap ActiveX Control Module\0"
! VALUE "ProductVersion", "1, 2, 0, 2\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: Philip E. <pes...@us...> - 2002-05-11 05:49:45
|
Update of /cvsroot/sphere-axis/UOArt
In directory usw-pr-cvs1:/tmp/cvs-serv32028
Modified Files:
UOArt.rc
Log Message:
Updated build number to 1.2.0.3
Index: UOArt.rc
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArt.rc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** UOArt.rc 11 May 2002 05:47:58 -0000 1.5
--- UOArt.rc 11 May 2002 05:49:42 -0000 1.6
***************
*** 1,4 ****
/*
! $Id$
**********************************************************************
--- 1,4 ----
/*
! // Last compiled 5/10/2002 at 23:49:0
**********************************************************************
***************
*** 101,106 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,2,0,2
! PRODUCTVERSION 1,2,0,2
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 101,106 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,2,0,3
! PRODUCTVERSION 1,2,0,3
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 120,124 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "UOArt ActiveX Control Module\0"
! VALUE "FileVersion", "1, 2, 0, 2\0"
VALUE "InternalName", "UOArt\0"
VALUE "LegalCopyright", "Copyright (C) 2000, 2001\0"
--- 120,124 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "UOArt ActiveX Control Module\0"
! VALUE "FileVersion", "1, 2, 0, 3\0"
VALUE "InternalName", "UOArt\0"
VALUE "LegalCopyright", "Copyright (C) 2000, 2001\0"
***************
*** 128,132 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "UOArt ActiveX Control Module\0"
! VALUE "ProductVersion", "1, 2, 0, 2\0"
VALUE "SpecialBuild", "\0"
END
--- 128,132 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "UOArt ActiveX Control Module\0"
! VALUE "ProductVersion", "1, 2, 0, 3\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: Philip E. <pes...@us...> - 2002-05-11 05:48:03
|
Update of /cvsroot/sphere-axis/UOArt
In directory usw-pr-cvs1:/tmp/cvs-serv31691
Modified Files:
UOArt.odl UOArt.rc UOArtCtl.cpp UOArtCtl.h UOArt.opt
Log Message:
Merged version_1_2_development branch into main trunk
Index: UOArt.odl
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArt.odl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** UOArt.odl 12 Jun 2001 23:39:00 -0000 1.3
--- UOArt.odl 11 May 2002 05:47:58 -0000 1.4
***************
*** 54,57 ****
--- 54,61 ----
[id(19)] void RemoveHideStatic(short ID, long Block, short x, short y, short z, short color);
[id(20)] void RedrawControl();
+ [id(21)] void SetMulPath(BSTR pszNewPath);
+ [id(22)] BSTR GetMulPath();
+ [id(23)] boolean SetCustomMulFile(short sFileIndex, BSTR pszNewFilePath);
+ [id(24)] BSTR GetCustomMulPath(short sFileIndex);
//}}AFX_ODL_METHOD
Index: UOArt.rc
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArt.rc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** UOArt.rc 1 May 2002 03:42:32 -0000 1.4
--- UOArt.rc 11 May 2002 05:47:58 -0000 1.5
***************
*** 46,50 ****
//Microsoft Developer Studio generated resource script.
! //
#include "resource.h"
--- 46,50 ----
//Microsoft Developer Studio generated resource script.
! // Last compiled 5/10/2002 at 23:15:3
#include "resource.h"
***************
*** 101,106 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,1,0,0
! PRODUCTVERSION 1,1,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 101,106 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,2,0,2
! PRODUCTVERSION 1,2,0,2
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 120,124 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "UOArt ActiveX Control Module\0"
! VALUE "FileVersion", "1, 2, 0, 0\0"
VALUE "InternalName", "UOArt\0"
VALUE "LegalCopyright", "Copyright (C) 2000, 2001\0"
--- 120,124 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "UOArt ActiveX Control Module\0"
! VALUE "FileVersion", "1, 2, 0, 2\0"
VALUE "InternalName", "UOArt\0"
VALUE "LegalCopyright", "Copyright (C) 2000, 2001\0"
***************
*** 128,132 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "UOArt ActiveX Control Module\0"
! VALUE "ProductVersion", "1, 2, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
--- 128,132 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "UOArt ActiveX Control Module\0"
! VALUE "ProductVersion", "1, 2, 0, 2\0"
VALUE "SpecialBuild", "\0"
END
Index: UOArtCtl.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArtCtl.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** UOArtCtl.cpp 1 May 2002 03:42:32 -0000 1.9
--- UOArtCtl.cpp 11 May 2002 05:47:58 -0000 1.10
***************
*** 42,129 ****
IMPLEMENT_DYNCREATE(CUOArtCtrl, COleControl)
- #pragma pack(push, muldata, 1)
! struct ArtIdx
{
! DWORD dwLookup;
! DWORD dwSize;
! DWORD dwUnknown;
! };
[...1519 lines suppressed...]
!
! BOOL CUOArtCtrl::SetCustomMulFile(short sFileIndex, LPCTSTR pszNewFilePath)
! {
! if ( sFileIndex < 0 || sFileIndex > m_saMulPaths.GetUpperBound() || ( sFileIndex >= 0x13 && sFileIndex <=0x1d) )
! return FALSE; // Invalid index!
! m_saMulPaths.SetAt(sFileIndex, pszNewFilePath);
! return TRUE;
! }
!
! BSTR CUOArtCtrl::GetCustomMulPath(short sFileIndex)
! {
! CString strResult;
! if ( sFileIndex < 0 || sFileIndex > m_saMulPaths.GetUpperBound() || ( sFileIndex >= 0x13 && sFileIndex <=0x1d) )
! {
! // Do nothing...we never set these
! }
! else
! strResult = m_saMulPaths.GetAt(sFileIndex);
! return strResult.AllocSysString();
! }
Index: UOArtCtl.h
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArtCtl.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** UOArtCtl.h 1 May 2002 03:42:32 -0000 1.7
--- UOArtCtl.h 11 May 2002 05:47:58 -0000 1.8
***************
*** 42,45 ****
--- 42,177 ----
+ #pragma pack(push, muldata, 1)
+
+ struct ArtIdx
+ {
+ DWORD dwLookup;
+ DWORD dwSize;
+ DWORD dwUnknown;
+ };
+
+ class CHueEntry
+ {
+ public:
+ WORD wColorTable[32];
+ WORD wTableStart;
+ WORD wTableEnd;
+ CHAR cName[20];
+ };
+
+ class CHueGroup
+ {
+ public:
+ DWORD dwHeader;
+ CHueEntry Hues[8];
+ };
+
+ class CMultiRec
+ {
+ public:
+ WORD wIndex;
+ short x;
+ short y;
+ short z;
+ DWORD dwFlags;
+ };
+
+ class CStaticRec
+ {
+ public:
+ WORD wIndex;
+ BYTE x;
+ BYTE y;
+ CHAR z;
+ WORD wColor;
+ };
+
+ class CCellData
+ {
+ public:
+ WORD wID;
+ CHAR z;
+ };
+
+ class CMapBlock
+ {
+ public:
+ DWORD dwHeader;
+ CCellData cell [64];
+ };
+
+ class CStaticObj : public CStaticRec
+ {
+ public:
+ DWORD dwBlock;
+ };
+
+ class CDynamicObj : public CStaticRec
+ {
+ public:
+ DWORD dwBlock;
+ WORD wFlags;
+ };
+
+ class CVerdataIdx
+ {
+ public:
+ DWORD dwID;
+ DWORD dwBlock;
+ DWORD dwOffset;
+ DWORD dwSize;
+ DWORD dwCRC;
+
+ CVerdataIdx();
+ };
+
+ #define VERFILE_MAP0 0x00
+ #define VERFILE_STAIDX0 0x01
+ #define VERFILE_STATICS0 0x02
+ #define VERFILE_ARTIDX 0x03
+ #define VERFILE_ART 0x04
+ #define VERFILE_ANIMIDX 0x05
+ #define VERFILE_ANIM 0x06
+ #define VERFILE_SOUNDIDX 0x07
+ #define VERFILE_SOUND 0x08
+ #define VERFILE_TEXIDX 0x09
+ #define VERFILE_TEXMAPS 0x0a
+ #define VERFILE_GUMPIDX 0x0b
+ #define VERFILE_GUMPART 0x0c
+ #define VERFILE_MULTIIDX 0x0d
+ #define VERFILE_MULTI 0x0e
+ #define VERFILE_SKILLSIDX 0x0f
+ #define VERFILE_SKILLS 0x10
+ #define VERFILE_LIGHTIDX 0x11 // ???
+ #define VERFILE_LIGHT 0x12 // ???
+ #define VERFILE_TILEDATA 0x1e
+ #define VERFILE_ANIMDATA 0x1f
+ #define VERFILE_HUES 0x20
+ // don't know about these...so we'll assign them numbers for now
+ #define VERFILE_ANIMINFO 0x21
+ #define VERFILE_FONTS 0x22
+ #define VERFILE_RADARCOL 0x23
+ #define VERFILE_VERDATA 0x24
+ #define VERFILE_MAP2 0x25
+ #define VERFILE_STAIDX2 0x26
+ #define VERFILE_STATICS2 0x27
+
+
+ class CItemCache
+ {
+ public:
+ CItemCache();
+ CItemCache(WORD wIndex, CString csClientPath, CVerdataIdx * pVerdata = NULL);
+ ~CItemCache();
+ BYTE * GetBuffer() { return &m_pBuffer[0]; }
+ WORD GetIndex() { return m_wIndex; }
+ protected:
+ WORD m_wIndex;
+ BYTE * m_pBuffer;
+ };
+
+ #pragma pack(pop, muldata)
+
+
class CUOArtCtrl : public COleControl
{
***************
*** 75,87 ****
--- 207,227 ----
// Implementation
protected:
+ CString m_csMulPath;
+ CStringArray m_saMulPaths;
+
CPtrArray m_paStatics;
CPtrArray m_paDynamics;
+ void InitializeMulPaths();
BYTE m_tiledata [0xFD000];
void LoadTiledata();
WORD m_wArtWidth[0x10000];
WORD m_wArtHeight[0x10000];
+ bool m_bArtDataLoaded;
void LoadArtData();
void DrawRoomview(CRect bounds, WORD wArtHeight);
BYTE * LoadCache(WORD wIndex);
+ void LoadVerdataIndex();
+ DWORD FindVerdata(DWORD dwID, DWORD dwBlock);
+ DWORD m_dwVerdataBlocks;
CPtrList m_cache;
#define F_ROOMVIEW 0x0001
***************
*** 107,110 ****
--- 247,251 ----
void RedrawArt(CDC* pdc, const CRect& rcBounds, const CRect& rcInvalid);
~CUOArtCtrl();
+ CVerdataIdx * m_pVerdataIdx;
DECLARE_OLECREATE_EX(CUOArtCtrl) // Class factory and guid
***************
*** 148,151 ****
--- 289,296 ----
afx_msg void RemoveHideStatic(short ID, long Block, short x, short y, short z, short color);
afx_msg void RedrawControl();
+ afx_msg void SetMulPath(LPCTSTR pszNewPath);
+ afx_msg BSTR GetMulPath();
+ afx_msg BOOL SetCustomMulFile(short sFileIndex, LPCTSTR pszNewFilePath);
+ afx_msg BSTR GetCustomMulPath(short sFileIndex);
//}}AFX_DISPATCH
DECLARE_DISPATCH_MAP()
***************
*** 180,183 ****
--- 325,332 ----
dispidRemoveHideStatic = 19L,
dispidRedrawControl = 20L,
+ dispidSetMulPath = 21L,
+ dispidGetMulPath = 22L,
+ dispidSetCustomMulFile = 23L,
+ dispidGetCustomMulPath = 24L,
//}}AFX_DISP_ID
};
Index: UOArt.opt
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArt.opt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
Binary files /tmp/cvsGKcrw6 and /tmp/cvsucOKw2 differ
|
|
From: Philip E. <pes...@us...> - 2002-05-11 05:33:51
|
Update of /cvsroot/sphere-axis/UOMap
In directory usw-pr-cvs1:/tmp/cvs-serv29530
Modified Files:
UOMap.rc uomap_docs.htm UOMapCtl.cpp
Log Message:
Merged version_1_2_development branch into main trunk
Index: UOMap.rc
===================================================================
RCS file: /cvsroot/sphere-axis/UOMap/UOMap.rc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** UOMap.rc 1 May 2002 03:42:44 -0000 1.3
--- UOMap.rc 11 May 2002 05:33:31 -0000 1.4
***************
*** 23,27 ****
//Microsoft Developer Studio generated resource script.
! //
#include "resource.h"
--- 23,27 ----
//Microsoft Developer Studio generated resource script.
! // Last compiled 4/30/2002 at 22:11:0
#include "resource.h"
***************
*** 78,83 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,1,0,0
! PRODUCTVERSION 1,1,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 78,83 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,2,0,1
! PRODUCTVERSION 1,2,0,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 97,101 ****
VALUE "CompanyName", "MCI WorldCom\0"
VALUE "FileDescription", "UOMap ActiveX Control Module\0"
! VALUE "FileVersion", "1, 1, 0, 0\0"
VALUE "InternalName", "UOMap\0"
VALUE "LegalCopyright", "Copyright (C) 2001\0"
--- 97,101 ----
VALUE "CompanyName", "MCI WorldCom\0"
VALUE "FileDescription", "UOMap ActiveX Control Module\0"
! VALUE "FileVersion", "1, 2, 0, 1\0"
VALUE "InternalName", "UOMap\0"
VALUE "LegalCopyright", "Copyright (C) 2001\0"
***************
*** 105,109 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "UOMap ActiveX Control Module\0"
! VALUE "ProductVersion", "1, 1, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
--- 105,109 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "UOMap ActiveX Control Module\0"
! VALUE "ProductVersion", "1, 2, 0, 1\0"
VALUE "SpecialBuild", "\0"
END
Index: uomap_docs.htm
===================================================================
RCS file: /cvsroot/sphere-axis/UOMap/uomap_docs.htm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** uomap_docs.htm 22 Apr 2001 18:30:18 -0000 1.1.1.1
--- uomap_docs.htm 11 May 2002 05:33:31 -0000 1.2
***************
*** 1,30 ****
-
<html>
<head>
- <meta http-equiv="Content-Language" content="en-us">
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
<meta name="ProgId" content="FrontPage.Editor.Document">
! <style>
! <!--
! P { line-height: 100%; font-family: Tahoma; font-size: 10pt; margin-left: 10px; margin-right:10px;
! margin-top: 0; margin-bottom: 0 }
! A { font-family: Tahoma; font-size: 10pt; line-height: 100%; color: #0077FF;
! margin-top: 0; margin-bottom: 0 }
! .Method { font-family: Tahoma; font-size: 10pt; line-height: 100%; color: #0000FF; }
! .Property { font-family: Tahoma; font-size: 10pt; line-height: 100%; color: #007700; }
! -->
! </style>
! <title>UOMap ActiveX Control Documentation</title>
</head>
! <body>
! <b>UOMap ActiveX Control<br>
<br>
Example Applications:<br>
! </b><a href="http://cdbar.fingolfin.net/dev/uomap_vb.zip">For Visual Basic</a><br>
! <a href="http://cdbar.fingolfin.net/dev/uomap_vcc.zip">For Visual C++</a><br><br><br>
<b>Properties</b><br>
--- 1,25 ----
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
<meta name="ProgId" content="FrontPage.Editor.Document">
! <title>UOActiveX UOMap Docs</title>
! <base target="_self">
! <link rel="stylesheet" type="text/css" href="uoax.css">
</head>
! <body bgcolor="#FFFFFF">
!
! <b><span class="title">UOMap ActiveX Control</span><br>
! Download:<br>
! </b><a href="http://uoactivex.fingolfin.net/uomap_control.zip">UOMap Control and
! documentation</a><br>
! <b>
<br>
Example Applications:<br>
! </b><a href="http://uoactivex.fingolfin.net/uomap_vb.zip">For Visual Basic</a><br>
! <a href="http://uoactivex.fingolfin.net/uomap_vcc.zip">For Visual C++</a><br><br><br>
<b>Properties</b><br>
***************
*** 41,47 ****
- Retrieves the center x and y position of the map.<br><br>
<span class="method">Scroll(short direction, short distance)</span>
! - Scrolls the map in the direction specified by the specified distance in map units.<br><br>
! The direction value is one of the following: (0 = North, 1 = NorthEast,
! 2 = East, 3 = SouthEast, 4 = South, 5 = SouthWest, 6 = West, 7 = NorthWest).<br><br>
<span class="method">SetCenter(short x, short y)</span>
- Sets the center of the map to the specified position.<br><br>
--- 36,51 ----
- Retrieves the center x and y position of the map.<br><br>
<span class="method">Scroll(short direction, short distance)</span>
! - Scrolls the map in the direction specified by the specified distance in map units.<br>
! The direction value is one of the following:<br>
! <div class="enum">
! 0 = North<br>
! 1 = NorthEast<br>
! 2 = East<br>
! 3 = SouthEast<br>
! 4 = South<br>
! 5 = SouthWest<br>
! 6 = West<br>
! 7 = NorthWest<br>
! </div><br>
<span class="method">SetCenter(short x, short y)</span>
- Sets the center of the map to the specified position.<br><br>
***************
*** 69,73 ****
<br>
<span class="method">short GetMapHeight(short x, short y)</span>
! - Determines the map altitude for the map location x, y
</body>
--- 73,136 ----
<br>
<span class="method">short GetMapHeight(short x, short y)</span>
! - Determines the map altitude for the map location x, y<br>
! <br>
! <span class="method">long AddDrawObject(short x, short y, short type, short size, long color)</span>
! - Adds a draw object to an internal storage array in the control. Returns the
! array index of the inserted object, or -1 if unable to add the object. The
! x and y values represent the map coordinates of the object. The type value
! is one of the following:<br>
! 0 = No object<br>
! 1 = Cross (plus sign)<br>
! 2 = Square<br>
! 3 = Diamond<br>
! 4 = Dot<br>
! 5 = Circle<br>
! 6 = Triangle<br>
! The size value is the number of pixels for the radius of the object. The
! color value is a standard RGB value, where the four bytes are denoted (in hex)
! by 0x00bbggrr, with bb being the blue value, gg being the green value, and rr
! being the red value. <br>
! <br>
! <span class="method">boolean RemoveDrawObject(short x, short y, short type, short size, long color)</span>
! - Removes a draw object from internal storage that matches the provided
! parameters. Returns true if successful, or false if no match could be
! found. <br>
! <br>
! <span class="method">boolean RemoveDrawObjectAt(long index)</span>
! - Removes a draw object from internal storage at the given index. Returns
! true if successful, or false if there was no object at the supplied index. <br>
! <br>
! <span class="method">boolean RemoveDrawObjects()</span>
! - Removes all draw objects from internal storage. Returns true if
! successful, or false if an error occurred. <br>
! <br>
! <span class="method">long AddDrawRect(short xleft, short ytop, short width, short height, short mode,
! long color)</span>
! - Adds a drawing rectangle to an internal storage array in the control.
! Returns the index of the inserted object, or -1 if unable to add the
! rectangle. The x and y values represent the map coordinates of the
! object. The width and height represent the width and height (in map
! coordinates) of the rectangle. The mode value is one of the following:<br>
! 0 = Fill solid<br>
! 1 = Fill blend<br>
! 2 = Outline <br>
! The color value is a standard RGB value, where the four bytes are denoted (in
! hex) by 0x00bbggrr, with bb being the blue value, gg being the green value, and
! rr being the red value.<br>
! <br>
! <span class="method">boolean RemoveDrawRect(short x, short y, short width, short height, short mode,
! long color)</span>
! - Removes a drawing rectangle from internal storage that matches the
! provided parameters. Returns true if successful, or false if no match
! could be found.<br>
! <br>
! <span class="method">boolean RemoteDrawRectAt(long index)</span>
! - Removes a drawing rectangle from internal
! storage at the given index. Returns true if successful, or false if there
! was no object at the supplied index.<br>
! <br>
! <span class="method">boolean RemoveDrawRects()</span>
! - Removes all drawing rectangles from internal storage. Returns true if successful, or false if an error occurred.<br>
!
</body>
Index: UOMapCtl.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/UOMap/UOMapCtl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** UOMapCtl.cpp 1 May 2002 03:42:44 -0000 1.4
--- UOMapCtl.cpp 11 May 2002 05:33:31 -0000 1.5
***************
*** 464,467 ****
--- 464,471 ----
{
m_zoomLevel = nNewValue;
+ if ( m_zoomLevel > 8 )
+ m_zoomLevel = 8;
+ if ( m_zoomLevel < -4 )
+ m_zoomLevel = -4;
SetInvalid();
}
|
|
From: Philip E. <pes...@us...> - 2002-05-11 05:17:25
|
Update of /cvsroot/sphere-axis/UOArt
In directory usw-pr-cvs1:/tmp/cvs-serv27179
Modified Files:
Tag: version_1_2_development
UOArt.odl UOArt.rc UOArtCtl.cpp UOArtCtl.h UOArt.opt
Log Message:
Added ability to specify individual mul paths, or a custom mul path.
Also fixed a bug in verdata support.
Index: UOArt.odl
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArt.odl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** UOArt.odl 12 Jun 2001 23:39:00 -0000 1.3
--- UOArt.odl 11 May 2002 05:17:21 -0000 1.3.2.1
***************
*** 54,57 ****
--- 54,61 ----
[id(19)] void RemoveHideStatic(short ID, long Block, short x, short y, short z, short color);
[id(20)] void RedrawControl();
+ [id(21)] void SetMulPath(BSTR pszNewPath);
+ [id(22)] BSTR GetMulPath();
+ [id(23)] boolean SetCustomMulFile(short sFileIndex, BSTR pszNewFilePath);
+ [id(24)] BSTR GetCustomMulPath(short sFileIndex);
//}}AFX_ODL_METHOD
Index: UOArt.rc
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArt.rc,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** UOArt.rc 8 May 2002 04:29:52 -0000 1.3.2.2
--- UOArt.rc 11 May 2002 05:17:21 -0000 1.3.2.3
***************
*** 1,4 ****
//Microsoft Developer Studio generated resource script.
! // Last compiled 4/30/2002 at 22:10:31
#include "resource.h"
--- 1,4 ----
//Microsoft Developer Studio generated resource script.
! // Last compiled 5/10/2002 at 23:15:3
#include "resource.h"
***************
*** 55,60 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,2,0,1
! PRODUCTVERSION 1,2,0,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 55,60 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,2,0,2
! PRODUCTVERSION 1,2,0,2
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 74,78 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "UOArt ActiveX Control Module\0"
! VALUE "FileVersion", "1, 2, 0, 1\0"
VALUE "InternalName", "UOArt\0"
VALUE "LegalCopyright", "Copyright (C) 2000, 2001\0"
--- 74,78 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "UOArt ActiveX Control Module\0"
! VALUE "FileVersion", "1, 2, 0, 2\0"
VALUE "InternalName", "UOArt\0"
VALUE "LegalCopyright", "Copyright (C) 2000, 2001\0"
***************
*** 82,86 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "UOArt ActiveX Control Module\0"
! VALUE "ProductVersion", "1, 2, 0, 1\0"
VALUE "SpecialBuild", "\0"
END
--- 82,86 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "UOArt ActiveX Control Module\0"
! VALUE "ProductVersion", "1, 2, 0, 2\0"
VALUE "SpecialBuild", "\0"
END
Index: UOArtCtl.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArtCtl.cpp,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -C2 -r1.8.2.4 -r1.8.2.5
*** UOArtCtl.cpp 12 Sep 2001 17:58:59 -0000 1.8.2.4
--- UOArtCtl.cpp 11 May 2002 05:17:21 -0000 1.8.2.5
***************
*** 130,133 ****
--- 130,137 ----
DISP_FUNCTION(CUOArtCtrl, "RemoveHideStatic", RemoveHideStatic, VT_EMPTY, VTS_I2 VTS_I4 VTS_I2 VTS_I2 VTS_I2 VTS_I2)
DISP_FUNCTION(CUOArtCtrl, "RedrawControl", RedrawControl, VT_EMPTY, VTS_NONE)
+ DISP_FUNCTION(CUOArtCtrl, "SetMulPath", SetMulPath, VT_EMPTY, VTS_BSTR)
+ DISP_FUNCTION(CUOArtCtrl, "GetMulPath", GetMulPath, VT_BSTR, VTS_NONE)
+ DISP_FUNCTION(CUOArtCtrl, "SetCustomMulFile", SetCustomMulFile, VT_BOOL, VTS_I2 VTS_BSTR)
+ DISP_FUNCTION(CUOArtCtrl, "GetCustomMulPath", GetCustomMulPath, VT_BSTR, VTS_I2)
DISP_STOCKPROP_READYSTATE()
//}}AFX_DISPATCH_MAP
***************
*** 330,334 ****
m_lReadyState = READYSTATE_LOADING;
- // TODO: Call InternalSetReadyState when the readystate changes.
m_bIsValid = false;
--- 334,337 ----
***************
*** 343,346 ****
--- 346,352 ----
m_yOffset = 0;
m_wDrawFlags = 0;
+
+ InitializeMulPaths();
+
ReadRegistry();
LoadVerdataIndex();
***************
*** 349,353 ****
m_bArtDataLoaded = false;
//LoadArtData();
! m_lReadyState = READYSTATE_LOADED;
}
--- 355,359 ----
m_bArtDataLoaded = false;
//LoadArtData();
! InternalSetReadyState(READYSTATE_LOADED);
}
***************
*** 637,640 ****
--- 643,647 ----
CString csDataFile, csIndexFile, csMapFile;
CMapBlock block;
+ DWORD dwVerdataSection = 0xFFFFFFFF;
switch ( sArtType )
{
***************
*** 642,645 ****
--- 649,653 ----
case ART_LANDSCAPE:
case ART_CHARTESTS:
+ dwVerdataSection = VERFILE_ART;
{
try
***************
*** 765,792 ****
return;
case ART_NPC:
! csDataFile.Format(_T("%sanim.mul"), m_csUOPath);
! csIndexFile.Format(_T("%sanim.idx"), m_csUOPath);
break;
case ART_GUMP:
! csDataFile.Format(_T("%sgumpart.mul"), m_csUOPath);
! csIndexFile.Format(_T("%sgumpidx.mul"), m_csUOPath);
break;
case ART_TEXMAPS:
! csDataFile.Format(_T("%stexmaps.mul"), m_csUOPath);
! csIndexFile.Format(_T("%stexidx.mul"), m_csUOPath);
break;
case ART_MULTI:
! csDataFile.Format(_T("%smulti.mul"), m_csUOPath);
! csIndexFile.Format(_T("%smulti.idx"), m_csUOPath);
LoadArtData();
break;
case ART_LIGHTS:
! csDataFile.Format(_T("%slight.mul"), m_csUOPath);
! csIndexFile.Format(_T("%slightidx.mul"), m_csUOPath);
break;
case ART_MAPPREVIEW:
! csDataFile.Format(_T("%sstatics0.mul"), m_csUOPath);
! csIndexFile.Format(_T("%sstaidx0.mul"), m_csUOPath);
! csMapFile.Format(_T("%smap0.mul"), m_csUOPath);
LoadArtData();
if ( (m_wDrawFlags & F_SHOWTERRAIN) )
--- 773,806 ----
return;
case ART_NPC:
! csDataFile = m_saMulPaths.GetAt(VERFILE_ANIM);
! csIndexFile = m_saMulPaths.GetAt(VERFILE_ANIMIDX);
! dwVerdataSection = VERFILE_ANIM;
break;
case ART_GUMP:
! csDataFile = m_saMulPaths.GetAt(VERFILE_GUMPART);
! csIndexFile = m_saMulPaths.GetAt(VERFILE_GUMPIDX);
! dwVerdataSection = VERFILE_GUMPART;
break;
case ART_TEXMAPS:
! csDataFile = m_saMulPaths.GetAt(VERFILE_TEXMAPS);
! csIndexFile = m_saMulPaths.GetAt(VERFILE_TEXIDX);
! dwVerdataSection = VERFILE_TEXMAPS;
break;
case ART_MULTI:
! csDataFile = m_saMulPaths.GetAt(VERFILE_MULTI);
! csIndexFile = m_saMulPaths.GetAt(VERFILE_MULTIIDX);
! dwVerdataSection = VERFILE_MULTI;
LoadArtData();
break;
case ART_LIGHTS:
! csDataFile = m_saMulPaths.GetAt(VERFILE_LIGHT);
! csIndexFile = m_saMulPaths.GetAt(VERFILE_LIGHTIDX);
! dwVerdataSection = VERFILE_LIGHT;
break;
case ART_MAPPREVIEW:
! csDataFile = m_saMulPaths.GetAt(VERFILE_STATICS0);
! csIndexFile = m_saMulPaths.GetAt(VERFILE_STAIDX0);
! csMapFile = m_saMulPaths.GetAt(VERFILE_MAP0);
! dwVerdataSection = VERFILE_STATICS0;
LoadArtData();
if ( (m_wDrawFlags & F_SHOWTERRAIN) )
***************
*** 830,837 ****
ArtIdx indexRec;
fIndex.Read(&indexRec, sizeof(ArtIdx));
! if ( indexRec.dwLookup != 0xFFFFFFFF )
{
// OK...there's data for this item...now is it raw or run?
! fData.Seek(indexRec.dwLookup, CFile::begin);
DWORD dwType;
switch ( sArtType )
--- 844,854 ----
ArtIdx indexRec;
fIndex.Read(&indexRec, sizeof(ArtIdx));
! // Check to see if there's a verdata entry for this!
! DWORD dwVerdataIdx = FindVerdata(dwVerdataSection, dwArtIndex);
! if ( indexRec.dwLookup != 0xFFFFFFFF || dwVerdataIdx != 0xFFFFFFFF)
{
// OK...there's data for this item...now is it raw or run?
! if ( indexRec.dwLookup != 0xFFFFFFFF )
! fData.Seek(indexRec.dwLookup, CFile::begin);
DWORD dwType;
switch ( sArtType )
***************
*** 875,881 ****
wArtWidth = (WORD) ((m_pVerdataIdx[dwVerdataIdx].dwCRC & 0xFFFF0000) >> 16);
wArtHeight = (WORD) (m_pVerdataIdx[dwVerdataIdx].dwCRC & 0xFFFF );
! CString csVerdata;
CFile fVerdata;
- csVerdata.Format("%sverdata.mul", m_csUOPath);
if ( fVerdata.Open(csVerdata, CFile::modeRead | CFile::typeBinary | CFile::shareDenyNone ) )
{
--- 892,897 ----
wArtWidth = (WORD) ((m_pVerdataIdx[dwVerdataIdx].dwCRC & 0xFFFF0000) >> 16);
wArtHeight = (WORD) (m_pVerdataIdx[dwVerdataIdx].dwCRC & 0xFFFF );
! CString csVerdata = m_saMulPaths.GetAt(VERFILE_VERDATA);
CFile fVerdata;
if ( fVerdata.Open(csVerdata, CFile::modeRead | CFile::typeBinary | CFile::shareDenyNone ) )
{
***************
*** 923,939 ****
for (int i = 0; i < wRun; i++ )
{
! DWORD dwColor = BlendColors(wColor, 0, false);
! BYTE r, g, b;
! b = (BYTE) ((dwColor >> 16) & 0xFF);
! g = (BYTE) ((dwColor >> 8) & 0xFF);
! r = (BYTE) ((dwColor) & 0xFF);
! int X, Y;
! X = m_xOffset + ( x - wArtWidth / 2 ) + bounds.Width() / 2;
! Y = m_yOffset + ( y - wArtHeight / 2 ) + bounds.Height() / 2;
! if ( X >= 0 && X < bounds.Width() && Y >=0 && Y < bounds.Height() )
{
! m_bPixels.SetAt((( (bounds.Width() * Y) + X) * 3), b);
! m_bPixels.SetAt((( (bounds.Width() * Y) + X) * 3) + 1, g);
! m_bPixels.SetAt((( (bounds.Width() * Y) + X) * 3) + 2, r);
}
x++;
--- 939,958 ----
for (int i = 0; i < wRun; i++ )
{
! if ( wColor )
{
! DWORD dwColor = BlendColors(wColor, 0, false);
! BYTE r, g, b;
! b = (BYTE) ((dwColor >> 16) & 0xFF);
! g = (BYTE) ((dwColor >> 8) & 0xFF);
! r = (BYTE) ((dwColor) & 0xFF);
! int X, Y;
! X = m_xOffset + ( x - wArtWidth / 2 ) + bounds.Width() / 2;
! Y = m_yOffset + ( y - wArtHeight / 2 ) + bounds.Height() / 2;
! if ( X >= 0 && X < bounds.Width() && Y >=0 && Y < bounds.Height() )
! {
! m_bPixels.SetAt((( (bounds.Width() * Y) + X) * 3), b);
! m_bPixels.SetAt((( (bounds.Width() * Y) + X) * 3) + 1, g);
! m_bPixels.SetAt((( (bounds.Width() * Y) + X) * 3) + 2, r);
! }
}
x++;
***************
*** 959,964 ****
else
wSize = (WORD) (m_pVerdataIdx[dwVerdataIdx].dwCRC & 0xFFFF);
! CString csVerdata;
! csVerdata.Format("%sverdata.mul", m_csUOPath);
CFile fVerdata;
if ( fVerdata.Open(csVerdata, CFile::modeRead | CFile::typeBinary | CFile::shareDenyNone) )
--- 978,982 ----
else
wSize = (WORD) (m_pVerdataIdx[dwVerdataIdx].dwCRC & 0xFFFF);
! CString csVerdata = m_saMulPaths.GetAt(VERFILE_VERDATA);
CFile fVerdata;
if ( fVerdata.Open(csVerdata, CFile::modeRead | CFile::typeBinary | CFile::shareDenyNone) )
***************
*** 1017,1023 ****
{
wSize = (WORD) (m_pVerdataIdx[dwVerdataIdx].dwCRC & 0xFFFF);
! CString csVerdata;
CFile fVerdata;
- csVerdata.Format("%sverdata.mul", m_csUOPath);
if ( fVerdata.Open(csVerdata, CFile::modeRead | CFile::typeBinary | CFile::shareDenyNone) )
{
--- 1035,1040 ----
{
wSize = (WORD) (m_pVerdataIdx[dwVerdataIdx].dwCRC & 0xFFFF);
! CString csVerdata = m_saMulPaths.GetAt(VERFILE_VERDATA);
CFile fVerdata;
if ( fVerdata.Open(csVerdata, CFile::modeRead | CFile::typeBinary | CFile::shareDenyNone) )
{
***************
*** 1073,1079 ****
if ( dwVerdataIdx != 0xFFFFFFFF )
{
! CString csVerdata;
CFile fVerdata;
- csVerdata.Format("%sverdata.mul", m_csUOPath);
if ( fVerdata.Open(csVerdata, CFile::modeRead | CFile::typeBinary | CFile::shareDenyNone) )
{
--- 1090,1095 ----
if ( dwVerdataIdx != 0xFFFFFFFF )
{
! CString csVerdata = m_saMulPaths.GetAt(VERFILE_VERDATA);
CFile fVerdata;
if ( fVerdata.Open(csVerdata, CFile::modeRead | CFile::typeBinary | CFile::shareDenyNone) )
{
***************
*** 1176,1182 ****
if ( dwVerdataIdx == 0xFFFFFFFF )
{
! CString csVerdata;
CFile fVerdata;
- csVerdata.Format("%sverdata.mul", m_csUOPath);
if ( fVerdata.Open(csVerdata, CFile::modeRead | CFile::shareDenyNone | CFile::typeBinary) )
{
--- 1192,1197 ----
if ( dwVerdataIdx == 0xFFFFFFFF )
{
! CString csVerdata = m_saMulPaths.GetAt(VERFILE_VERDATA);
CFile fVerdata;
if ( fVerdata.Open(csVerdata, CFile::modeRead | CFile::shareDenyNone | CFile::typeBinary) )
{
***************
*** 1322,1328 ****
if ( dwVerdataIdx != 0xFFFFFFFF )
{
! CString csVerdata;
CFile fVerdata;
- csVerdata.Format("%sverdata.mul", m_csUOPath);
if ( fVerdata.Open(csVerdata, CFile::modeRead | CFile::typeBinary | CFile::shareDenyNone) )
{
--- 1337,1342 ----
if ( dwVerdataIdx != 0xFFFFFFFF )
{
! CString csVerdata = m_saMulPaths.GetAt(VERFILE_VERDATA);
CFile fVerdata;
if ( fVerdata.Open(csVerdata, CFile::modeRead | CFile::typeBinary | CFile::shareDenyNone) )
{
***************
*** 1627,1632 ****
{
CFile cfHues;
! CString csHueFile;
! csHueFile.Format(_T("%shues.mul"), m_csUOPath);
if ( cfHues.Open( csHueFile, CFile::modeRead | CFile::typeBinary | CFile::shareDenyNone ) )
{
--- 1641,1645 ----
{
CFile cfHues;
! CString csHueFile = m_saMulPaths.GetAt(VERFILE_HUES);
if ( cfHues.Open( csHueFile, CFile::modeRead | CFile::typeBinary | CFile::shareDenyNone ) )
{
***************
*** 1645,1649 ****
cfHues.Close();
}
! csHueFile.Format("%sverdata.mul", m_csUOPath);
if ( cfHues.Open( csHueFile, CFile::modeRead | CFile::typeBinary | CFile::shareDenyNone ) )
{
--- 1658,1662 ----
cfHues.Close();
}
! csHueFile = m_saMulPaths.GetAt(VERFILE_VERDATA);
if ( cfHues.Open( csHueFile, CFile::modeRead | CFile::typeBinary | CFile::shareDenyNone ) )
{
***************
*** 1738,1743 ****
{
CFile cfTiledata;
! CString csFile;
! csFile.Format("%stiledata.mul", m_csUOPath);
if ( cfTiledata.Open(csFile, CFile::modeRead | CFile::typeBinary | CFile::shareDenyNone) )
{
--- 1751,1755 ----
{
CFile cfTiledata;
! CString csFile = m_saMulPaths.GetAt(VERFILE_TILEDATA);
if ( cfTiledata.Open(csFile, CFile::modeRead | CFile::typeBinary | CFile::shareDenyNone) )
{
***************
*** 1875,1880 ****
CFile cfArtIdx, cfArtMul;
CString csIdxFile, csMulFile;
! csIdxFile.Format("%sartidx.mul", m_csUOPath);
! csMulFile.Format("%sart.mul", m_csUOPath);
DWORD * dwIdx = new DWORD [0x30000];
if ( cfArtIdx.Open(csIdxFile, CFile::modeRead | CFile::typeBinary | CFile::shareDenyNone) )
--- 1887,1892 ----
CFile cfArtIdx, cfArtMul;
CString csIdxFile, csMulFile;
! csIdxFile = m_saMulPaths.GetAt(VERFILE_ARTIDX);
! csMulFile = m_saMulPaths.GetAt(VERFILE_ART);
DWORD * dwIdx = new DWORD [0x30000];
if ( cfArtIdx.Open(csIdxFile, CFile::modeRead | CFile::typeBinary | CFile::shareDenyNone) )
***************
*** 2116,2121 ****
delete [] m_pVerdataIdx;
! CString csVerdata;
! csVerdata.Format("%sverdata.mul", m_csUOPath);
CFile fVerdata;
--- 2128,2132 ----
delete [] m_pVerdataIdx;
! CString csVerdata = m_saMulPaths.GetAt(VERFILE_VERDATA);
CFile fVerdata;
***************
*** 2138,2140 ****
}
return -1;
! }
\ No newline at end of file
--- 2149,2278 ----
}
return -1;
! }
!
! void CUOArtCtrl::SetMulPath(LPCTSTR pszNewPath)
! {
! m_csUOPath = _T(pszNewPath);
! if ( m_csUOPath.GetAt(m_csUOPath.GetLength() - 1) != '\\')
! m_csUOPath += _T("\\");
! InitializeMulPaths();
! }
!
! void CUOArtCtrl::InitializeMulPaths()
! {
! m_saMulPaths.SetSize(37);
!
! CString csPath;
!
! csPath.Format("%smap0.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_MAP0, csPath);
!
! csPath.Format("%sstaidx0.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_STAIDX0, csPath);
!
! csPath.Format("%sstatics0.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_STATICS0, csPath);
!
! csPath.Format("%sartidx.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_ARTIDX, csPath);
!
! csPath.Format("%sart.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_ART, csPath);
!
! csPath.Format("%sanim.idx", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_ANIMIDX, csPath);
!
! csPath.Format("%sanim.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_ANIM, csPath);
!
! csPath.Format("%ssoundidx.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_SOUNDIDX, csPath);
!
! csPath.Format("%ssound.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_SOUND, csPath);
!
! csPath.Format("%stexidx.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_TEXIDX, csPath);
!
! csPath.Format("%stexmaps.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_TEXMAPS, csPath);
!
! csPath.Format("%sgumpidx.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_GUMPIDX, csPath);
!
! csPath.Format("%sgumpart.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_GUMPART, csPath);
!
! csPath.Format("%smulti.idx", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_MULTIIDX, csPath);
!
! csPath.Format("%smulti.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_MULTI, csPath);
!
! csPath.Format("%sskills.idx", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_SKILLSIDX, csPath);
!
! csPath.Format("%sskills.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_SKILLS, csPath);
!
! csPath.Format("%slightidx.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_LIGHTIDX, csPath);
!
! csPath.Format("%slight.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_LIGHT, csPath);
!
! csPath.Format("%stiledata.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_TILEDATA, csPath);
!
! csPath.Format("%sanimdata.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_ANIMDATA, csPath);
!
! csPath.Format("%shues.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_HUES, csPath);
!
! csPath.Format("%saniminfo.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_ANIMINFO, csPath);
!
! csPath.Format("%sfonts.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_FONTS, csPath);
!
! csPath.Format("%sradarcol.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_RADARCOL, csPath);
!
! csPath.Format("%sverdata.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_VERDATA, csPath);
!
! csPath.Format("%smap2.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_MAP2, csPath);
!
! csPath.Format("%sstaidx2.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_STAIDX2, csPath);
!
! csPath.Format("%sstatics2.mul", m_csUOPath);
! m_saMulPaths.SetAt(VERFILE_STATICS2, csPath);
! }
!
! BSTR CUOArtCtrl::GetMulPath()
! {
! return m_csUOPath.AllocSysString();
! }
!
! BOOL CUOArtCtrl::SetCustomMulFile(short sFileIndex, LPCTSTR pszNewFilePath)
! {
! if ( sFileIndex < 0 || sFileIndex > m_saMulPaths.GetUpperBound() || ( sFileIndex >= 0x13 && sFileIndex <=0x1d) )
! return FALSE; // Invalid index!
! m_saMulPaths.SetAt(sFileIndex, pszNewFilePath);
! return TRUE;
! }
!
! BSTR CUOArtCtrl::GetCustomMulPath(short sFileIndex)
! {
! CString strResult;
! if ( sFileIndex < 0 || sFileIndex > m_saMulPaths.GetUpperBound() || ( sFileIndex >= 0x13 && sFileIndex <=0x1d) )
! {
! // Do nothing...we never set these
! }
! else
! strResult = m_saMulPaths.GetAt(sFileIndex);
! return strResult.AllocSysString();
! }
Index: UOArtCtl.h
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArtCtl.h,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -C2 -r1.6.2.3 -r1.6.2.4
*** UOArtCtl.h 12 Sep 2001 17:58:59 -0000 1.6.2.3
--- UOArtCtl.h 11 May 2002 05:17:21 -0000 1.6.2.4
***************
*** 100,107 ****
DWORD dwCRC;
! CVerdataIdx();
};
! #define VERFILE_MAP 0x00
#define VERFILE_STAIDX0 0x01
#define VERFILE_STATICS0 0x02
--- 100,107 ----
DWORD dwCRC;
! CVerdataIdx();
};
! #define VERFILE_MAP0 0x00
#define VERFILE_STAIDX0 0x01
#define VERFILE_STATICS0 0x02
***************
*** 125,128 ****
--- 125,137 ----
#define VERFILE_ANIMDATA 0x1f
#define VERFILE_HUES 0x20
+ // don't know about these...so we'll assign them numbers for now
+ #define VERFILE_ANIMINFO 0x21
+ #define VERFILE_FONTS 0x22
+ #define VERFILE_RADARCOL 0x23
+ #define VERFILE_VERDATA 0x24
+ #define VERFILE_MAP2 0x25
+ #define VERFILE_STAIDX2 0x26
+ #define VERFILE_STATICS2 0x27
+
class CItemCache
***************
*** 175,180 ****
--- 184,193 ----
// Implementation
protected:
+ CString m_csMulPath;
+ CStringArray m_saMulPaths;
+
CPtrArray m_paStatics;
CPtrArray m_paDynamics;
+ void InitializeMulPaths();
BYTE m_tiledata [0xFD000];
void LoadTiledata();
***************
*** 253,256 ****
--- 266,273 ----
afx_msg void RemoveHideStatic(short ID, long Block, short x, short y, short z, short color);
afx_msg void RedrawControl();
+ afx_msg void SetMulPath(LPCTSTR pszNewPath);
+ afx_msg BSTR GetMulPath();
+ afx_msg BOOL SetCustomMulFile(short sFileIndex, LPCTSTR pszNewFilePath);
+ afx_msg BSTR GetCustomMulPath(short sFileIndex);
//}}AFX_DISPATCH
DECLARE_DISPATCH_MAP()
***************
*** 285,288 ****
--- 302,309 ----
dispidRemoveHideStatic = 19L,
dispidRedrawControl = 20L,
+ dispidSetMulPath = 21L,
+ dispidGetMulPath = 22L,
+ dispidSetCustomMulFile = 23L,
+ dispidGetCustomMulPath = 24L,
//}}AFX_DISP_ID
};
Index: UOArt.opt
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArt.opt,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -C2 -r1.8.2.2 -r1.8.2.3
Binary files /tmp/cvs3TU42d and /tmp/cvsSdl3Fj differ
|
|
From: Philip E. <pes...@us...> - 2002-05-10 19:29:29
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv23279
Modified Files:
drewsky.rc
Log Message:
Updated build number to 0.13.1.10.
Index: drewsky.rc
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/drewsky.rc,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** drewsky.rc 10 May 2002 00:06:44 -0000 1.32
--- drewsky.rc 10 May 2002 19:29:25 -0000 1.33
***************
*** 1,4 ****
//Microsoft Developer Studio generated resource script.
! // Last compiled 5/9/2002 at 18:4:24
#include "resource.h"
--- 1,4 ----
//Microsoft Developer Studio generated resource script.
! // Last compiled 5/10/2002 at 13:24:35
#include "resource.h"
***************
*** 616,631 ****
CONTROL "Allow Close from system menu",IDC_SYSCLOSE,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,71,110,10
- CONTROL "Read from Remote Server",IDC_USEREMOTE,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,173,12,103,10
- PUSHBUTTON "Close Axis",IDC_CLOSE,286,19,69,13
- PUSHBUTTON "Reload Scripts",IDC_RELOAD_SCRIPTS,286,32,69,13
- PUSHBUTTON "Close UO Client",IDC_CLOSE_CLIENT,286,45,69,13
- GROUPBOX "Actions",IDC_STATIC,283,10,75,104
- GROUPBOX "Remote Profiles",IDC_STATIC,168,2,113,112
CONTROL "Show Spawnpoints on Radar Map",IDC_SHOWSPAWNS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,81,124,10
- PUSHBUTTON "About Axis",IDC_ABOUTHOG,286,97,69,13
CONTROL "Allow Multiple Instances of Axis",IDC_ALLOWMULTIPLE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,91,116,10
LTEXT "NPC Spawn Color",IDC_STATIC,374,69,58,8,NOT WS_GROUP
LTEXT "Item Spawn Color",IDC_STATIC,374,80,56,8,NOT WS_GROUP
--- 616,646 ----
CONTROL "Allow Close from system menu",IDC_SYSCLOSE,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,71,110,10
CONTROL "Show Spawnpoints on Radar Map",IDC_SHOWSPAWNS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,81,124,10
CONTROL "Allow Multiple Instances of Axis",IDC_ALLOWMULTIPLE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,91,116,10
+ CONTROL "Only load RESOURCE scripts",IDC_RESOURCEONLY,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,109,10
+ CONTROL "Read from Remote Server",IDC_USEREMOTE,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,173,12,103,10
+ LISTBOX IDC_REMOTEPROFILES,174,25,103,71,LBS_SORT |
+ LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+ PUSHBUTTON "New",IDC_RP_NEW,179,98,30,14
+ PUSHBUTTON "Edit",IDC_RP_EDIT,211,98,30,14
+ PUSHBUTTON "Delete",IDC_RP_DELETE,243,98,30,14
+ PUSHBUTTON "Close Axis",IDC_CLOSE,286,14,69,12
+ PUSHBUTTON "Reload Scripts",IDC_RELOAD_SCRIPTS,286,26,69,12
+ PUSHBUTTON "Close UO Client",IDC_CLOSE_CLIENT,286,38,69,12
+ PUSHBUTTON "GUI Script Editor",IDC_SCRIPTEDIT,286,50,69,12,WS_GROUP
+ PUSHBUTTON "Raw Text Editor",IDC_RAWEDIT,286,62,69,12
+ PUSHBUTTON "Account Manager",IDC_ACCTEDIT,286,74,69,12
+ PUSHBUTTON "Additional Settings",IDC_ADDITIONALSETTINGS,286,86,69,
+ 12
+ PUSHBUTTON "About Axis",IDC_ABOUTHOG,286,98,69,12
+ PUSHBUTTON "Static Tool",IDC_LAUNCH_STATIC_TOOL,369,16,85,13,NOT
+ WS_VISIBLE
+ PUSHBUTTON "Refresh Categories",IDC_REFRESHCATEGORIES,369,29,85,13
+ GROUPBOX "Actions",IDC_STATIC,283,2,75,112
+ GROUPBOX "Remote Profiles",IDC_STATIC,168,2,113,112
LTEXT "NPC Spawn Color",IDC_STATIC,374,69,58,8,NOT WS_GROUP
LTEXT "Item Spawn Color",IDC_STATIC,374,80,56,8,NOT WS_GROUP
***************
*** 634,642 ****
CONTROL "",IDC_ITEM_COLOR,"Static",SS_BLACKFRAME | SS_NOTIFY |
SS_SUNKEN,362,80,10,9
- LISTBOX IDC_REMOTEPROFILES,174,25,103,71,LBS_SORT |
- LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "New",IDC_RP_NEW,179,98,30,14
- PUSHBUTTON "Edit",IDC_RP_EDIT,211,98,30,14
- PUSHBUTTON "Delete",IDC_RP_DELETE,243,98,30,14
GROUPBOX "Command Mode",IDC_STATIC,360,91,113,23
CONTROL "dot",IDC_CMDMODE0,"Button",BS_AUTORADIOBUTTON |
--- 649,652 ----
***************
*** 646,654 ****
CONTROL "slash",IDC_CMDMODE2,"Button",BS_AUTORADIOBUTTON,440,101,
32,10
- PUSHBUTTON "GUI Script Editor",IDC_SCRIPTEDIT,286,58,69,13,WS_GROUP
- PUSHBUTTON "Raw Text Editor",IDC_RAWEDIT,286,71,69,13
- PUSHBUTTON "Account Manager",IDC_ACCTEDIT,286,84,69,13
- CONTROL "Only load RESOURCE scripts",IDC_RESOURCEONLY,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,100,109,10
CONTROL "",IDC_DIALOG_COLOR,"Static",SS_BLACKFRAME | SS_NOTIFY |
SS_SUNKEN | NOT WS_VISIBLE,362,49,10,9
--- 656,659 ----
***************
*** 659,665 ****
LTEXT "Interface Text Color",IDC_STATIC,374,59,63,8,NOT
WS_VISIBLE
- PUSHBUTTON "Static Tool",IDC_LAUNCH_STATIC_TOOL,369,16,85,13,NOT
- WS_VISIBLE
- PUSHBUTTON "Refresh Categories",IDC_REFRESHCATEGORIES,369,29,85,13
END
--- 664,667 ----
***************
*** 2247,2250 ****
--- 2249,2311 ----
END
+ IDD_ADDITIONAL_SETTINGS DIALOG DISCARDABLE 0, 0, 374, 270
+ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+ CAPTION "Axis Configuration"
+ FONT 8, "MS Sans Serif"
+ BEGIN
+ DEFPUSHBUTTON "OK",IDOK,317,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,317,24,50,14
+ GROUPBOX "Display Settings",IDC_STATIC,7,120,156,143
+ GROUPBOX "Basic Axis Settings",IDC_STATIC,7,7,156,111
+ GROUPBOX "Script Profiles",IDC_STATIC,166,39,201,224
+ CONTROL "Display message when spawnpoint is initialized",
+ IDC_AS_SPAWNMSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,
+ 16,152,9
+ CONTROL "Startup with launcher tab in focus",
+ IDC_AS_STARTLAUNCHER,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,10,26,152,9
+ CONTROL "Display pictures in Item Generator",IDC_AS_DISPLAYITEMS,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,36,152,9
+ CONTROL "Scale pictures of tall items",IDC_AS_SCALE,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,10,46,152,9
+ CONTROL "Always on top",IDC_AS_ONTOP,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,10,56,152,9
+ CONTROL "Item Generator 3D Room View",IDC_AS_3DROOMVIEW,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,10,66,152,9
+ CONTROL "Show Radar Map in Travel Guide",IDC_AS_RADAR,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,10,76,152,9
+ CONTROL "Allow Close from system menu",IDC_AS_SYSCLOSE,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,10,86,152,9
+ CONTROL "Show Spawnpoints on Radar Map",IDC_AS_SHOWSPAWNS,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,10,96,152,9
+ CONTROL "Display pictures in Spawn Tab",IDC_AS_SHOWCHARS,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,10,106,152,9
+ GROUPBOX "Default Ultima Online Client file",IDC_STATIC,12,130,
+ 146,25
+ GROUPBOX "Default Mulfile Path",IDC_STATIC,12,156,146,38
+ CONTROL "Use same path as default client",
+ IDC_AS_USESAMEPATHASCLIENT,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,16,181,131,11
+ GROUPBOX "Mulfile Overrides",IDC_STATIC,12,195,146,64
+ PUSHBUTTON "Browse",IDC_AS_CLIENTBROWSE,125,138,30,13
+ PUSHBUTTON "Browse",IDC_AS_MULBROWSE,125,166,30,13
+ CONTROL "List1",IDC_AS_CUSTOMMULS,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,15,205,139,51
+ LTEXT "Default Client EXE",IDC_AS_DEFUALTCLIENT,16,139,108,10,
+ SS_CENTERIMAGE
+ LTEXT "Default Mulfile Path",IDC_AS_DEFUALTMULPATH,16,168,108,
+ 10,SS_CENTERIMAGE
+ LTEXT "Profiles",IDC_STATIC,172,47,24,8
+ LISTBOX IDC_AS_PROFILES,171,55,190,55,LBS_SORT |
+ LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Available Scripts",IDC_STATIC,174,126,53,8
+ PUSHBUTTON "New",IDC_AS_NEWPROFILE,195,113,33,11
+ PUSHBUTTON "Edit",IDC_AS_EDITPROFILE,244,113,33,11
+ PUSHBUTTON "Delete",IDC_AS_DELETEPROFILE,293,113,33,11
+ CONTROL "Tree1",IDC_AS_AVAILABLESCRIPTS,"SysTreeView32",
+ TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT |
+ TVS_CHECKBOXES | WS_BORDER | WS_TABSTOP,173,134,191,127
+ END
+
#ifndef _MAC
***************
*** 2255,2260 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,0,0,9
! PRODUCTVERSION 1,0,0,9
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 2316,2321 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 0,13,1,10
! PRODUCTVERSION 0,13,1,10
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 2274,2278 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "axis MFC Application\0"
! VALUE "FileVersion", "1, 0, 0, 9\0"
VALUE "InternalName", "axis\0"
VALUE "LegalCopyright", "Copyright (C) 1998-2002\0"
--- 2335,2339 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "axis MFC Application\0"
! VALUE "FileVersion", "0, 13, 1, 10\0"
VALUE "InternalName", "axis\0"
VALUE "LegalCopyright", "Copyright (C) 1998-2002\0"
***************
*** 2281,2285 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Axis\0"
! VALUE "ProductVersion", "1, 0, 0, 9\0"
VALUE "SpecialBuild", "\0"
END
--- 2342,2346 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Axis\0"
! VALUE "ProductVersion", "0, 13, 1, 10\0"
VALUE "SpecialBuild", "\0"
END
***************
*** 2820,2823 ****
--- 2881,2892 ----
TOPMARGIN, 7
BOTTOMMARGIN, 82
+ END
+
+ IDD_ADDITIONAL_SETTINGS, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 367
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 263
END
END
|
|
From: Philip E. <pes...@us...> - 2002-05-10 19:24:15
|
Update of /cvsroot/sphere-axis/Axis In directory usw-pr-cvs1:/tmp/cvs-serv21672 Modified Files: Axis.txt Log Message: Updated release notes Index: Axis.txt =================================================================== RCS file: /cvsroot/sphere-axis/Axis/Axis.txt,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -r1.24 -r1.25 *** Axis.txt 10 May 2002 00:07:05 -0000 1.24 --- Axis.txt 10 May 2002 19:24:12 -0000 1.25 *************** *** 24,28 **** Release Notes for the Axis GM Tool ============================================================================= ! Changes in version 0.13b (in development) · Fixed a possible issue when selecting spawn groups from the spawn tab. · Non-resource scripts will no longer be downloaded from remote servers. --- 24,33 ---- Release Notes for the Axis GM Tool ============================================================================= ! Changes in version 0.13.2 (in development) ! · Tweaked the remote console a bit. Errors should be more visible, and hopefully more useful. ! · Fixed a crash bug that occurs when the default client is in a directory that doesn't contain the mul files. ! · Changed the version naming scheme. Versions prior to what would have been 0.13b (now 0.13.2) are now numbered ! 0.13.1.n, where n is a build number. Version numbers can be viewed in the About Axis box, and aren't related to CVS ! revisions. · Fixed a possible issue when selecting spawn groups from the spawn tab. · Non-resource scripts will no longer be downloaded from remote servers. |
|
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
|
|
From: Philip E. <pes...@us...> - 2002-05-10 19:22:49
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv21125
Modified Files:
RemoteConsole.cpp RemoteConsoleDlg.cpp
Log Message:
Tweaked the remote console a bit. Errors should be more visible, and
hopefully more useful.
Index: RemoteConsole.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/RemoteConsole.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** RemoteConsole.cpp 1 May 2002 03:33:10 -0000 1.7
--- RemoteConsole.cpp 10 May 2002 19:22:47 -0000 1.8
***************
*** 125,128 ****
--- 125,129 ----
UINT MainThread(LPVOID lpData)
{
+ BYTE szBuffer[MAX_BUFFER];
CRemoteConsole * pConsole = (CRemoteConsole *) lpData;
if (pConsole == NULL)
***************
*** 153,159 ****
{
pConsole->m_bIsInitialized = true;
! DWORD dwErr = GetLastError();
CString csMessage;
! csMessage.Format("Could not connect to the remote console: dwErr = %ld\nHost = %s, Port =%ld\nThis is usually because the Sphere server isn't running.", dwErr, pConsole->m_csHostAddress, pConsole->m_nHostPort);
//AfxMessageBox(csMessage, MB_OK | MB_ICONEXCLAMATION);
closesocket(sock.m_hSocket);
--- 154,170 ----
{
pConsole->m_bIsInitialized = true;
! char szError[MAX_BUFFER];
! FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), 0, &szError[0], MAX_BUFFER, NULL);
! CString csError;
! csError.Format("%s", szError);
! char crlf [3] = { 0x0d, 0x0a, 0x00 };
! csError.Replace(crlf, "");
CString csMessage;
! csMessage.Format("Could not connect to the remote console --\nLast Error was \"%s\"\nHost = %s, Port =%ld\nThis is usually because the Sphere server isn't running.\n", csError , pConsole->m_csHostAddress, pConsole->m_nHostPort);
! memset(&szBuffer[0], 0x00, MAX_BUFFER);
! memcpy(&szBuffer[0], LPCTSTR(csMessage), csMessage.GetLength());
! if ( pConsole->m_parentHWnd != NULL )
! SendMessage(pConsole->m_parentHWnd, WM_RCONSOLEMESSAGE, (WPARAM) &szBuffer[0], 0);
!
//AfxMessageBox(csMessage, MB_OK | MB_ICONEXCLAMATION);
closesocket(sock.m_hSocket);
***************
*** 164,168 ****
}
// Log on.
- BYTE szBuffer[MAX_BUFFER];
memset(&szBuffer[0], 0x00, sizeof(szBuffer));
szBuffer[0] = (char) 0x20;
--- 175,178 ----
***************
*** 173,177 ****
CString csMessage;
DWORD dwErr = GetLastError();
! csMessage.Format("Error while sending login info to the remote console: dwErr = %ld\nIs the TUS server running?", dwErr);
AfxMessageBox(csMessage, MB_OK | MB_ICONEXCLAMATION);
pConsole->m_bIsInitialized = true;
--- 183,187 ----
CString csMessage;
DWORD dwErr = GetLastError();
! csMessage.Format("Error while sending login info to the remote console: dwErr = %ld\nIs the Sphere server running?", dwErr);
AfxMessageBox(csMessage, MB_OK | MB_ICONEXCLAMATION);
pConsole->m_bIsInitialized = true;
***************
*** 197,201 ****
if ( rc < 0 )
{
! Main->m_log.Add("Socket error on select(): %ld - %s", WSAGetLastError(), strerror(WSAGetLastError()));
closesocket(sock.m_hSocket);
sock.m_hSocket = INVALID_SOCKET;
--- 207,214 ----
if ( rc < 0 )
{
! CString csMessage;
! csMessage.Format("Socket error on select(): %ld - %s", WSAGetLastError(), strerror(WSAGetLastError()));
! Main->m_log.Add(csMessage);
! AfxMessageBox(csMessage, MB_OK | MB_ICONEXCLAMATION);
closesocket(sock.m_hSocket);
sock.m_hSocket = INVALID_SOCKET;
***************
*** 206,210 ****
if ( rc == 0 && i++ > Main->m_iReceiveTimeout )
{
! Main->m_log.Add("Timeout exceeded while receiving data from remote server.");
closesocket(sock.m_hSocket);
sock.m_hSocket = INVALID_SOCKET;
--- 219,226 ----
if ( rc == 0 && i++ > Main->m_iReceiveTimeout )
{
! CString csMessage;
! csMessage.Format("Timeout exceeded while receiving data from remote server.");
! Main->m_log.Add(csMessage);
! AfxMessageBox(csMessage, MB_OK | MB_ICONEXCLAMATION);
closesocket(sock.m_hSocket);
sock.m_hSocket = INVALID_SOCKET;
***************
*** 247,251 ****
CString csMessage;
DWORD dwErr = GetLastError();
! csMessage.Format("Error while sending password to the remote console: dwErr = %ld\nIs the TUS server still running?", dwErr);
AfxMessageBox(csMessage, MB_OK | MB_ICONEXCLAMATION);
pConsole->m_bIsInitialized = true;
--- 263,267 ----
CString csMessage;
DWORD dwErr = GetLastError();
! csMessage.Format("Error while sending password to the remote console: dwErr = %ld\nIs the Sphere server still running?", dwErr);
AfxMessageBox(csMessage, MB_OK | MB_ICONEXCLAMATION);
pConsole->m_bIsInitialized = true;
***************
*** 259,262 ****
--- 275,280 ----
pConsole->m_bIsInitialized = true;
i = 0;
+
+ // Here's the main loop
while (pConsole->m_bContinue)
{
***************
*** 289,304 ****
{
// Socket error
! memcpy(&szBuffer[0], "Connection closed.", 18);
if(pConsole->m_parentHWnd != NULL)
SendMessage(pConsole->m_parentHWnd, WM_RCONSOLEMESSAGE, (WPARAM) &szBuffer[0], 0);
break;
}
- /*
- if ( i++ > Main->m_iReceiveTimeout )
- {
- Main->m_log.Add("Timeout exceeded while receiving data from remote server.");
- break;
- }
- */
if (pConsole->m_bCommandPending)
{
--- 307,324 ----
{
// Socket error
! char szError[MAX_BUFFER];
! FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), 0, &szError[0], MAX_BUFFER, NULL);
! CString csError;
! csError.Format("%s", szError);
! char crlf[3] = { 0x0d, 0x0a, 0x00};
! csError.Replace(crlf, "");
! CString csMessage;
! csMessage.Format("Connection lost. Last Error was \"%s\"\n", csError);
! memset(&szBuffer[0], 0x00, MAX_BUFFER);
! memcpy(&szBuffer[0], LPCTSTR(csMessage), csMessage.GetLength());
if(pConsole->m_parentHWnd != NULL)
SendMessage(pConsole->m_parentHWnd, WM_RCONSOLEMESSAGE, (WPARAM) &szBuffer[0], 0);
break;
}
if (pConsole->m_bCommandPending)
{
***************
*** 312,317 ****
--- 332,348 ----
}
}
+ if ( !pConsole->m_bContinue)
+ {
+ // We were told to stop
+ char szMessage[256];
+ sprintf(szMessage, "Disconnecting from remote server...");
+ memset(&szBuffer[0], 0x00, MAX_BUFFER);
+ memcpy(&szBuffer[0], &szMessage[0], strlen(szMessage));
+ if ( pConsole->m_parentHWnd != NULL )
+ SendMessage(pConsole->m_parentHWnd, WM_RCONSOLEMESSAGE, (WPARAM) &szBuffer[0], 0);
+ }
// Disconnect the socket
closesocket(sock.m_hSocket);
+
sock.m_hSocket = INVALID_SOCKET;
pConsole->m_bCommandPending = false;
Index: RemoteConsoleDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/RemoteConsoleDlg.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** RemoteConsoleDlg.cpp 2 May 2002 22:19:57 -0000 1.7
--- RemoteConsoleDlg.cpp 10 May 2002 19:22:47 -0000 1.8
***************
*** 140,152 ****
if (m_bIsConnected)
{
! this->m_cbReconnect.SetWindowText("ReConnect");
m_bIsConnected = false;
this->m_rConsole->m_bContinue = false;
int i = 0;
! while (this->m_rConsole->IsConnected() && i < 100)
! {
! i++;
! Sleep(100);
! }
}
else
--- 140,148 ----
if (m_bIsConnected)
{
! CWaitCursor hourglass;
m_bIsConnected = false;
this->m_rConsole->m_bContinue = false;
int i = 0;
! this->m_cbReconnect.SetWindowText("ReConnect");
}
else
|
|
From: Philip E. <pes...@us...> - 2002-05-10 19:22:18
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv20925
Modified Files:
ColorSelectionDlg.cpp
Log Message:
Fixed a crash bug that occurs when the default client is in a directory that
doesn't contain the mul files.
Index: ColorSelectionDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/ColorSelectionDlg.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** ColorSelectionDlg.cpp 5 May 2002 16:21:32 -0000 1.9
--- ColorSelectionDlg.cpp 10 May 2002 19:22:11 -0000 1.10
***************
*** 173,177 ****
--- 173,180 ----
}
else
+ {
AfxMessageBox("Hues were not successfully loaded at startup, so the palette is not available", MB_OK);
+ m_sShade.EnableWindow(FALSE);
+ }
BITMAPINFO bmi;
***************
*** 243,246 ****
--- 246,251 ----
int groupIndex = colorIndex / 8;
int hueIndex = colorIndex % 8;
+ if ( Main->m_aHueGroups.GetUpperBound() < groupIndex )
+ return;
CHueGroup * pGroup = (CHueGroup *) Main->m_aHueGroups.GetAt(groupIndex);
if ( pGroup != NULL )
***************
*** 304,307 ****
--- 309,314 ----
int groupIndex = colorIndex / 8;
int hueIndex = colorIndex % 8;
+ if ( Main->m_aHueGroups.GetUpperBound() < groupIndex )
+ return;
CHueGroup * pGroup = (CHueGroup *) Main->m_aHueGroups.GetAt(groupIndex);
if ( pGroup == NULL )
|
|
From: Philip E. <pes...@us...> - 2002-05-10 00:07:11
|
Update of /cvsroot/sphere-axis/Axis In directory usw-pr-cvs1:/tmp/cvs-serv15269 Modified Files: Axis.txt Log Message: updated release notes Index: Axis.txt =================================================================== RCS file: /cvsroot/sphere-axis/Axis/Axis.txt,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -r1.23 -r1.24 *** Axis.txt 8 May 2002 18:46:22 -0000 1.23 --- Axis.txt 10 May 2002 00:07:05 -0000 1.24 *************** *** 25,28 **** --- 25,31 ---- ============================================================================= Changes in version 0.13b (in development) + · Fixed a possible issue when selecting spawn groups from the spawn tab. + · Non-resource scripts will no longer be downloaded from remote servers. + · Item attributes will now be cleared properly in the Item Tweak tab. · Fixed a crash bug when Axis is reading remote scripts AND non-resource files. · Fixed the checksum algorithm to ignore CR and LF chars, since different OSes |
|
From: Philip E. <pes...@us...> - 2002-05-10 00:06:46
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv14958
Modified Files:
drewsky.rc
Log Message:
Updated build number
Index: drewsky.rc
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/drewsky.rc,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** drewsky.rc 9 May 2002 04:14:04 -0000 1.31
--- drewsky.rc 10 May 2002 00:06:44 -0000 1.32
***************
*** 1,4 ****
//Microsoft Developer Studio generated resource script.
! // Last compiled 5/8/2002 at 22:12:48
#include "resource.h"
--- 1,4 ----
//Microsoft Developer Studio generated resource script.
! // Last compiled 5/9/2002 at 18:4:24
#include "resource.h"
***************
*** 2255,2260 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,0,0,8
! PRODUCTVERSION 1,0,0,8
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 2255,2260 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,0,0,9
! PRODUCTVERSION 1,0,0,9
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 2274,2278 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "axis MFC Application\0"
! VALUE "FileVersion", "1, 0, 0, 8\0"
VALUE "InternalName", "axis\0"
VALUE "LegalCopyright", "Copyright (C) 1998-2002\0"
--- 2274,2278 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "axis MFC Application\0"
! VALUE "FileVersion", "1, 0, 0, 9\0"
VALUE "InternalName", "axis\0"
VALUE "LegalCopyright", "Copyright (C) 1998-2002\0"
***************
*** 2281,2285 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Axis\0"
! VALUE "ProductVersion", "1, 0, 0, 8\0"
VALUE "SpecialBuild", "\0"
END
--- 2281,2285 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Axis\0"
! VALUE "ProductVersion", "1, 0, 0, 9\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: Philip E. <pes...@us...> - 2002-05-10 00:06:27
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv14620
Modified Files:
SPAWNTAB.CPP
Log Message:
Fixed a possible issue when selecting spawn groups from the spawn tab.
Index: SPAWNTAB.CPP
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/SPAWNTAB.CPP,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** SPAWNTAB.CPP 8 May 2002 15:44:18 -0000 1.10
--- SPAWNTAB.CPP 10 May 2002 00:06:21 -0000 1.11
***************
*** 384,409 ****
if ( pObject->m_csFilename == "" )
return;
! CString csSection;
! CNPC npc;
! npc.CopyBase(pObject);
! npc.Load();
! WORD wID;
! if ( isdigit(npc.m_csValue.GetAt(0) ) )
{
! if ( ahextoi(npc.m_csValue) < 0x0400 && ahextoi(npc.m_csValue) != 0 )
! wID = (WORD) ahextoi(npc.m_csValue);
else
! wID = npc.m_wID;
}
! else
{
! if ( DefLookup(npc.m_csValue) < 0x0400 && DefLookup(npc.m_csValue) != 0 )
! wID = (WORD) DefLookup(npc.m_csValue);
! else
! wID = npc.m_wID;
}
- WORD wColor = (WORD) DefLookup(npc.m_csColor);
- m_Display.SetArtColor(wColor);
- m_Display.SetArtIndex(wID);
*pResult = 0;
--- 384,417 ----
if ( pObject->m_csFilename == "" )
return;
! // Is this an NPC or a spawn group?
! if ( pObject->m_bType == TYPE_CHAR )
{
! CNPC npc;
! npc.CopyBase(pObject);
! npc.Load();
! WORD wID;
! if ( isdigit(npc.m_csValue.GetAt(0) ) )
! {
! if ( ahextoi(npc.m_csValue) < 0x0400 && ahextoi(npc.m_csValue) != 0 )
! wID = (WORD) ahextoi(npc.m_csValue);
! else
! wID = npc.m_wID;
! }
else
! {
! if ( DefLookup(npc.m_csValue) < 0x0400 && DefLookup(npc.m_csValue) != 0 )
! wID = (WORD) DefLookup(npc.m_csValue);
! else
! wID = npc.m_wID;
! }
! WORD wColor = (WORD) DefLookup(npc.m_csColor);
! m_Display.SetArtColor(wColor);
! m_Display.SetArtIndex(wID);
}
! else if ( pObject->m_bType == TYPE_SPAWN )
{
! // What should we display for a spawn group?
! // Nothing for now
}
*pResult = 0;
|
