sphere-axis-commits Mailing List for Axis for Sphere (Page 25)
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-08-12 02:29:07
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv7575
Modified Files:
CScriptObjects.cpp
Log Message:
fixed a bug where locations were being loaded twice for the 0.52 script version.
Index: CScriptObjects.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/CScriptObjects.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** CScriptObjects.cpp 20 Jul 2002 04:13:55 -0000 1.21
--- CScriptObjects.cpp 12 Aug 2002 02:29:02 -0000 1.22
***************
*** 2803,2806 ****
--- 2803,2808 ----
}
}
+ this->LoadFile("hoglocs.scp");
+ this->LoadFile("custloc.scp");
}
else
***************
*** 2811,2815 ****
this->LoadDefs();
this->LoadItems();
! //this->LoadLocations(); These will be loaded later
this->LoadMap();
this->LoadNames();
--- 2813,2817 ----
this->LoadDefs();
this->LoadItems();
! this->LoadLocations();
this->LoadMap();
this->LoadNames();
***************
*** 2820,2825 ****
this->LoadTriggers();
}
- this->LoadFile("hoglocs.scp");
- this->LoadFile("custloc.scp");
this->CategorizeItems();
this->CategorizeLocations();
--- 2822,2825 ----
|
|
From: Philip E. <pes...@us...> - 2002-08-11 18:29:01
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv9717
Modified Files:
drewsky.rc axis.html
Log Message:
Updated build number and Revision history.
Index: drewsky.rc
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/drewsky.rc,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -r1.54 -r1.55
*** drewsky.rc 8 Aug 2002 16:17:57 -0000 1.54
--- drewsky.rc 11 Aug 2002 18:28:56 -0000 1.55
***************
*** 1,4 ****
//Microsoft Developer Studio generated resource script.
! //
#include "resource.h"
--- 1,4 ----
//Microsoft Developer Studio generated resource script.
! // Last compiled 8/11/2002 at 12:2:7
#include "resource.h"
***************
*** 2377,2382 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 0,13,2,1
! PRODUCTVERSION 0,13,2,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 2377,2382 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 0,13,2,2
! PRODUCTVERSION 0,13,2,2
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 2396,2400 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "axis MFC Application\0"
! VALUE "FileVersion", "0, 13, 2, 1\0"
VALUE "InternalName", "axis\0"
VALUE "LegalCopyright", "Copyright (C) 1998-2002\0"
--- 2396,2400 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "axis MFC Application\0"
! VALUE "FileVersion", "0, 13, 2, 2\0"
VALUE "InternalName", "axis\0"
VALUE "LegalCopyright", "Copyright (C) 1998-2002\0"
***************
*** 2403,2407 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Axis\0"
! VALUE "ProductVersion", "0, 13, 2, 1\0"
VALUE "SpecialBuild", "\0"
END
--- 2403,2407 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Axis\0"
! VALUE "ProductVersion", "0, 13, 2, 2\0"
VALUE "SpecialBuild", "\0"
END
Index: axis.html
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/axis.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** axis.html 25 Jul 2002 02:34:34 -0000 1.2
--- axis.html 11 Aug 2002 18:28:56 -0000 1.3
***************
*** 47,50 ****
--- 47,61 ----
<big><b>Release Notes for the Axis GM Tool</b></big><br>
<b>Changes in version 0.13.3 (in development)</b><br>
+ · Fix for bug #492452.The map plane edit box now reflects the plane of the selected location.<br>
+ · Fixed a few minor bugs with registry functions.<br>
+ · Fix for bug #492453.Support for map planes in the location editor.<br>
+ · Added ability to store multiple remote console logins.<br>
+ · Added a GOUID button to the Misc tab.<br>
+ · Fix for tracker 588988. 'Play music' was sending command in the wrong format.<br>
+ · added ability to save artID includes and excludes in the StaticTool.<br>
+ · Fix for tracker 588924. Only the headers of dynamic items removed by the static tool were being stripped from the worldfile, not the entire item.<br>
+ · Fix for tracker #586505. Spawns weren't being displayed on the map in the Travel Tab.<br>
+ · Updated the bugs.txt file.<br>
+ · Fixed a bug where local profiles weren't being deleted because the registry key Axis was trying to delete was wrong.<br>
· Added support for anim2.mul.<br>
· hoglocs.scp will always be loaded now, assuming Axis can find it.<br>
***************
*** 578,582 ****
· Added nudgeup and nudgedown to the item generator<br>
· Added ability to scale pictures of tall items<br>
! · Added item type selection to Item Tweak<br>
· Added ability to set item name from Item Tweak<br>
· Added nudgeup/nudgedown to Item Tweak<br>
--- 589,593 ----
· Added nudgeup and nudgedown to the item generator<br>
· Added ability to scale pictures of tall items<br>
! · Added item type selection to Item Tweak<br>
· Added ability to set item name from Item Tweak<br>
· Added nudgeup/nudgedown to Item Tweak<br>
***************
*** 589,592 ****
--- 600,605 ----
· Made Item Generator recognize defs in the ID tag when displaying custom items (thx Soreus)<br>
· Fixed encryption algorithm used when saving account passwords on launcher (thx Garion)<br>
+
+ Thanks to Ignatius for all the work he did on IGT, which was the basis of this project.<br>
</body>
|
|
From: Philip E. <pes...@us...> - 2002-08-08 20:45:01
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv15936
Modified Files:
adddestination.cpp adddestination.h
Log Message:
Fix for bug #492452. The map plane edit box now reflects the plane of the
selected location.
Index: adddestination.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/adddestination.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** adddestination.cpp 1 May 2002 03:33:11 -0000 1.3
--- adddestination.cpp 8 Aug 2002 20:44:58 -0000 1.4
***************
*** 50,53 ****
--- 50,54 ----
m_csYCoord = _T("");
m_csZCoord = _T("");
+ m_csPlane = _T("");
//}}AFX_DATA_INIT
}
***************
*** 67,70 ****
--- 68,72 ----
DDX_Text(pDX, IDC_YCOORD, m_csYCoord);
DDX_Text(pDX, IDC_ZCOORD, m_csZCoord);
+ DDX_Text(pDX, IDC_PLANE, m_csPlane);
//}}AFX_DATA_MAP
}
***************
*** 116,124 ****
}
m_csZCoord.TrimLeft();
! if ((m_csZCoord == "") || (m_csZCoord.SpanIncluding("0123456789-") != m_csZCoord))
{
AfxMessageBox("Invalid value for Z coordinate", MB_OK | MB_ICONEXCLAMATION);
return;
}
CDialog::OnOK();
--- 118,133 ----
}
m_csZCoord.TrimLeft();
! if ((m_csZCoord == "") || (m_csZCoord.SpanIncluding("0123456789-") != m_csZCoord) || (atoi(m_csZCoord) < -128) || (atoi(m_csZCoord) > 128))
{
AfxMessageBox("Invalid value for Z coordinate", MB_OK | MB_ICONEXCLAMATION);
return;
}
+ m_csPlane.TrimLeft();
+ if ((m_csPlane == "") || (m_csPlane.SpanIncluding("0123456789-") != m_csPlane) || (atoi(m_csPlane) < 0) || (atoi(m_csPlane) > 255))
+ {
+ AfxMessageBox("Invalid value for map plane", MB_OK | MB_ICONEXCLAMATION);
+ return;
+ }
+
CDialog::OnOK();
Index: adddestination.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/adddestination.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** adddestination.h 1 May 2002 03:33:11 -0000 1.3
--- adddestination.h 8 Aug 2002 20:44:58 -0000 1.4
***************
*** 53,56 ****
--- 53,57 ----
CString m_csYCoord;
CString m_csZCoord;
+ CString m_csPlane;
//}}AFX_DATA
|
|
From: Philip E. <pes...@us...> - 2002-08-08 16:26:59
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv31439
Modified Files:
traveltab.cpp
Log Message:
Fix for bug #492452. The map plane edit box now reflects the plane of the
selected location.
Index: traveltab.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/traveltab.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** traveltab.cpp 8 Aug 2002 16:17:57 -0000 1.20
--- traveltab.cpp 8 Aug 2002 16:26:56 -0000 1.21
***************
*** 451,454 ****
--- 451,457 ----
else
m = 0;
+ CString csPlane;
+ csPlane.Format("%ld", m);
+ m_ceMapPlane.SetWindowText(csPlane);
}
else
|
|
From: Philip E. <pes...@us...> - 2002-08-08 16:18:05
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv28827
Modified Files:
drewsky.rc resource.h traveltab.cpp
Log Message:
Fix for bug #492453. Support for map planes in the location editor.
Index: drewsky.rc
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/drewsky.rc,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** drewsky.rc 7 Aug 2002 22:28:50 -0000 1.53
--- drewsky.rc 8 Aug 2002 16:17:57 -0000 1.54
***************
*** 698,714 ****
WS_TABSTOP
EDITTEXT IDC_DESCRIPTION,47,53,123,12,ES_AUTOHSCROLL
! EDITTEXT IDC_XCOORD,37,78,32,12,ES_AUTOHSCROLL
! EDITTEXT IDC_YCOORD,87,78,32,12,ES_AUTOHSCROLL
! EDITTEXT IDC_ZCOORD,139,78,32,12,ES_AUTOHSCROLL
DEFPUSHBUTTON "OK",IDOK,180,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,180,24,50,14
PUSHBUTTON "Add",IDC_ADD_CATEGORY,144,7,25,14
PUSHBUTTON "Add",IDC_ADD_SUBSECTION,144,30,25,14
! LTEXT "X",IDC_STATIC,26,81,8,8
! LTEXT "Y",IDC_STATIC,75,82,8,8
! LTEXT "Z",IDC_STATIC,129,80,8,8
LTEXT "Category",IDC_STATIC,14,9,29,8
LTEXT "Subsection",IDC_STATIC,7,33,36,8
LTEXT "Description",IDC_STATIC,7,57,36,8
END
--- 698,716 ----
WS_TABSTOP
EDITTEXT IDC_DESCRIPTION,47,53,123,12,ES_AUTOHSCROLL
! EDITTEXT IDC_XCOORD,32,78,32,12,ES_AUTOHSCROLL | ES_NUMBER
! EDITTEXT IDC_YCOORD,82,78,32,12,ES_AUTOHSCROLL | ES_NUMBER
! EDITTEXT IDC_ZCOORD,134,78,32,12,ES_AUTOHSCROLL
DEFPUSHBUTTON "OK",IDOK,180,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,180,24,50,14
PUSHBUTTON "Add",IDC_ADD_CATEGORY,144,7,25,14
PUSHBUTTON "Add",IDC_ADD_SUBSECTION,144,30,25,14
! LTEXT "X",IDC_STATIC,21,80,8,8
! LTEXT "Y",IDC_STATIC,70,80,8,8
! LTEXT "Z",IDC_STATIC,124,80,8,8
LTEXT "Category",IDC_STATIC,14,9,29,8
LTEXT "Subsection",IDC_STATIC,7,33,36,8
LTEXT "Description",IDC_STATIC,7,57,36,8
+ EDITTEXT IDC_PLANE,187,78,32,12,ES_AUTOHSCROLL | ES_NUMBER
+ LTEXT "Plane",IDC_STATIC,168,80,19,8
END
Index: resource.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/resource.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** resource.h 7 Aug 2002 22:28:50 -0000 1.33
--- resource.h 8 Aug 2002 16:17:57 -0000 1.34
***************
*** 1092,1095 ****
--- 1092,1096 ----
#define IDC_YCOORD 1168
#define IDC_ZCOORD 1169
+ #define IDC_PLANE 1170
#define IDC_CATEGORY 1171
#define IDC_SUBSECTION 1172
Index: traveltab.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/traveltab.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** traveltab.cpp 25 Jul 2002 16:27:01 -0000 1.19
--- traveltab.cpp 8 Aug 2002 16:17:57 -0000 1.20
***************
*** 196,199 ****
--- 196,202 ----
dlgAdd.m_csZCoord = dlgAdd.m_csYCoord.Mid(dlgAdd.m_csYCoord.Find(",") + 1);
dlgAdd.m_csYCoord = dlgAdd.m_csYCoord.SpanExcluding(",");
+ dlgAdd.m_csPlane = dlgAdd.m_csZCoord.Mid(dlgAdd.m_csZCoord.Find(",") + 1);
+ dlgAdd.m_csZCoord = dlgAdd.m_csZCoord.SpanExcluding(",");
+
}
}
***************
*** 206,209 ****
--- 209,214 ----
dlgAdd.m_csZCoord = dlgAdd.m_csYCoord.Mid(dlgAdd.m_csYCoord.Find(",") + 1);
dlgAdd.m_csYCoord = dlgAdd.m_csYCoord.SpanExcluding(",");
+ dlgAdd.m_csPlane = dlgAdd.m_csZCoord.Mid(dlgAdd.m_csZCoord.Find(",") + 1);
+ dlgAdd.m_csZCoord = dlgAdd.m_csZCoord.SpanExcluding(",");
}
if (dlgAdd.DoModal() == IDOK)
***************
*** 215,220 ****
CString csY = dlgAdd.m_csYCoord;
CString csZ = dlgAdd.m_csZCoord;
CString csPoint;
! csPoint.Format("%s,%s,%s", csX, csY, csZ);
// Make sure an entry with this name doesn't already exist
CCategory * pCategory = FindCategory(&Main->m_pScripts->m_olLocations, csCategory);
--- 220,226 ----
CString csY = dlgAdd.m_csYCoord;
CString csZ = dlgAdd.m_csZCoord;
+ CString csP = dlgAdd.m_csPlane;
CString csPoint;
! csPoint.Format("%s,%s,%s,%s", csX, csY, csZ, csP);
// Make sure an entry with this name doesn't already exist
CCategory * pCategory = FindCategory(&Main->m_pScripts->m_olLocations, csCategory);
***************
*** 1035,1038 ****
--- 1041,1046 ----
dlgAdd.m_csZCoord = dlgAdd.m_csYCoord.Mid(dlgAdd.m_csYCoord.Find(",") + 1);
dlgAdd.m_csYCoord = dlgAdd.m_csYCoord.SpanExcluding(",");
+ dlgAdd.m_csPlane = dlgAdd.m_csZCoord.Mid(dlgAdd.m_csZCoord.Find(",") + 1);
+ dlgAdd.m_csZCoord = dlgAdd.m_csZCoord.SpanExcluding(",");
if (dlgAdd.DoModal() == IDOK)
{
***************
*** 1043,1048 ****
CString csY = dlgAdd.m_csYCoord;
CString csZ = dlgAdd.m_csZCoord;
CString csPoint;
! csPoint.Format("%s,%s,%s", csX, csY, csZ);
// Make sure an entry with this name doesn't already exist
CCategory * pCategory = FindCategory(&Main->m_pScripts->m_olLocations, csCategory);
--- 1051,1057 ----
CString csY = dlgAdd.m_csYCoord;
CString csZ = dlgAdd.m_csZCoord;
+ CString csP = dlgAdd.m_csPlane;
CString csPoint;
! csPoint.Format("%s,%s,%s,%s", csX, csY, csZ, csP);
// Make sure an entry with this name doesn't already exist
CCategory * pCategory = FindCategory(&Main->m_pScripts->m_olLocations, csCategory);
|
|
From: Philip E. <pes...@us...> - 2002-08-07 22:28:53
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv28392
Modified Files:
drewsky.rc RemoteConsoleLoginDlg.cpp RemoteConsoleLoginDlg.h
resource.h
Log Message:
Added ability to store multiple remote console logins.
Index: drewsky.rc
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/drewsky.rc,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** drewsky.rc 25 Jul 2002 03:35:05 -0000 1.52
--- drewsky.rc 7 Aug 2002 22:28:50 -0000 1.53
***************
*** 1,4 ****
//Microsoft Developer Studio generated resource script.
! // Last compiled 7/24/2002 at 20:41:24
#include "resource.h"
--- 1,4 ----
//Microsoft Developer Studio generated resource script.
! //
#include "resource.h"
***************
*** 554,558 ****
END
! IDD_MISC_TAB DIALOG DISCARDABLE 0, 0, 399, 108
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Misc"
--- 554,558 ----
END
! IDD_MISC_TAB DIALOG DISCARDABLE 0, 0, 493, 109
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Misc"
***************
*** 593,598 ****
GROUPBOX "Music",IDC_STATIC,7,31,213,27
GROUPBOX "Sound Effects",IDC_STATIC,7,55,292,27
! GROUPBOX "Broadcast",IDC_STATIC,7,79,292,27
! GROUPBOX "Other Commands",IDC_STATIC,302,2,90,104
END
--- 593,600 ----
GROUPBOX "Music",IDC_STATIC,7,31,213,27
GROUPBOX "Sound Effects",IDC_STATIC,7,55,292,27
! GROUPBOX "Broadcast",IDC_STATIC,7,80,292,27
! GROUPBOX "Other Commands",IDC_STATIC,302,2,90,105
! PUSHBUTTON "GoUID",IDC_GOUID,395,12,40,14
! EDITTEXT IDC_UID,435,12,50,14,ES_AUTOHSCROLL
END
***************
*** 2244,2264 ****
END
! IDD_REMOTE_CONSOLE_LOGIN_DLG DIALOG DISCARDABLE 0, 0, 348, 89
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Remote Console Login"
FONT 8, "MS Sans Serif"
BEGIN
! EDITTEXT IDC_ACCT,142,58,99,12,ES_AUTOHSCROLL
! EDITTEXT IDC_PWD,142,70,99,12,ES_PASSWORD | ES_AUTOHSCROLL
DEFPUSHBUTTON "OK",IDOK,291,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,291,24,50,14
! LTEXT "Account",IDC_STATIC,111,61,28,8
! LTEXT "Password",IDC_STATIC,107,74,32,8
LTEXT "Beginning in version 0.99f, Sphere no longer automatically uses the RemoteAdmin account with the remote console.",
IDC_STATIC,7,7,277,18
LTEXT "If you are using a version of Sphere before 0.99f, leave the Account field blank; otherwise, enter the UserID and Password that you would like to use to access the remote console.",
IDC_STATIC,7,26,277,25
! CONTROL "Save Account Information",IDC_SAVEPWD,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,244,66,94,9
END
--- 2246,2267 ----
END
! IDD_REMOTE_CONSOLE_LOGIN_DLG DIALOG DISCARDABLE 0, 0, 348, 106
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Remote Console Login"
FONT 8, "MS Sans Serif"
BEGIN
! EDITTEXT IDC_ACCT,142,73,99,12,ES_AUTOHSCROLL
! EDITTEXT IDC_PWD,142,86,99,12,ES_PASSWORD | ES_AUTOHSCROLL
DEFPUSHBUTTON "OK",IDOK,291,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,291,24,50,14
! LTEXT "Account",IDC_STATIC,111,76,28,8
! LTEXT "Password",IDC_STATIC,107,90,32,8
LTEXT "Beginning in version 0.99f, Sphere no longer automatically uses the RemoteAdmin account with the remote console.",
IDC_STATIC,7,7,277,18
LTEXT "If you are using a version of Sphere before 0.99f, leave the Account field blank; otherwise, enter the UserID and Password that you would like to use to access the remote console.",
IDC_STATIC,7,26,277,25
! COMBOBOX IDC_ACCTNAME,142,59,99,60,CBS_DROPDOWN | CBS_SORT |
! WS_VSCROLL | WS_TABSTOP
! LTEXT "Name",IDC_STATIC,119,62,20,8
END
***************
*** 2494,2500 ****
BEGIN
LEFTMARGIN, 7
! RIGHTMARGIN, 392
TOPMARGIN, 2
! BOTTOMMARGIN, 106
END
--- 2497,2503 ----
BEGIN
LEFTMARGIN, 7
! RIGHTMARGIN, 486
TOPMARGIN, 2
! BOTTOMMARGIN, 107
END
***************
*** 2936,2940 ****
RIGHTMARGIN, 341
TOPMARGIN, 7
! BOTTOMMARGIN, 82
END
--- 2939,2943 ----
RIGHTMARGIN, 341
TOPMARGIN, 7
! BOTTOMMARGIN, 98
END
Index: RemoteConsoleLoginDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/RemoteConsoleLoginDlg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** RemoteConsoleLoginDlg.cpp 1 May 2002 03:33:10 -0000 1.4
--- RemoteConsoleLoginDlg.cpp 7 Aug 2002 22:28:50 -0000 1.5
***************
*** 45,50 ****
m_csAccount = _T("");
m_csPassword = _T("");
- m_bSavePwd = FALSE;
//}}AFX_DATA_INIT
}
--- 45,50 ----
m_csAccount = _T("");
m_csPassword = _T("");
//}}AFX_DATA_INIT
+ m_iSel = 0;
}
***************
*** 54,60 ****
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CRemoteConsoleLoginDlg)
DDX_Text(pDX, IDC_ACCT, m_csAccount);
DDX_Text(pDX, IDC_PWD, m_csPassword);
- DDX_Check(pDX, IDC_SAVEPWD, m_bSavePwd);
//}}AFX_DATA_MAP
}
--- 54,60 ----
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CRemoteConsoleLoginDlg)
+ DDX_Control(pDX, IDC_ACCTNAME, m_ccbName);
DDX_Text(pDX, IDC_ACCT, m_csAccount);
DDX_Text(pDX, IDC_PWD, m_csPassword);
//}}AFX_DATA_MAP
}
***************
*** 63,66 ****
--- 63,68 ----
BEGIN_MESSAGE_MAP(CRemoteConsoleLoginDlg, CDialog)
//{{AFX_MSG_MAP(CRemoteConsoleLoginDlg)
+ ON_CBN_SELCHANGE(IDC_ACCTNAME, OnSelchangeAcctname)
+ ON_CBN_EDITCHANGE(IDC_ACCTNAME, OnEditchangeAcctname)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
***************
*** 74,84 ****
// Check the registry to see if we have account info saved
! m_bSavePwd = Main->GetRegistryDword("SaveRemoteLoginInfo") == 0 ? false : true;
! if ( m_bSavePwd )
{
! m_csAccount = Main->GetRegistryString("RemoteLoginAccount");
! m_csPassword = Encrypt(Main->GetRegistryString("RemoteLoginPassword"));
}
UpdateData(FALSE);
return TRUE; // return TRUE unless you set the focus to a control
--- 76,136 ----
// Check the registry to see if we have account info saved
!
! // First, see if it's saved the old way
! Main->DeleteRegistryValue("SaveRemoteLoginInfo");
! m_csAccount = Main->GetRegistryString("RemoteLoginAccount");
! m_csPassword = Encrypt(Main->GetRegistryString("RemoteLoginPassword"));
!
! // If so, save it in the new way, storing the Account field as the name
! if ( !m_csPassword.IsEmpty() )
! {
! m_csAccountName = m_csAccount;
! if ( m_csAccountName.IsEmpty() )
! m_csAccountName = "RemoteAdmin";
! // Create the new key
! CString csKey;
! csKey.Format("SOFTWARE\\Menasoft\\GM Tools\\Console Logins\\%s", m_csAccountName);
! Main->PutRegistryString("Account", m_csAccount, HKEY_LOCAL_MACHINE, csKey);
! Main->PutRegistryString("Password", Encrypt(m_csPassword), HKEY_LOCAL_MACHINE, csKey);
! // Then delete the old values so we don't do this again
! Main->DeleteRegistryValue("RemoteLoginAccount");
! Main->DeleteRegistryValue("RemoteLoginPassword");
! // Set this account as the active account
! Main->PutRegistryString("LastRemoteLoginAccount", m_csAccountName);
! }
!
! // Now populate the Names combo box
! // We have to enumerate the keys in the Console Logins section
! HKEY hKey;
! LONG lStatus;
! lStatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Menasoft\\GM Tools\\Console Logins", 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("%s", szBuffer);
! m_ccbName.AddString(csProfile);
! }
! iIndex++;
! }
! RegCloseKey(hKey);
}
+ // Now select the last selected login
+
+ CString csLast = Main->GetRegistryString("LastRemoteLoginAccount");
+ if ( csLast.IsEmpty() )
+ m_ccbName.SetCurSel(-1);
+ else
+ m_ccbName.SelectString(0, csLast);
+ OnSelchangeAcctname();
+
UpdateData(FALSE);
return TRUE; // return TRUE unless you set the focus to a control
***************
*** 88,98 ****
void CRemoteConsoleLoginDlg::OnOK()
{
! UpdateData();
! Main->PutRegistryDword("SaveRemoteLoginInfo", m_bSavePwd ? 1 : 0);
! if ( m_bSavePwd )
{
! Main->PutRegistryString("RemoteLoginAccount", m_csAccount);
! Main->PutRegistryString("RemoteLoginPassword", Encrypt(m_csPassword));
}
! CDialog::OnOK();
}
--- 140,194 ----
void CRemoteConsoleLoginDlg::OnOK()
{
! // Save the current stuff
! UpdateData(TRUE);
! CString csKey;
! m_ccbName.GetWindowText(m_csAccountName);
! csKey.Format("SOFTWARE\\Menasoft\\GM Tools\\Console Logins\\%s", m_csAccountName);
! Main->PutRegistryString("Account", m_csAccount, HKEY_LOCAL_MACHINE, csKey);
! Main->PutRegistryString("Password", Encrypt(m_csPassword), HKEY_LOCAL_MACHINE, csKey);
! Main->PutRegistryString("LastRemoteLoginAccount", m_csAccountName);
!
! CDialog::OnOK();
! }
!
! void CRemoteConsoleLoginDlg::OnSelchangeAcctname()
! {
! UpdateData(TRUE);
! // Save the previous stuff?
! CString csKey;
! /*
! if ( m_iSel != -1 )
{
! m_ccbName.GetLBText(m_iSel, m_csAccountName);
! csKey.Format("SOFTWARE\\Menasoft\\GM Tools\\Console Logins\\%s", m_csAccountName);
! Main->PutRegistryString("Account", m_csAccount, HKEY_LOCAL_MACHINE, csKey);
! Main->PutRegistryString("Password", Encrypt(m_csPassword), HKEY_LOCAL_MACHINE, csKey);
}
! */
!
! // Populate the fields with the values of the new selection
! m_iSel = m_ccbName.GetCurSel();
! if ( m_iSel == -1 )
! {
! m_csAccount = "";
! m_csPassword = "";
! UpdateData(FALSE);
! return;
! }
! m_ccbName.GetLBText(m_iSel, m_csAccountName);
! csKey.Format("SOFTWARE\\Menasoft\\GM Tools\\Console Logins\\%s", m_csAccountName);
! m_csAccount = Main->GetRegistryString("Account", "", HKEY_LOCAL_MACHINE, csKey);
! m_csPassword = Encrypt(Main->GetRegistryString("Password", "", HKEY_LOCAL_MACHINE, csKey));
!
! // Update the last account setting
! Main->PutRegistryString("LastRemoteLoginAccount", m_csAccountName);
! UpdateData(FALSE);
! }
!
! void CRemoteConsoleLoginDlg::OnEditchangeAcctname()
! {
! m_csAccount = "";
! m_csPassword = "";
! UpdateData(FALSE);
! m_iSel = -1;
}
Index: RemoteConsoleLoginDlg.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/RemoteConsoleLoginDlg.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** RemoteConsoleLoginDlg.h 1 May 2002 03:33:10 -0000 1.4
--- RemoteConsoleLoginDlg.h 7 Aug 2002 22:28:50 -0000 1.5
***************
*** 43,49 ****
//{{AFX_DATA(CRemoteConsoleLoginDlg)
enum { IDD = IDD_REMOTE_CONSOLE_LOGIN_DLG };
CString m_csAccount;
CString m_csPassword;
! BOOL m_bSavePwd;
//}}AFX_DATA
--- 43,50 ----
//{{AFX_DATA(CRemoteConsoleLoginDlg)
enum { IDD = IDD_REMOTE_CONSOLE_LOGIN_DLG };
+ CComboBox m_ccbName;
CString m_csAccount;
CString m_csPassword;
! CString m_csAccountName;
//}}AFX_DATA
***************
*** 58,61 ****
--- 59,63 ----
// Implementation
protected:
+ int m_iSel;
// Generated message map functions
***************
*** 63,66 ****
--- 65,70 ----
virtual BOOL OnInitDialog();
virtual void OnOK();
+ afx_msg void OnSelchangeAcctname();
+ afx_msg void OnEditchangeAcctname();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
Index: resource.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/resource.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** resource.h 17 Jul 2002 21:29:32 -0000 1.32
--- resource.h 7 Aug 2002 22:28:50 -0000 1.33
***************
*** 295,298 ****
--- 295,299 ----
#define IDC_POTIONEDIT 1017
#define IDC_ACCTEDIT 1017
+ #define IDC_GOUID 1017
#define IDC_BUTTON18 1018
#define IDC_SHRINK 1018
***************
*** 680,683 ****
--- 681,685 ----
#define IDC_PWD 1060
#define IDC_X2 1060
+ #define IDC_UID 1060
#define IDC_RADIO4 1061
#define IDC_EDIT3 1061
***************
*** 721,724 ****
--- 723,727 ----
#define IDC_TYPELIST 1061
#define IDC_Y1 1061
+ #define IDC_ACCTNAME 1061
#define IDC_RADIO5 1062
#define IDC_EDIT4 1062
|
|
From: Philip E. <pes...@us...> - 2002-08-07 22:28:22
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv28199
Modified Files:
MISCTAB.CPP MISCTAB.H
Log Message:
Added a GOUID button to the Misc tab
Index: MISCTAB.CPP
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/MISCTAB.CPP,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** MISCTAB.CPP 1 Aug 2002 18:06:25 -0000 1.17
--- MISCTAB.CPP 7 Aug 2002 22:28:19 -0000 1.18
***************
*** 665,668 ****
--- 665,669 ----
CPropertyPage::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CMiscTab)
+ DDX_Control(pDX, IDC_UID, m_ceUID);
DDX_Control(pDX, IDC_RCONSOLE, m_cbRemoteConsole);
DDX_Control(pDX, IDC_YELL, m_ceYellText);
***************
*** 702,705 ****
--- 703,707 ----
ON_BN_CLICKED(IDC_UNDERWEAR2, OnUnderwear2)
ON_BN_CLICKED(IDC_SEND_SFX, OnSendSfx)
+ ON_BN_CLICKED(IDC_GOUID, OnGouid)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
***************
*** 1258,1260 ****
--- 1260,1274 ----
csCmd.Format(".xsfx %s", csVal);
SendToUO(csCmd);
+ }
+
+ void CMiscTab::OnGouid()
+ {
+ CString csUID;
+ m_ceUID.GetWindowText(csUID);
+ if ( csUID.GetLength() > 0 )
+ {
+ CString csCmd;
+ csCmd.Format(".gouid %s", csUID);
+ SendToUO(csCmd);
+ }
}
Index: MISCTAB.H
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/MISCTAB.H,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** MISCTAB.H 17 Jul 2002 20:08:03 -0000 1.6
--- MISCTAB.H 7 Aug 2002 22:28:19 -0000 1.7
***************
*** 64,67 ****
--- 64,68 ----
//{{AFX_DATA(CMiscTab)
enum { IDD = IDD_MISC_TAB };
+ CEdit m_ceUID;
CButton m_cbRemoteConsole;
CEdit m_ceYellText;
***************
*** 110,113 ****
--- 111,115 ----
afx_msg void OnUnderwear2();
afx_msg void OnSendSfx();
+ afx_msg void OnGouid();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
|
|
From: Philip E. <pes...@us...> - 2002-08-07 22:27:18
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv27693
Modified Files:
Drewsky.cpp Drewsky.h
Log Message:
fixed a few minor bugs with registry functions
Index: Drewsky.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/Drewsky.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** Drewsky.cpp 17 Jul 2002 19:10:57 -0000 1.16
--- Drewsky.cpp 7 Aug 2002 22:27:13 -0000 1.17
***************
*** 514,520 ****
void CDrewskyApp::DeleteRegistryKey(CString csKeyName, HKEY hRootKey)
{
! LONG lStatus = RegDeleteKey(HKEY_LOCAL_MACHINE, csKeyName);
if ( lStatus != ERROR_SUCCESS )
m_log.Add("Error deleting registry key %s. Last error was %s", csKeyName, strerror(lStatus));
return;
}
--- 514,536 ----
void CDrewskyApp::DeleteRegistryKey(CString csKeyName, HKEY hRootKey)
{
! LONG lStatus = RegDeleteKey(hRootKey, csKeyName);
if ( lStatus != ERROR_SUCCESS )
m_log.Add("Error deleting registry key %s. Last error was %s", csKeyName, strerror(lStatus));
+ return;
+ }
+
+ void CDrewskyApp::DeleteRegistryValue(CString csValueName, CString csSubKey, HKEY hRootKey)
+ {
+ HKEY hKey;
+ LONG lStatus = RegOpenKey(hRootKey, csSubKey, &hKey);
+ if ( lStatus == ERROR_SUCCESS )
+ {
+ lStatus = RegDeleteValue(hKey, csValueName);
+ if ( lStatus != ERROR_SUCCESS )
+ m_log.Add("Error deleting registry value %s. Last error was %s", csValueName, strerror(lStatus));
+ RegCloseKey(hKey);
+ }
+ else
+ m_log.Add("Couldn't open registry key %s. Last error was %s", csSubKey, strerror(lStatus));
return;
}
Index: Drewsky.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/Drewsky.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** Drewsky.h 17 Jul 2002 19:10:57 -0000 1.12
--- Drewsky.h 7 Aug 2002 22:27:13 -0000 1.13
***************
*** 68,71 ****
--- 68,72 ----
int GetProfileType();
void DeleteRegistryKey(CString csKeyName, HKEY hRootKey = HKEY_LOCAL_MACHINE);
+ void DeleteRegistryValue(CString csValueName, CString csSubKey ="SOFTWARE\\Menasoft\\GM Tools", HKEY hRootKey = HKEY_LOCAL_MACHINE);
void PutRegistryDword(CString csValue, DWORD dwValue, HKEY hMainKey = HKEY_LOCAL_MACHINE, CString csSubKey = "SOFTWARE\\Menasoft\\GM Tools");
void PutRegistryString(CString csValue, CString csString, HKEY hMainKey = HKEY_LOCAL_MACHINE, CString csSubKey = "SOFTWARE\\Menasoft\\GM Tools");
|
|
From: Philip E. <pes...@us...> - 2002-08-06 19:56:56
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv13319
Modified Files:
StaticToolDlg.cpp
Log Message:
added ability to save artID includes and excludes in the StaticTool (still needs
to be tested).
Index: StaticToolDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/StaticToolDlg.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** StaticToolDlg.cpp 1 Aug 2002 18:02:03 -0000 1.31
--- StaticToolDlg.cpp 6 Aug 2002 19:56:52 -0000 1.32
***************
*** 58,61 ****
--- 58,63 ----
CString csTypeInclude = Main->GetRegistryString("StaticTypeInclude");
CString csTypeExclude = Main->GetRegistryString("StaticTypeExclude");
+ CString csArtInclude = Main->GetRegistryString("StaticArtInclude");
+ CString csArtExclude = Main->GetRegistryString("StaticArtExclude");
CString csTemp = csTypeInclude;
while ( csTemp != "" )
***************
*** 74,77 ****
--- 76,95 ----
csTemp.TrimLeft();
}
+ csTemp = csArtInclude;
+ while ( csTemp != "" )
+ {
+ CString csType = csTemp.SpanExcluding(" ");
+ this->m_wArtInclude.Add(atoi(csType));
+ csTemp = csTemp.Mid(csType.GetLength());
+ csTemp.TrimLeft();
+ }
+ csTemp = csArtExclude;
+ while ( csTemp != "" )
+ {
+ CString csType = csTemp.SpanExcluding(" ");
+ this->m_wArtExclude.Add(atoi(csType));
+ csTemp = csTemp.Mid(csType.GetLength());
+ csTemp.TrimLeft();
+ }
m_pParent = NULL;
m_iDrawRectIndex = -1;
***************
*** 172,175 ****
--- 190,204 ----
UpdateCriteriaWindow();
}
+ CString csTemp;
+ for ( int i = 0; i < m_wArtExclude.GetSize(); i++ )
+ {
+ CString csThis;
+ if ( i == m_wArtExclude.GetUpperBound() )
+ csThis.Format("%ld", m_wArtExclude.GetAt(i));
+ else
+ csThis.Format("%ld ", m_wArtExclude.GetAt(i));
+ csTemp += csThis;
+ }
+ Main->PutRegistryString("StaticArtExclude", csTemp);
}
***************
*** 196,199 ****
--- 225,239 ----
UpdateCriteriaWindow();
}
+ CString csTemp;
+ for ( int i = 0; i < m_wArtInclude.GetSize(); i++ )
+ {
+ CString csThis;
+ if ( i == m_wArtInclude.GetUpperBound() )
+ csThis.Format("%ld", m_wArtInclude.GetAt(i));
+ else
+ csThis.Format("%ld ", m_wArtInclude.GetAt(i));
+ csTemp += csThis;
+ }
+ Main->PutRegistryString("StaticArtInclude", csTemp);
}
|
|
From: Philip E. <pes...@us...> - 2002-08-01 18:06:32
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv17270
Modified Files:
MISCTAB.CPP
Log Message:
Possible fix for tracker 588988. Need to test this, though.
Index: MISCTAB.CPP
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/MISCTAB.CPP,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** MISCTAB.CPP 17 Jul 2002 21:29:32 -0000 1.16
--- MISCTAB.CPP 1 Aug 2002 18:06:25 -0000 1.17
***************
*** 745,749 ****
m_csMusicID.GetWindowText(csVal);
CString csCmd;
! csCmd.Format(".music %x", atoi(csVal));
SendToUO(csCmd);
}
--- 745,752 ----
m_csMusicID.GetWindowText(csVal);
CString csCmd;
! if ( Main->m_pScripts->m_bNewFormat )
! csCmd.Format(".music 0%x", atoi(csVal));
! else
! csCmd.Format(".music %x", atoi(csVal));
SendToUO(csCmd);
}
|
|
From: Philip E. <pes...@us...> - 2002-08-01 18:02:05
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv15439
Modified Files:
StaticToolDlg.cpp
Log Message:
Possible fix for tracker 588924. Need to test this, though.
Index: StaticToolDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/StaticToolDlg.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** StaticToolDlg.cpp 1 May 2002 03:33:10 -0000 1.30
--- StaticToolDlg.cpp 1 Aug 2002 18:02:03 -0000 1.31
***************
*** 1943,1946 ****
--- 1943,1966 ----
NewWorld.WriteString("\n");
}
+ else
+ {
+ // Oops! We were just deleting the [WORLDITEM blah] line but leaving everything else!
+ while ( bStatus )
+ {
+ DWORD dwPos = OldWorld.GetPosition();
+ bStatus = OldWorld.ReadString(csLine);
+ if ( ! bStatus )
+ break;
+ if ( ( line % 100 ) == 0 )
+ progress.SetPos((DWORD) OldWorld.GetPosition());
+ if ( csLine.Find("[") == 0 )
+ {
+ // We've hit the next block
+ OldWorld.Seek(dwPos, CFile::begin);
+ break;
+ }
+ line++;
+ }
+ }
}
else
|
|
From: Philip E. <pes...@us...> - 2002-07-30 22:01:43
|
Update of /cvsroot/sphere-axis/Axis In directory usw-pr-cvs1:/tmp/cvs-serv13827 Modified Files: bugs.txt Log Message: Updated the bugs.txt file. Index: bugs.txt =================================================================== RCS file: /cvsroot/sphere-axis/Axis/bugs.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** bugs.txt 1 May 2002 03:33:11 -0000 1.3 --- bugs.txt 30 Jul 2002 22:01:18 -0000 1.4 *************** *** 32,33 **** --- 32,36 ---- · remote Account manager can't find account file (fixed 0.13) · map script editor doesn't work for 55i, and possibly not even 0.51a. + + Bugs can be submitted on the SourceForge site at http://sphere-axis.sf.net + |
|
From: Philip E. <pes...@us...> - 2002-07-29 22:38:46
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv27111
Modified Files:
settingstab.cpp
Log Message:
Fixed a bug where local profiles weren't being deleted because the registry
key Axis was trying to delete was wrong.
Index: settingstab.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/settingstab.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** settingstab.cpp 29 May 2002 16:44:34 -0000 1.23
--- settingstab.cpp 29 Jul 2002 22:38:40 -0000 1.24
***************
*** 546,550 ****
return;
CString csKey;
! csKey.Format("SOFTWARE\\Menasoft\\GM Tools\\Remote Profiles\\%s", Main->GetProfileString());
Main->DeleteRegistryKey(csKey);
this->m_clcRmtProfiles.DeleteString( iSel );
--- 546,564 ----
return;
CString csKey;
! CString csType;
! switch (Main->GetProfileType() )
! {
! case PROFILE_NONE:
! case PROFILE_DEFAULT:
! AfxMessageBox("This profile cannot be deleted.", MB_OK);
! return;
! case PROFILE_LOCAL:
! csType.Format("Local Profiles");
! break;
! case PROFILE_REMOTE:
! csType.Format("Remote Profiles");
! break;
! }
! csKey.Format("SOFTWARE\\Menasoft\\GM Tools\\%s\\%s", csType, Main->GetProfileString());
Main->DeleteRegistryKey(csKey);
this->m_clcRmtProfiles.DeleteString( iSel );
|
|
From: Philip E. <pes...@us...> - 2002-07-26 20:36:36
|
Update of /cvsroot/sphere-axis/axissvr In directory usw-pr-cvs1:/tmp/cvs-serv16619 Modified Files: gwhogsvr.cpp gwhogsvr.h Log Message: Fixes for linux version. Index: gwhogsvr.cpp =================================================================== RCS file: /cvsroot/sphere-axis/axissvr/gwhogsvr.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** gwhogsvr.cpp 26 Jul 2002 19:05:55 -0000 1.15 --- gwhogsvr.cpp 26 Jul 2002 20:36:33 -0000 1.16 *************** *** 35,38 **** --- 35,39 ---- #include <unistd.h> #include <errno.h> + #include <netdb.h> extern int errno; extern char **environ; *************** *** 2462,2464 **** return 1; return 0; ! } \ No newline at end of file --- 2463,2466 ---- return 1; return 0; ! } ! Index: gwhogsvr.h =================================================================== RCS file: /cvsroot/sphere-axis/axissvr/gwhogsvr.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** gwhogsvr.h 26 Jul 2002 19:05:56 -0000 1.6 --- gwhogsvr.h 26 Jul 2002 20:36:33 -0000 1.7 *************** *** 66,69 **** --- 66,70 ---- #define false 0 #define true 1 + #define HOSTENT struct hostent #endif |
|
From: Philip E. <pes...@us...> - 2002-07-26 19:06:09
|
Update of /cvsroot/sphere-axis/axissvr
In directory usw-pr-cvs1:/tmp/cvs-serv22486
Modified Files:
axissvr.cfg gwhogsvr.cpp gwhogsvr.dsp gwhogsvr.h
Log Message:
Added support for blocking and allowing specific hosts. Also a few minor bug
fixes.
Index: axissvr.cfg
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/axissvr.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** axissvr.cfg 21 May 2002 17:02:17 -0000 1.2
--- axissvr.cfg 26 Jul 2002 19:05:55 -0000 1.3
***************
*** 45,46 ****
--- 45,64 ----
# specified, and should be delimited by a colon. Do not include the '.'
ALLOWEDEXTENSIONS scp:ini:tmp:bkp
+
+ # DENIEDHOSTS specifies which hosts are denied access to this server. It
+ # can be a numerical IP, a fully qualified domain name, or all hosts in a
+ # given domain. If this is blank no hosts will be blocked, unless the
+ # ALLOWEDHOSTS setting is populated, in which case only those hosts will be
+ # permitted to connect to the server.
+ # To specify a domain, do not use a '*', instead use '.aol.com'. Entries
+ # should be delimited by a comma. e.g. '.adelphia.net,127.0.0.1'. Do not use
+ # quotes.
+ # DENIEDHOSTS .aol.com,.adelphia.net,192.168.
+
+ # ALLOWEDHOSTS specifies which hosts are allowed to access this server. It
+ # can be a numerical IP, a fully qualified domain name, or all hosts in a
+ # given domain. If left blank, all hosts not specifically denied are allowed.
+ # To specify a domain, do not use a '*', instead use '.aol.com'. Entries
+ # should be delimited by a comma. e.g. '.adelphia.net,127.0.0.1'. Do not use
+ # quotes.
+ # ALLOWEDHOSTS localhost,10.0.
Index: gwhogsvr.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/gwhogsvr.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** gwhogsvr.cpp 20 Jul 2002 00:16:02 -0000 1.14
--- gwhogsvr.cpp 26 Jul 2002 19:05:55 -0000 1.15
***************
*** 39,42 ****
--- 39,46 ----
#endif
+ #ifndef MAXBUFFER
+ #define MAXBUFFER 8192
+ #endif
+
#define SVR_VERSION "0.13.2.0"
#ifdef WIN32
***************
*** 60,63 ****
--- 64,69 ----
char g_szAllowedPaths[MAX_PATH];
char g_szAllowedExtensions[MAX_PATH];
+ char g_szAllowedHosts[MAX_BUFFER];
+ char g_szDeniedHosts[MAX_BUFFER];
char * g_pszSpawns;
int g_iReceiveTimeout;
***************
*** 114,117 ****
--- 120,127 ----
BOOL bUseThreads = TRUE;
g_bReadOnly = FALSE;
+ memset(&g_szAllowedPaths[0], 0x00, MAX_PATH);
+ memset(&g_szAllowedExtensions[0], 0x00, MAX_PATH);
+ memset(&g_szAllowedHosts[0], 0x00, MAX_BUFFER);
+ memset(&g_szDeniedHosts[0], 0x00, MAX_BUFFER);
SysMessage("Reading configuration file....");
FILE * pCfg;
***************
*** 153,156 ****
--- 163,170 ----
if (strstr(szLine, "RECEIVETIMEOUT") != NULL )
g_iReceiveTimeout = atoi(&szLine[15]);
+ if (strstr(szLine, "ALLOWEDHOSTS") != NULL )
+ strcpy(g_szAllowedHosts, &szLine[13]);
+ if (strstr(szLine, "DENIEDHOSTS") != NULL )
+ strcpy(g_szDeniedHosts, &szLine[12]);
}
}
***************
*** 266,269 ****
--- 280,284 ----
pThread->sock = Sock;
pThread->bThreadedApp = bUseThreads;
+ HOSTENT * hp = gethostbyaddr((char *) &SockAddr.sin_addr, sizeof(in_addr), AF_INET);
#ifdef WIN32
sprintf(pThread->szIPAddr, "%d.%d.%d.%d", ((((SockAddr).sin_addr).S_un).S_un_b).s_b1, ((((SockAddr).sin_addr).S_un).S_un_b).s_b2, ((((SockAddr).sin_addr).S_un).S_un_b).s_b3, ((((SockAddr).sin_addr).S_un).S_un_b).s_b4);
***************
*** 277,291 ****
sprintf(pThread->szIPAddr, "%d.%d.%d.%d", a, b, c, d);
#endif
! if ( bUseThreads )
{
#ifdef WIN32
! int tid = _beginthread(svrthread, 0, (LPVOID) pThread);
#else
! pthread_t tid;
! pthread_create( &tid, NULL, svrthread, pThread);
#endif
}
else
! svrthread(pThread);
}
#ifdef WIN32
--- 292,322 ----
sprintf(pThread->szIPAddr, "%d.%d.%d.%d", a, b, c, d);
#endif
! // Check to see whether this host is allowed or not
! if ( !HostIsAllowed(pThread->szIPAddr, hp) )
{
+ shutdown(Sock, 2);
+ SysMessage("Blocking incoming connection from %s (%s).\n", pThread->szIPAddr, hp->h_name);
#ifdef WIN32
! closesocket(Sock);
#else
! close(Sock);
#endif
+ delete pThread;
}
else
! {
! SysMessage("Socket %ld connected from %s (%s).\n", (int) pThread->sock, pThread->szIPAddr, hp->h_name);
! if ( bUseThreads )
! {
! #ifdef WIN32
! int tid = _beginthread(svrthread, 0, (LPVOID) pThread);
! #else
! pthread_t tid;
! pthread_create( &tid, NULL, svrthread, pThread);
! #endif
! }
! else
! svrthread(pThread);
! }
}
#ifdef WIN32
***************
*** 353,358 ****
char crlf[] = {0x0d, 0x0a, 0x00};
- SysMessage("Socket %ld connected from %s.\n", (int) pThread->sock, pThread->szIPAddr);
-
SOCKADDR_IN sin;
sin.sin_family = AF_INET;
--- 384,387 ----
***************
*** 374,377 ****
--- 403,419 ----
memset(&szIn[0], 0x00, sizeof(szIn));
nBytes = Receive(pThread->sock, szIn, sizeof(szIn));
+ if ( nBytes < 0 )
+ {
+ shutdown(pThread->sock, 2 );
+ SysMessage("Error receiving data on socket %ld. Closing\n", (int) pThread->sock);
+ SysMessage("Socket %ld from %s closed.\n", (int) pThread->sock, pThread->szIPAddr);
+ #ifdef WIN32
+ closesocket(pThread->sock);
+ return;
+ #else
+ close(pThread->sock);
+ return NULL;
+ #endif
+ }
szIn[nBytes] = 0x00;
Trim(&szIn[0], strlen(szIn));
***************
*** 385,388 ****
--- 427,443 ----
memset(&szIn[0], 0x00, sizeof(szIn));
nBytes = Receive(pThread->sock, &szIn[0], sizeof(szIn));
+ if ( nBytes < 0 )
+ {
+ shutdown(pThread->sock, 2 );
+ SysMessage("Error receiving data on socket %ld. Closing\n", (int) pThread->sock);
+ SysMessage("Socket %ld from %s closed.\n", (int) pThread->sock, pThread->szIPAddr);
+ #ifdef WIN32
+ closesocket(pThread->sock);
+ return;
+ #else
+ close(pThread->sock);
+ return NULL;
+ #endif
+ }
szIn[nBytes] = 0x00;
Trim(&szIn[0], strlen(szIn));
***************
*** 412,415 ****
--- 467,483 ----
continue;
nBytes = Receive(pThread->sock, szIn, sizeof(szIn));
+ if ( nBytes < 0 )
+ {
+ shutdown(pThread->sock, 2 );
+ SysMessage("Error receiving data on socket %ld. Closing\n", (int) pThread->sock);
+ SysMessage("Socket %ld from %s closed.\n", (int) pThread->sock, pThread->szIPAddr);
+ #ifdef WIN32
+ closesocket(pThread->sock);
+ return;
+ #else
+ close(pThread->sock);
+ return NULL;
+ #endif
+ }
szIn[nBytes] = 0x00;
if (nBytes > 0)
***************
*** 927,939 ****
}
shutdown(pThread->sock, 2 );
- #ifdef WIN32
- closesocket(pThread->sock);
- #else
- close(pThread->sock);
- #endif
SysMessage("Socket %ld from %s closed.\n", (int) pThread->sock, pThread->szIPAddr);
#ifdef WIN32
return;
#else
return NULL;
#endif
--- 995,1004 ----
}
shutdown(pThread->sock, 2 );
SysMessage("Socket %ld from %s closed.\n", (int) pThread->sock, pThread->szIPAddr);
#ifdef WIN32
+ closesocket(pThread->sock);
return;
#else
+ close(pThread->sock);
return NULL;
#endif
***************
*** 2349,2350 ****
--- 2414,2464 ----
#endif
}
+
+ int HostIsAllowed(const char * pszIPAddr, HOSTENT * pHostent)
+ {
+ // First check the DENIEDHOSTS setting
+ if ( g_szDeniedHosts[0] != 0x00 )
+ {
+ char * pTestHost = strtok(g_szDeniedHosts, ",");
+ while ( pTestHost != NULL )
+ {
+ if ( IsHostMatch(pszIPAddr, pHostent, pTestHost) )
+ {
+ // This host is blocked
+ return 0;
+ }
+ // Check the next one
+ pTestHost = strtok(NULL, ",");
+ }
+ }
+ // Check the ALLOWEDHOSTS setting
+ if ( g_szAllowedHosts[0] != 0x00 )
+ {
+ char * pTestHost = strtok(g_szAllowedHosts, ",");
+ while ( pTestHost != NULL )
+ {
+ if ( IsHostMatch(pszIPAddr, pHostent, pTestHost) )
+ {
+ // Host is allowed
+ return 1;
+ }
+ // Check the next one
+ pTestHost = strtok(NULL, ",");
+ }
+ // Not explicitly allowed
+ return 0;
+ }
+ // All other hosts are allowed
+ return 1;
+ }
+
+ int IsHostMatch(const char * pszIPAddr, HOSTENT * pHostent, const char * pszTestHost)
+ {
+ // First check the IP Address against the test host
+ if ( strstr(pszIPAddr, pszTestHost) != NULL )
+ return 1;
+ // Next check the hostname against the test host
+ if ( strstr(pHostent->h_name, pszTestHost) != NULL )
+ return 1;
+ return 0;
+ }
\ No newline at end of file
Index: gwhogsvr.dsp
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/gwhogsvr.dsp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** gwhogsvr.dsp 21 Apr 2001 01:42:43 -0000 1.1.1.1
--- gwhogsvr.dsp 26 Jul 2002 19:05:56 -0000 1.2
***************
*** 75,79 ****
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /out:"C:\dvp\scripts53\axissvr.exe" /pdbtype:sept
!ENDIF
--- 75,79 ----
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /out:"axissvr.exe" /pdbtype:sept
!ENDIF
Index: gwhogsvr.h
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/gwhogsvr.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** gwhogsvr.h 1 May 2002 03:34:06 -0000 1.5
--- gwhogsvr.h 26 Jul 2002 19:05:56 -0000 1.6
***************
*** 180,183 ****
--- 180,185 ----
void SendChecksum(SOCKET sock, const char * pszFilename );
void GetDirInfo(SOCKET sock, const char * pszPathname );
+ int HostIsAllowed(const char * pszIPAddr, HOSTENT * pHostent);
+ int IsHostMatch(const char * pszIPAddr, HOSTENT * pHostent, const char * pszTestHost);
const char * pszPLevels [] =
|
|
From: Philip E. <pes...@us...> - 2002-07-25 16:27:04
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv6793
Modified Files:
traveltab.cpp
Log Message:
Fix for tracker #586505. Spawns weren't being displayed on the map in the
Travel Tab.
Index: traveltab.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/traveltab.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** traveltab.cpp 20 Jul 2002 00:17:00 -0000 1.18
--- traveltab.cpp 25 Jul 2002 16:27:01 -0000 1.19
***************
*** 982,988 ****
csY = csTemp.SpanExcluding(",");
csTemp = csTemp.Mid(csTemp.Find(",") + 1);
! csZ = csTemp.SpanExcluding(",");
! csTemp = csTemp.Mid(csTemp.Find(",") + 1);
! csM = csTemp.SpanExcluding(",");
short x = (short) atoi(csX);
short y = (short) atoi(csY);
--- 982,995 ----
csY = csTemp.SpanExcluding(",");
csTemp = csTemp.Mid(csTemp.Find(",") + 1);
! if ( csTemp.Find(",") != -1 )
! {
! csTemp = csTemp.Mid(csTemp.Find(",") + 1);
! csZ = csTemp.SpanExcluding(",");
! if ( csTemp.Find(",") != -1 )
! {
! csTemp = csTemp.Mid(csTemp.Find(",") + 1);
! csM = csTemp.SpanExcluding(",");
! }
! }
short x = (short) atoi(csX);
short y = (short) atoi(csY);
|
|
From: Philip E. <pes...@us...> - 2002-07-25 03:35:36
|
Update of /cvsroot/sphere-axis/UOMap
In directory usw-pr-cvs1:/tmp/cvs-serv12022
Modified Files:
UOMap.rc
Log Message:
Updated build number
Index: UOMap.rc
===================================================================
RCS file: /cvsroot/sphere-axis/UOMap/UOMap.rc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** UOMap.rc 1 Jun 2002 06:52:13 -0000 1.10
--- UOMap.rc 25 Jul 2002 03:35:33 -0000 1.11
***************
*** 1,4 ****
//Microsoft Developer Studio generated resource script.
! //
#include "resource.h"
--- 1,4 ----
//Microsoft Developer Studio generated resource script.
! // Last compiled 7/24/2002 at 20:40:40
#include "resource.h"
***************
*** 55,60 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,2,1,0
! PRODUCTVERSION 1,2,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 55,60 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,2,1,1
! PRODUCTVERSION 1,2,1,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 74,78 ****
VALUE "CompanyName", "MCI WorldCom\0"
VALUE "FileDescription", "UOMap ActiveX Control Module\0"
! VALUE "FileVersion", "1, 2, 1, 0\0"
VALUE "InternalName", "UOMap\0"
VALUE "LegalCopyright", "Copyright (C) 2001\0"
--- 74,78 ----
VALUE "CompanyName", "MCI WorldCom\0"
VALUE "FileDescription", "UOMap ActiveX Control Module\0"
! VALUE "FileVersion", "1, 2, 1, 1\0"
VALUE "InternalName", "UOMap\0"
VALUE "LegalCopyright", "Copyright (C) 2001\0"
***************
*** 82,86 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "UOMap ActiveX Control Module\0"
! VALUE "ProductVersion", "1, 2, 1, 0\0"
VALUE "SpecialBuild", "\0"
END
--- 82,86 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "UOMap ActiveX Control Module\0"
! VALUE "ProductVersion", "1, 2, 1, 1\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: Philip E. <pes...@us...> - 2002-07-25 03:35:22
|
Update of /cvsroot/sphere-axis/UOArt
In directory usw-pr-cvs1:/tmp/cvs-serv11991
Modified Files:
UOArt.rc
Log Message:
Updated build number
Index: UOArt.rc
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArt.rc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** UOArt.rc 1 Jun 2002 06:51:29 -0000 1.11
--- UOArt.rc 25 Jul 2002 03:35:19 -0000 1.12
***************
*** 1,4 ****
//Microsoft Developer Studio generated resource script.
! //
#include "resource.h"
--- 1,4 ----
//Microsoft Developer Studio generated resource script.
! // Last compiled 7/24/2002 at 20:39:42
#include "resource.h"
***************
*** 55,60 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,2,1,0
! PRODUCTVERSION 1,2,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 55,60 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,2,1,1
! PRODUCTVERSION 1,2,1,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 74,78 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "UOArt ActiveX Control Module\0"
! VALUE "FileVersion", "1, 2, 1, 0\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, 1, 1\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, 1, 0\0"
VALUE "SpecialBuild", "\0"
END
--- 82,86 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "UOArt ActiveX Control Module\0"
! VALUE "ProductVersion", "1, 2, 1, 1\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: Philip E. <pes...@us...> - 2002-07-25 03:35:08
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv11947
Modified Files:
drewsky.rc
Log Message:
Updated build number
Index: drewsky.rc
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/drewsky.rc,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** drewsky.rc 20 Jul 2002 04:39:41 -0000 1.51
--- drewsky.rc 25 Jul 2002 03:35:05 -0000 1.52
***************
*** 1,4 ****
//Microsoft Developer Studio generated resource script.
! //
#include "resource.h"
--- 1,4 ----
//Microsoft Developer Studio generated resource script.
! // Last compiled 7/24/2002 at 20:41:24
#include "resource.h"
***************
*** 2372,2377 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 0,13,2,0
! PRODUCTVERSION 0,13,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 2372,2377 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 0,13,2,1
! PRODUCTVERSION 0,13,2,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 2391,2395 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "axis MFC Application\0"
! VALUE "FileVersion", "0, 13, 2, 0\0"
VALUE "InternalName", "axis\0"
VALUE "LegalCopyright", "Copyright (C) 1998-2002\0"
--- 2391,2395 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "axis MFC Application\0"
! VALUE "FileVersion", "0, 13, 2, 1\0"
VALUE "InternalName", "axis\0"
VALUE "LegalCopyright", "Copyright (C) 1998-2002\0"
***************
*** 2398,2402 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Axis\0"
! VALUE "ProductVersion", "0, 13, 2, 0\0"
VALUE "SpecialBuild", "\0"
END
--- 2398,2402 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Axis\0"
! VALUE "ProductVersion", "0, 13, 2, 1\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: Philip E. <pes...@us...> - 2002-07-25 02:34:42
|
Update of /cvsroot/sphere-axis/Axis In directory usw-pr-cvs1:/tmp/cvs-serv32656 Modified Files: axis.html Log Message: Updating release notes for 0.13.3 (in development). Index: axis.html =================================================================== RCS file: /cvsroot/sphere-axis/Axis/axis.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** axis.html 1 Jun 2002 02:55:48 -0000 1.1 --- axis.html 25 Jul 2002 02:34:34 -0000 1.2 *************** *** 46,49 **** --- 46,67 ---- <big><b>Release Notes for the Axis GM Tool</b></big><br> + <b>Changes in version 0.13.3 (in development)</b><br> + · Added support for anim2.mul.<br> + · hoglocs.scp will always be loaded now, assuming Axis can find it.<br> + · Feature Request#555773.Uncategorized script entries now will display the + file name as the subsection, and the block entry as the description.<br> + · changed the order of the buttons on the ItemGen tab (moved Nuke + to the middle)<br> + · Feature Request#563211.Areas and Rooms are now exported to axiscats.scp.<br> + · Added a new tab which will display the contents of the axis log file.<br> + · Fix for tracker #583948.<br> + · Support for reading mapplane info for spawnpoints, and fix for bug #583949.<br> + · setting mapplane to 2 will change the travel map to Ilshenar.<br> + · If no registry settings exist, Axis will open the Configuration dialog at launch.<br> + · Feature Request#563211.Areas and Rooms are now exported to axiscats.scp.<br> + · Feature Request#569559.Added a "Send" button on Misc tab to send + sound effects to a client with .xsfx.<br> + · Additional roofing sections added by Azrael.<br> + <br> <b>Changes in version 0.13.2 ( 31 May 2002 )</b><br> · Fixed a crash bug when uploading scripts in the GUI script editor.<br> |
|
From: Philip E. <pes...@us...> - 2002-07-25 01:43:56
|
Update of /cvsroot/sphere-axis/UOArt In directory usw-pr-cvs1:/tmp/cvs-serv17359 Modified Files: UOArtCtl.h Log Message: Fixed exception error associated with the MultiColored Horde Daemon. Index: UOArtCtl.h =================================================================== RCS file: /cvsroot/sphere-axis/UOArt/UOArtCtl.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** UOArtCtl.h 24 Jul 2002 19:49:16 -0000 1.13 --- UOArtCtl.h 25 Jul 2002 01:43:46 -0000 1.14 *************** *** 208,212 **** 0x31e, 63, 0x31f, 0x105, ! 0x3e7, 99, 0xFFFF, 0, }; --- 208,212 ---- 0x31e, 63, 0x31f, 0x105, ! 0x3e7, 69, 0xFFFF, 0, }; |
|
From: Philip E. <pes...@us...> - 2002-07-24 19:49:45
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv20124
Modified Files:
AdditionalSettingsDlg.cpp
Log Message:
Added support for anim2.mul.
Index: AdditionalSettingsDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/AdditionalSettingsDlg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** AdditionalSettingsDlg.cpp 22 May 2002 22:55:26 -0000 1.4
--- AdditionalSettingsDlg.cpp 24 Jul 2002 19:49:42 -0000 1.5
***************
*** 187,192 ****
iIndex = m_clcMuls.InsertItem(39, "statics2");
m_clcMuls.SetItemData(iIndex, 39);
! for ( int i = 0; i < 40; i++ )
{
// Get the custom mul entries out of the registry
--- 187,196 ----
iIndex = m_clcMuls.InsertItem(39, "statics2");
m_clcMuls.SetItemData(iIndex, 39);
+ iIndex = m_clcMuls.InsertItem(40, "anim2");
+ m_clcMuls.SetItemData(iIndex, 40);
+ iIndex = m_clcMuls.InsertItem(41, "animidx2");
+ m_clcMuls.SetItemData(iIndex, 41);
! for ( int i = 0; i < 42; i++ )
{
// Get the custom mul entries out of the registry
|
|
From: Philip E. <pes...@us...> - 2002-07-24 19:49:28
|
Update of /cvsroot/sphere-axis/UOArt
In directory usw-pr-cvs1:/tmp/cvs-serv19976
Modified Files:
UOArtCtl.cpp UOArtCtl.h UOArt.opt
Log Message:
Added support for LBR creatures in anim2.mul.
Index: UOArtCtl.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArtCtl.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** UOArtCtl.cpp 29 May 2002 21:00:29 -0000 1.16
--- UOArtCtl.cpp 24 Jul 2002 19:49:16 -0000 1.17
***************
*** 571,587 ****
break;
case ART_NPC:
{
if ( m_dwArtIndex >= 0x1000 )
return;
DWORD dwArtIndex = m_dwArtIndex;
! if ( dwArtIndex < 0x00A0 )
! dwIndex = dwArtIndex * 110;
! else if ( dwArtIndex < 0x018F )
! dwIndex = ( dwArtIndex - 0x00c8) * 65 + 22000;
! else if ( dwArtIndex < 0x1000 )
! dwIndex = ( dwArtIndex - 0x0190) * 175 + 35000;
! dwIndex += 1;
}
! break;
case ART_MULTI:
if ( m_dwArtIndex >= 0x1FF6 )
--- 571,613 ----
break;
case ART_NPC:
+ case ART_NPC2:
{
if ( m_dwArtIndex >= 0x1000 )
return;
+ // Check to see if this is from ANIM2.MUL
DWORD dwArtIndex = m_dwArtIndex;
! for ( int i = 0; ; i++ )
! {
! if ( anim2idx[i][0] == 0xFFFF )
! break;
! if ( anim2idx[i][0] == (WORD) dwArtIndex )
! {
! dwArtIndex = (WORD) anim2idx[i][1];
! break;
! }
! }
! if ( dwArtIndex == m_dwArtIndex )
! {
! m_sArtType = ART_NPC;
! if ( dwArtIndex < 0x00A0 )
! dwIndex = dwArtIndex * 110;
! else if ( dwArtIndex < 0x018F )
! dwIndex = ( dwArtIndex - 0x00c8) * 65 + 22000;
! else if ( dwArtIndex < 0x1000 )
! dwIndex = ( dwArtIndex - 0x0190) * 175 + 35000;
! dwIndex += 1;
! }
! else
! {
! // Anim2
! m_sArtType = ART_NPC2;
! if ( dwArtIndex < 0x007A )
! dwIndex = dwArtIndex * 110;
! else
! dwIndex = ( dwArtIndex - 0x7B ) * 65 + 13420;
! dwIndex += 1;
! }
}
! break;
case ART_MULTI:
if ( m_dwArtIndex >= 0x1FF6 )
***************
*** 810,813 ****
--- 836,844 ----
dwVerdataSection = VERFILE_ANIM;
break;
+ case ART_NPC2:
+ csDataFile = m_saMulPaths.GetAt(VERFILE_ANIM2);
+ csIndexFile = m_saMulPaths.GetAt(VERFILE_ANIMIDX2);
+ dwVerdataSection = VERFILE_ANIM2;
+ break;
case ART_GUMP:
csDataFile = m_saMulPaths.GetAt(VERFILE_GUMPART);
***************
*** 907,910 ****
--- 938,942 ----
break;
case ART_NPC:
+ case ART_NPC2:
dwType = 4;
break;
***************
*** 930,934 ****
BYTE * bData = NULL;
DWORD dwOffset = 0;
! DWORD dwVerdataIdx = FindVerdata(VERFILE_GUMPART, dwArtIndex);
if ( dwVerdataIdx != 0xFFFFFFFF )
{
--- 962,966 ----
BYTE * bData = NULL;
DWORD dwOffset = 0;
! DWORD dwVerdataIdx = FindVerdata(dwVerdataSection, dwArtIndex);
if ( dwVerdataIdx != 0xFFFFFFFF )
{
***************
*** 1014,1018 ****
BYTE * bData = NULL;
DWORD dwOffset = 0;
! DWORD dwVerdataIdx = FindVerdata(VERFILE_TEXMAPS, dwArtIndex);
if ( dwVerdataIdx != 0xFFFFFFFF )
{
--- 1046,1050 ----
BYTE * bData = NULL;
DWORD dwOffset = 0;
! DWORD dwVerdataIdx = FindVerdata(dwVerdataSection, dwArtIndex);
if ( dwVerdataIdx != 0xFFFFFFFF )
{
***************
*** 1074,1078 ****
BYTE * bData = NULL;
DWORD dwOffset = 0;
! DWORD dwVerdataIdx = FindVerdata(VERFILE_LIGHT, dwArtIndex);
if ( dwVerdataIdx != 0xFFFFFFFF )
{
--- 1106,1110 ----
BYTE * bData = NULL;
DWORD dwOffset = 0;
! DWORD dwVerdataIdx = FindVerdata(dwVerdataSection, dwArtIndex);
if ( dwVerdataIdx != 0xFFFFFFFF )
{
***************
*** 1130,1134 ****
BYTE * bData = NULL;
DWORD dwOffset = 0;
! DWORD dwVerdataIdx = FindVerdata(VERFILE_ANIM, dwArtIndex);
if ( dwVerdataIdx != 0xFFFFFFFF )
{
--- 1162,1166 ----
BYTE * bData = NULL;
DWORD dwOffset = 0;
! DWORD dwVerdataIdx = FindVerdata(dwVerdataSection, dwArtIndex);
if ( dwVerdataIdx != 0xFFFFFFFF )
{
***************
*** 1227,1231 ****
WORD wItemCount = 0;
CMultiRec ** items = NULL;
! DWORD dwVerdataIdx = FindVerdata(VERFILE_MULTI, dwArtIndex);
if ( dwVerdataIdx == 0xFFFFFFFF )
{
--- 1259,1263 ----
WORD wItemCount = 0;
CMultiRec ** items = NULL;
! DWORD dwVerdataIdx = FindVerdata(dwVerdataSection, dwArtIndex);
if ( dwVerdataIdx == 0xFFFFFFFF )
{
***************
*** 1371,1375 ****
WORD wStaticCount = 0;
CStaticRec ** items = NULL;
! DWORD dwVerdataIdx = FindVerdata(VERFILE_STATICS0, dwArtIndex);
WORD wItemCount;
if ( dwVerdataIdx != 0xFFFFFFFF )
--- 1403,1407 ----
WORD wStaticCount = 0;
CStaticRec ** items = NULL;
! DWORD dwVerdataIdx = FindVerdata(dwVerdataSection, dwArtIndex);
WORD wItemCount;
if ( dwVerdataIdx != 0xFFFFFFFF )
***************
*** 2289,2292 ****
--- 2321,2330 ----
csPath.Format(_T("%sstatics2.mul"), m_csUOPath);
m_saMulPaths.SetAt(VERFILE_STATICS2, csPath);
+
+ csPath.Format(_T("%sanim2.mul"), m_csUOPath);
+ m_saMulPaths.SetAt(VERFILE_ANIM2, csPath);
+
+ csPath.Format(_T("%sanim2.idx"), m_csUOPath);
+ m_saMulPaths.SetAt(VERFILE_ANIMIDX2, csPath);
}
Index: UOArtCtl.h
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArtCtl.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** UOArtCtl.h 29 May 2002 21:00:32 -0000 1.12
--- UOArtCtl.h 24 Jul 2002 19:49:16 -0000 1.13
***************
*** 126,129 ****
--- 126,217 ----
};
+ WORD anim2idx[][2] =
+ {
+ 0xb, 3,
+ 0x14, 4,
+ 0x1c, 5,
+ 0x26, 8,
+ 0x28, 9,
+ 0x2b, 11,
+ 0x3e, 14,
+ 0x43, 70,
+ 0x4a, 18,
+ 0x4c, 27,
+ 0x4d, 19,
+ 0x65, 6,
+ 0x66, 10,
+ 0x67, 12,
+ 0x68, 13,
+ 0x7a, 0xff,
+ 0x7b, 64,
+ 0x7c, 20,
+ 0x7d, 21,
+ 0x80, 15,
+ 0x82, 17,
+ 0x84, 0x7b,
+ 0x92, 22,
+ 0x94, 23,
+ 0x95, 25,
+ 0x98, 26,
+ 0x99, 24,
+ 0x9a, 28,
+ 0x9d, 1,
+ 0xad, 2,
+ 0xae, 66,
+ 0xaf, 65,
+ 0xb0, 16,
+ 0xb5, 67,
+ 0xb6, 30,
+ 0xbb, 0x100,
+ 0xbc, 0x101,
+ 0xbd, 31,
+ 0x2f0, 29,
+ 0x2f1, 71,
+ 0x2f2, 72,
+ 0x2f3, 73,
+ 0x2f4, 75,
+ 0x2f5, 76,
+ 0x2f6, 74,
+ 0x2fb, 77,
+ 0x2fc, 32,
+ 0x2fd, 33,
+ 0x2fe, 34,
+ 0x2ff, 35,
+ 0x300, 36,
+ 0x301, 37,
+ 0x302, 38,
+ 0x303, 39,
+ 0x304, 40,
+ 0x305, 41,
+ 0x306, 42,
+ 0x307, 43,
+ 0x308, 44,
+ 0x309, 45,
+ 0x30a, 46,
+ 0x30b, 47,
+ 0x30c, 48,
+ 0x30d, 49,
+ 0x30e, 50,
+ 0x30f, 51,
+ 0x310, 52,
+ 0x311, 53,
+ 0x313, 55,
+ 0x314, 56,
+ 0x315, 57,
+ 0x317, 0x102,
+ 0x318, 59,
+ 0x319, 0x103,
+ 0x31a, 0x104,
+ 0x31b, 60,
+ 0x31c, 61,
+ 0x31d, 62,
+ 0x31e, 63,
+ 0x31f, 0x105,
+ 0x3e7, 99,
+ 0xFFFF, 0,
+ };
+
+
+
#define VERFILE_MAP0 0x00
#define VERFILE_STAIDX0 0x01
***************
*** 156,160 ****
#define VERFILE_STAIDX2 0x26
#define VERFILE_STATICS2 0x27
! #define VERFILE_ENDOFTABLE 0x28
class CItemCache
--- 244,250 ----
#define VERFILE_STAIDX2 0x26
#define VERFILE_STATICS2 0x27
! #define VERFILE_ANIM2 0x28
! #define VERFILE_ANIMIDX2 0x29
! #define VERFILE_ENDOFTABLE 0x2A
class CItemCache
***************
*** 192,195 ****
--- 282,286 ----
ART_LIGHTS,
ART_MAPPREVIEW,
+ ART_NPC2,
};
Index: UOArt.opt
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArt.opt,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
Binary files /tmp/cvs4f2DQZ and /tmp/cvseC8orR differ
|
|
From: Philip E. <pes...@us...> - 2002-07-20 04:39:46
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv26861
Modified Files:
drewsky.rc
Log Message:
changed the order of the buttons on the ItemGen tab (moved Nuke
to the middle)
Index: drewsky.rc
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/drewsky.rc,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** drewsky.rc 17 Jul 2002 21:29:31 -0000 1.50
--- drewsky.rc 20 Jul 2002 04:39:41 -0000 1.51
***************
*** 362,367 ****
13
EDITTEXT IDC_NUDGEAMOUNT,52,95,21,12,ES_AUTOHSCROLL | ES_NUMBER
! PUSHBUTTON "Create",IDC_CREATE,107,95,25,13
! PUSHBUTTON "Remove",IDC_REMOVE,133,95,32,13
PUSHBUTTON "Flip",IDC_FLIP,166,95,19,13
PUSHBUTTON "Tile",IDC_TILE,186,95,20,13
--- 362,368 ----
13
EDITTEXT IDC_NUDGEAMOUNT,52,95,21,12,ES_AUTOHSCROLL | ES_NUMBER
! PUSHBUTTON "Create",IDC_CREATE,81,95,25,13
! PUSHBUTTON "Remove",IDC_REMOVE,107,95,32,13
! PUSHBUTTON "Nuke",IDC_NUKE,140,95,25,13
PUSHBUTTON "Flip",IDC_FLIP,166,95,19,13
PUSHBUTTON "Tile",IDC_TILE,186,95,20,13
***************
*** 383,387 ****
CONTROL "",IDC_DISPLAY,"{0904F7B3-2339-44C9-857C-6EB6CFEFA3B6}",
WS_TABSTOP,369,2,117,106
- PUSHBUTTON "Nuke",IDC_NUKE,81,95,25,13
END
--- 384,387 ----
|
|
From: Philip E. <pes...@us...> - 2002-07-20 04:13:59
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv21729
Modified Files:
CScriptObjects.cpp
Log Message:
hoglocs.scp will always be loaded now, assuming Axis can find it.
Index: CScriptObjects.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/CScriptObjects.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** CScriptObjects.cpp 17 Jul 2002 22:16:00 -0000 1.20
--- CScriptObjects.cpp 20 Jul 2002 04:13:55 -0000 1.21
***************
*** 2803,2811 ****
}
}
- this->LoadFile("hoglocs.scp");
- this->LoadFile("custloc.scp");
- this->CategorizeItems();
- this->CategorizeLocations();
- this->CategorizeNPCs();
}
else
--- 2803,2806 ----
***************
*** 2816,2820 ****
this->LoadDefs();
this->LoadItems();
! this->LoadLocations();
this->LoadMap();
this->LoadNames();
--- 2811,2815 ----
this->LoadDefs();
this->LoadItems();
! //this->LoadLocations(); These will be loaded later
this->LoadMap();
this->LoadNames();
***************
*** 2824,2831 ****
this->LoadTemplates();
this->LoadTriggers();
- this->CategorizeItems();
- this->CategorizeLocations();
- this->CategorizeNPCs();
}
Main->m_log.Add("Finished loading scripts");
if ( m_pRemote )
--- 2819,2828 ----
this->LoadTemplates();
this->LoadTriggers();
}
+ this->LoadFile("hoglocs.scp");
+ this->LoadFile("custloc.scp");
+ this->CategorizeItems();
+ this->CategorizeLocations();
+ this->CategorizeNPCs();
Main->m_log.Add("Finished loading scripts");
if ( m_pRemote )
|
