[Sphere-axis-commits] CVS: Axis/S_Sphere52 ConfigFile.cpp,1.3,1.4 Resource.h,1.3,1.4 S_Sphere52.rc,1
Brought to you by:
pesterle
From: Philip E. <pes...@us...> - 2003-07-01 14:18:16
|
Update of /cvsroot/sphere-axis/Axis/S_Sphere52 In directory sc8-pr-cvs1:/tmp/cvs-serv18040/S_Sphere52 Modified Files: ConfigFile.cpp Resource.h S_Sphere52.rc S_Sphere52.vcproj ScriptsMain.cpp ScriptsMain.h strings.h Log Message: no message Index: ConfigFile.cpp =================================================================== RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ConfigFile.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** ConfigFile.cpp 5 Jun 2003 14:49:53 -0000 1.3 --- ConfigFile.cpp 1 Jul 2003 14:17:40 -0000 1.4 *************** *** 4,8 **** #include "Scripts.h" ! #define GRAY_MAIN_SERVER "menace.ne.mediaone.net" #define GRAY_GAME_SERVER #define GRAY_LOG_SERVER --- 4,8 ---- #include "Scripts.h" ! #define GRAY_MAIN_SERVER "list.sphereserver.net" #define GRAY_GAME_SERVER #define GRAY_LOG_SERVER Index: Resource.h =================================================================== RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Resource.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Resource.h 12 Jun 2003 23:27:01 -0000 1.3 --- Resource.h 1 Jul 2003 14:17:40 -0000 1.4 *************** *** 5,9 **** --- 5,19 ---- #define IDS_PROJNAME 100 #define IDR_S_SPHERE52 101 + #define IDD_REGIONSELECTDLG 102 #define IDR_SCRIPTS 103 + #define IDD_ADD_DESTINATION 145 + #define IDD_ADD_VALUE 146 + #define IDD_ITEMEDIT 149 + #define IDD_NPCEDIT_DLG 151 + #define IDD_EDITSKILL_DLG 152 + #define IDD_EDITGRAYMAP_DLG 162 + #define IDD_ORE_EDIT_DLG 177 + #define IDD_EDITVALUE 182 + #define IDD_EDITFLAGS 183 #define IDD_FILEREAD_PROGRESS 201 #define IDC_STATUS_MESSAGE 201 *************** *** 43,46 **** --- 53,251 ---- #define IDC_PROFILE_SAVE 231 #define IDC_PROFILE_DISCARD 232 + #define IDC_TRIGEDIT 1001 + #define IDC_NPCATTRADD 1001 + #define IDC_OREADD 1001 + #define IDC_NEWAREA 1001 + #define IDC_NPCATTRREMOVE 1002 + #define IDC_OREREMOVE 1002 + #define IDC_NEWROOM 1002 + #define IDC_IEPALETTE 1003 + #define IDC_NEWNPC 1003 + #define IDC_SETPOINT 1003 + #define IDC_ITEM_NEW 1004 + #define IDC_EDITNPC 1004 + #define IDC_REMOVERECT 1004 + #define IDC_ITEM_EDIT 1005 + #define IDC_APPLYNPCEDITS 1005 + #define IDC_LOCATEAREA 1005 + #define IDC_ITEM_APPLY 1006 + #define IDC_CANCELNPCEDITS 1006 + #define IDC_LOCATEROOM 1006 + #define IDC_ITEM_CANCEL 1007 + #define IDC_NPCADDCATEGORY 1007 + #define IDC_NPCPALETTE 1008 + #define IDC_MOVEUP 1008 + #define IDC_NPCADDSUBSECTION 1009 + #define IDC_MOVEDOWN 1009 + #define IDC_NPCATTRLIST 1031 + #define IDC_ORELIST 1031 + #define IDC_REGIONRECTLIST 1031 + #define IDC_REGION_LIST 1031 + #define IDC_FLAGLIST 1031 + #define IDC_NPCATTRSELECTION 1032 + #define IDC_MAPVALS 1032 + #define IDC_DYEABLE 1033 + #define IDC_NPCATTRCHOICES 1033 + #define IDC_REPAIRABLE 1034 + #define IDC_DRAWRECTS 1034 + #define IDC_MAGICAL 1035 + #define IDC_NPCNOINDEX 1035 + #define IDC_NOINDEX 1036 + #define IDC_TRIGGERS 1059 + #define IDC_NPCNAME 1059 + #define IDC_ORENAME 1059 + #define IDC_SKILLNAME 1059 + #define IDC_TEXTVALUE 1059 + #define IDC_NPCDEFNAME 1060 + #define IDC_ORECOLOUR 1060 + #define IDC_SKILL_MIN 1060 + #define IDC_REGION_DETAILS 1060 + #define IDC_COLORCOMBO 1061 + #define IDC_SKILLS 1061 + #define IDC_ORESKILL 1061 + #define IDC_VERSION 1061 + #define IDC_SKILL_MAX 1061 + #define IDC_FILENAME 1061 + #define IDC_ITEMTYPE 1062 + #define IDC_NPCDESIRES 1062 + #define IDC_ORECHANCE 1062 + #define IDC_BUYVALUE 1063 + #define IDC_NPCSPEECH 1063 + #define IDC_OREMIN 1063 + #define IDC_SELLVALUE 1064 + #define IDC_NPCEVENTS 1064 + #define IDC_OREMAX 1064 + #define IDC_WEIGHT 1065 + #define IDC_OREINGOT 1065 + #define IDC_HPMIN 1066 + #define IDC_HPMAX 1067 + #define IDC_BUYVALUEMAX 1068 + #define IDC_SELLVALUEMAX 1069 + #define IDC_ITEMID 1151 + #define IDC_NAME 1158 + #define IDC_XCOORD 1167 + #define IDC_YCOORD 1168 + #define IDC_ZCOORD 1169 + #define IDC_PLANE 1170 + #define IDC_CATEGORY 1171 + #define IDC_SUBSECTION 1172 + #define IDC_DESCRIPTION 1173 + #define IDC_ADD_CATEGORY 1174 + #define IDC_ADD_SUBSECTION 1175 + #define IDC_VALUE 1176 + #define IDC_SKILL 1189 + #define IDC_DAMAGEMIN 1190 + #define IDC_DAMAGEMAX 1191 + #define IDC_ARMOURMIN 1192 + #define IDC_ARMOURMAX 1193 + #define IDC_REQSTR 1194 + #define IDC_SPELLID 1196 + #define IDC_CHARGES 1197 + #define IDC_ARMOURBONUS 1198 + #define IDC_EI_SBASE 1202 + #define IDC_ADDCATEGORY 1203 + #define IDC_ADDSUBSECTION 1204 + #define IDC_DUPEITEM 1207 + #define IDC_NPCICON 1210 + #define IDC_NPCCATEGORY 1221 + #define IDC_NPCSUBSECTION 1222 + #define IDC_REGIONTREE 1243 + #define IDC_MAPCENTER 1246 + #define IDC_CURSORCOORDS 1247 + #define IDC_VALUEENABLED 1287 + #define IDC_NPCATTRAMOUNT 1334 + #define IDC_NPCENTRY 1335 + #define IDC_NPCATTRIBUTES 1337 + #define IDC_NPCNAMEINDEX 1339 + #define IDC_NPCSOUND 1340 + #define IDC_NPCBASEID 1341 + #define IDC_NPCOLOUR 1342 + #define IDC_NPCATTRCATS 1343 + #define IDC_NPCBRAIN 1345 + #define IDC_NPCEDITDESCRIPTION 1347 + #define IDC_NPCIMAGE 1348 + #define IDC_NPCDISABLEDISPLAY 1349 + #define IDC_ITEMENTRY 1351 + #define IDC_ITEMDISPLAY 1352 + #define IDC_ZOOMOUT 1379 + #define IDC_ZOOMIN 1380 + #define IDC_MAPDISPLAY 1391 + #define IDC_STATIC_BR 1426 + #define IDC_STATIC_VALS 1427 + #define IDC_ACD_SCAT 1490 + #define IDC_ADC_SSUB 1491 + #define IDC_ADC_SDES 1492 + #define IDC_ADC_SX 1493 + #define IDC_ADC_SY 1494 + #define IDC_ADC_SZ 1495 + #define IDC_ADC_SP 1496 + #define IDC_AV_SNAME 1497 + #define IDC_AV_SFILE 1498 + #define IDC_EI_SENTRY 1499 + #define IDC_EI_SDUPE 1500 + #define IDC_EI_SNAME 1501 + #define IDC_EI_STYPE 1502 + #define IDC_EI_SCOLOR 1503 + #define IDC_EI_SBUY 1504 + #define IDC_EI_SSELL 1505 + #define IDC_EI_SWEIGHT 1506 + #define IDC_EI_SHP 1507 + #define IDC_EI_GATTR 1508 + #define IDC_EI_GCLASS 1509 + #define IDC_EI_GMAGIC 1510 + #define IDC_EI_SSKILL 1511 + #define IDC_EI_SDAMAGE 1512 + #define IDC_EI_SAR 1513 + #define IDC_EI_SREQSTR 1514 + #define IDC_EI_SSPELL 1515 + #define IDC_EI_SCHARGES 1516 + #define IDC_EI_SARBONUS 1517 + #define IDC_EI_SCAT 1518 + #define IDC_EI_SSUB 1519 + #define IDC_EI_SDESC 1520 + #define IDC_EI_STRIG 1521 + #define IDC_NE_STATIC1 1523 + #define IDC_NE_GATTR 1524 + #define IDC_NE_GMISC 1525 + #define IDC_NE_GCLASS 1526 + #define IDC_NE_STATIC2 1527 + #define IDC_NE_STATIC3 1528 + #define IDC_NE_STATIC4 1529 + #define IDC_NE_STATIC5 1530 + #define IDC_NE_STATIC6 1531 + #define IDC_NE_STATIC7 1532 + #define IDC_NE_STATIC8 1533 + #define IDC_NE_STATIC9 1534 + #define IDC_NE_STATIC10 1535 + #define IDC_NE_STATIC11 1536 + #define IDC_NE_STATIC12 1537 + #define IDC_NE_STATIC13 1538 + #define IDC_NE_STATIC14 1539 + #define IDC_NE_STATIC15 1540 + #define IDC_NE_STATIC16 1541 + #define IDC_NE_STATIC17 1542 + #define IDC_NE_STATIC18 1543 + #define IDC_NE_STATIC19 1544 + #define IDC_NE_STATIC20 1545 + #define IDC_ESS_STATIC1 1546 + #define IDC_ESS_STATIC2 1547 + #define IDC_ESS_STATIC3 1548 + #define IDC_STATIC_MC 1570 + #define IDC_STATIC_VER 1571 + #define IDC_STATIC_PLANE 1572 + #define IDC_ORE_STATIC1 1661 + #define IDC_ORE_STATIC2 1662 + #define IDC_ORE_STATIC3 1663 + #define IDC_ORE_STATIC4 1664 + #define IDC_ORE_STATIC5 1665 + #define IDC_ORE_STATIC6 1666 + #define IDC_ORE_STATIC7 1667 + #define IDC_RSD_STATIC1 1765 + #define IDC_RSD_STATIC2 1766 + #define IDC_EI_STATIC1 1784 + #define IDC_EI_STATIC2 1785 + #define IDC_EI_STATIC3 1786 + #define IDC_EI_STATIC4 1787 + #define IDC_EI_STATIC5 1788 // Next default values for new objects Index: S_Sphere52.rc =================================================================== RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/S_Sphere52.rc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** S_Sphere52.rc 25 Jun 2003 00:07:27 -0000 1.6 --- S_Sphere52.rc 1 Jul 2003 14:17:40 -0000 1.7 *************** *** 28,46 **** // ! 1 TEXTINCLUDE BEGIN ! "resource.h\0" END ! 2 TEXTINCLUDE BEGIN ! "#include ""afxres.h""\r\n" ! "\0" END ! 3 TEXTINCLUDE BEGIN ! "1 TYPELIB ""S_Sphere52.tlb""\r\n" ! "\0" END --- 28,46 ---- // ! 1 TEXTINCLUDE BEGIN ! "resource.h\0" END ! 2 TEXTINCLUDE BEGIN ! "#include ""afxres.h""\r\n" ! "\0" END ! 3 TEXTINCLUDE BEGIN ! "1 TYPELIB ""S_Sphere52.tlb""\r\n" ! "\0" END *************** *** 54,87 **** VS_VERSION_INFO VERSIONINFO ! FILEVERSION 1, 0, 0, 1 ! PRODUCTVERSION 1.0.0.1 ! FILEFLAGSMASK 0x3fL #ifdef _DEBUG ! FILEFLAGS 0x1L #else ! FILEFLAGS 0x0L #endif ! FILEOS 0x4L ! FILETYPE 0x2L ! FILESUBTYPE 0x0L ! BEGIN ! BLOCK "StringFileInfo" ! BEGIN ! BLOCK "040904B0" ! BEGIN ! VALUE "CompanyName", "" ! VALUE "FileDescription", "Scripts module for Sphere 0.52" ! VALUE "FileVersion", "1, 0, 0, 1" ! VALUE "LegalCopyright", "Copyright Philip Esterle 2002-2003" ! VALUE "InternalName", "S_Sphere52.dll" ! VALUE "OriginalFilename", "S_Sphere52.dll" ! VALUE "ProductName", "S_Sphere52" ! VALUE "ProductVersion", "1.0.0.1" ! END ! END ! BLOCK "VarFileInfo" ! BEGIN ! VALUE "Translation", 0x409, 1200 ! END END --- 54,86 ---- VS_VERSION_INFO VERSIONINFO ! FILEVERSION 1,0,0,0 ! PRODUCTVERSION 1,0,0,0 ! FILEFLAGSMASK 0x3fL #ifdef _DEBUG ! FILEFLAGS 0x1L #else ! FILEFLAGS 0x0L #endif ! FILEOS 0x4L ! FILETYPE 0x2L ! FILESUBTYPE 0x0L ! BEGIN ! BLOCK "StringFileInfo" ! BEGIN ! BLOCK "040904b0" ! BEGIN ! VALUE "FileDescription", "Scripts module for Sphere 0.52" ! VALUE "FileVersion", "1, 0, 0, 0" ! VALUE "InternalName", "S_Sphere52.dll" ! VALUE "LegalCopyright", "Copyright Philip Esterle 2002-2003" ! VALUE "OriginalFilename", "S_Sphere52.dll" ! VALUE "ProductName", "S_Sphere52" ! VALUE "ProductVersion", "1.0.0.0" ! END ! END ! BLOCK "VarFileInfo" ! BEGIN ! VALUE "Translation", 0x409, 1200 ! END END *************** *** 105,167 **** FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN ! CTEXT "",IDC_STATUS_MESSAGE,7,3,274,8,SS_CENTERIMAGE ! CONTROL "",IDC_PROGBAR,"Static",SS_BLACKFRAME | SS_SUNKEN,7,14, ! 274,10 END IDD_PROFILE_EDIT DIALOGEX 0, 0, 299, 293 ! STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | ! WS_CAPTION | WS_SYSMENU CAPTION "Profile Editor (Sphere 0.52)" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN ! LISTBOX IDC_PROFILE_LIST,7,18,230,78,LBS_SORT | ! LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP ! PUSHBUTTON "New",IDC_PROFILE_NEW,244,49,50,14 ! PUSHBUTTON "Edit",IDC_PROFILE_EDIT,244,65,50,14 ! PUSHBUTTON "Delete",IDC_PROFILE_DELETE,244,81,50,14 ! CONTROL "Local",IDC_PROFILE_LOCAL,"Button",BS_AUTORADIOBUTTON | ! WS_DISABLED | WS_GROUP | WS_TABSTOP,35,110,32,10 ! CONTROL "Remote",IDC_PROFILE_REMOTE,"Button",BS_AUTORADIOBUTTON | ! WS_DISABLED | WS_TABSTOP,83,110,41,10 ! EDITTEXT IDC_PROFILE_NAME,40,122,95,13,ES_AUTOHSCROLL | ! WS_DISABLED ! EDITTEXT IDC_PROFILE_SPHEREIP,50,138,85,13,ES_AUTOHSCROLL | ! WS_DISABLED ! EDITTEXT IDC_PROFILE_SPHEREPORT,60,155,75,13,ES_AUTOHSCROLL | ! ES_NUMBER | WS_DISABLED ! EDITTEXT IDC_PROFILE_BASEPATH,56,173,79,12,ES_AUTOHSCROLL | ! WS_DISABLED ! CONTROL "Get Remote Spawnpoints",IDC_PROFILE_REMOTESPAWNS,"Button", ! BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,14,191,122,12 ! EDITTEXT IDC_PROFILE_REMOTEUSER,67,207,68,12,ES_AUTOHSCROLL | ! WS_DISABLED ! EDITTEXT IDC_PROFILE_REMOTEPWD,76,221,59,12,ES_PASSWORD | ! ES_AUTOHSCROLL | WS_DISABLED ! EDITTEXT IDC_PROFILE_REMOTEPORT,73,235,62,12,ES_AUTOHSCROLL | ! ES_NUMBER | WS_DISABLED ! EDITTEXT IDC_PROFILE_REMOTETIMEOUT,86,249,49,12,ES_AUTOHSCROLL | ! ES_NUMBER | WS_DISABLED ! CONTROL "",IDC_PROFILE_FILES,"SysTreeView32",TVS_HASBUTTONS | ! TVS_HASLINES | TVS_LINESATROOT | TVS_CHECKBOXES | ! WS_DISABLED | WS_BORDER | WS_TABSTOP,141,122,147,144 ! PUSHBUTTON "Refresh List",IDC_PROFILE_SCRIPT_REFRESH,226,107,61,13, ! WS_DISABLED ! PUSHBUTTON "Save Changes",IDC_PROFILE_SAVE,9,270,60,14,WS_DISABLED ! PUSHBUTTON "Discard Changes",IDC_PROFILE_DISCARD,229,270,60,14, ! WS_DISABLED ! DEFPUSHBUTTON "OK",IDOK,242,7,50,14 ! PUSHBUTTON "Cancel",IDCANCEL,242,24,50,14 ! LTEXT "User Defined Profiles",IDC_PE_STATIC1,9,8,227,10 ! GROUPBOX "Parameters",IDC_PROFILE_PARMS,7,100,285,186 ! LTEXT "Name",IDC_PE_STATIC3,15,123,23,11 ! LTEXT "Available Scripts",IDC_PE_STATIC2,145,111,68,8 ! LTEXT "Sphere IP",IDC_PE_STATIC4,14,140,32,8 ! LTEXT "Sphere Port",IDC_PE_STATIC5,14,157,39,8 ! LTEXT "Base Path",IDC_PE_STATIC6,14,175,33,8 ! LTEXT "Remote User",IDC_PE_STATIC7,14,209,46,9 ! LTEXT "Remote Password",IDC_PE_STATIC8,14,223,58,8 ! LTEXT "Remote Port",IDC_PE_STATIC9,14,237,41,8 ! LTEXT "Remote Timeout (ms)",IDC_PE_STATIC10,14,251,69,8 END --- 104,533 ---- FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN ! CTEXT "",IDC_STATUS_MESSAGE,7,3,274,8,SS_CENTERIMAGE ! CONTROL "",IDC_PROGBAR,"Static",SS_BLACKFRAME | SS_SUNKEN,7,14, ! 274,10 END IDD_PROFILE_EDIT DIALOGEX 0, 0, 299, 293 ! STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | ! WS_CAPTION | WS_SYSMENU CAPTION "Profile Editor (Sphere 0.52)" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN ! LISTBOX IDC_PROFILE_LIST,7,18,230,78,LBS_SORT | ! LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP ! PUSHBUTTON "New",IDC_PROFILE_NEW,244,49,50,14 ! PUSHBUTTON "Edit",IDC_PROFILE_EDIT,244,65,50,14 ! PUSHBUTTON "Delete",IDC_PROFILE_DELETE,244,81,50,14 ! CONTROL "Local",IDC_PROFILE_LOCAL,"Button",BS_AUTORADIOBUTTON | ! WS_DISABLED | WS_GROUP | WS_TABSTOP,35,110,32,10 ! CONTROL "Remote",IDC_PROFILE_REMOTE,"Button",BS_AUTORADIOBUTTON | ! WS_DISABLED | WS_TABSTOP,83,110,41,10 ! EDITTEXT IDC_PROFILE_NAME,40,122,95,13,ES_AUTOHSCROLL | ! WS_DISABLED ! EDITTEXT IDC_PROFILE_SPHEREIP,50,138,85,13,ES_AUTOHSCROLL | ! WS_DISABLED ! EDITTEXT IDC_PROFILE_SPHEREPORT,60,155,75,13,ES_AUTOHSCROLL | ! ES_NUMBER | WS_DISABLED ! EDITTEXT IDC_PROFILE_BASEPATH,56,173,79,12,ES_AUTOHSCROLL | ! WS_DISABLED ! CONTROL "Get Remote Spawnpoints",IDC_PROFILE_REMOTESPAWNS,"Button", ! BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,14,191,122,12 ! EDITTEXT IDC_PROFILE_REMOTEUSER,67,207,68,12,ES_AUTOHSCROLL | ! WS_DISABLED ! EDITTEXT IDC_PROFILE_REMOTEPWD,76,221,59,12,ES_PASSWORD | ! ES_AUTOHSCROLL | WS_DISABLED ! EDITTEXT IDC_PROFILE_REMOTEPORT,73,235,62,12,ES_AUTOHSCROLL | ! ES_NUMBER | WS_DISABLED ! EDITTEXT IDC_PROFILE_REMOTETIMEOUT,86,249,49,12,ES_AUTOHSCROLL | ! ES_NUMBER | WS_DISABLED ! CONTROL "",IDC_PROFILE_FILES,"SysTreeView32",TVS_HASBUTTONS | ! TVS_HASLINES | TVS_LINESATROOT | TVS_CHECKBOXES | ! WS_DISABLED | WS_BORDER | WS_TABSTOP,141,122,147,144 ! PUSHBUTTON "Refresh List",IDC_PROFILE_SCRIPT_REFRESH,226,107,61,13, ! WS_DISABLED ! PUSHBUTTON "Save Changes",IDC_PROFILE_SAVE,9,270,60,14,WS_DISABLED ! PUSHBUTTON "Discard Changes",IDC_PROFILE_DISCARD,229,270,60,14, ! WS_DISABLED ! DEFPUSHBUTTON "OK",IDOK,242,7,50,14 ! PUSHBUTTON "Cancel",IDCANCEL,242,24,50,14 ! LTEXT "User Defined Profiles",IDC_PE_STATIC1,9,8,227,10 ! GROUPBOX "Parameters",IDC_PROFILE_PARMS,7,100,285,186 ! LTEXT "Name",IDC_PE_STATIC3,15,123,23,11 ! LTEXT "Available Scripts",IDC_PE_STATIC2,145,111,68,8 ! LTEXT "Sphere IP",IDC_PE_STATIC4,14,140,32,8 ! LTEXT "Sphere Port",IDC_PE_STATIC5,14,157,39,8 ! LTEXT "Base Path",IDC_PE_STATIC6,14,175,33,8 ! LTEXT "Remote User",IDC_PE_STATIC7,14,209,46,9 ! LTEXT "Remote Password",IDC_PE_STATIC8,14,223,58,8 ! LTEXT "Remote Port",IDC_PE_STATIC9,14,237,41,8 ! LTEXT "Remote Timeout (ms)",IDC_PE_STATIC10,14,251,69,8 ! END ! ! IDD_ITEMEDIT DIALOGEX 0, 0, 397, 343 ! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU ! CAPTION "Edit Item" ! FONT 8, "MS Sans Serif", 0, 0, 0x1 ! BEGIN ! EDITTEXT IDC_ITEMID,42,47,35,12,ES_AUTOHSCROLL | WS_DISABLED ! COMBOBOX IDC_DUPEITEM,120,47,69,81,CBS_DROPDOWN | CBS_SORT | ! WS_DISABLED | WS_VSCROLL | WS_TABSTOP ! EDITTEXT IDC_NAME,42,62,147,12,ES_AUTOHSCROLL | WS_DISABLED ! COMBOBOX IDC_ITEMTYPE,42,75,85,95,CBS_DROPDOWN | CBS_SORT | ! WS_DISABLED | WS_VSCROLL | WS_TABSTOP ! COMBOBOX IDC_COLORCOMBO,42,89,68,81,CBS_DROPDOWN | CBS_SORT | ! WS_DISABLED | WS_VSCROLL | WS_TABSTOP ! PUSHBUTTON "Palette",IDC_IEPALETTE,111,89,14,12,BS_ICON | ! WS_DISABLED ! CONTROL "Dyeable",IDC_DYEABLE,"Button",BS_AUTOCHECKBOX | ! BS_LEFTTEXT | WS_DISABLED | WS_TABSTOP,7,106,66,9 ! CONTROL "Repairable",IDC_REPAIRABLE,"Button",BS_AUTOCHECKBOX | ! BS_LEFTTEXT | WS_DISABLED | WS_TABSTOP,7,117,66,10 ! COMBOBOX IDC_SKILL,57,142,67,52,CBS_DROPDOWNLIST | CBS_SORT | ! WS_DISABLED | WS_VSCROLL | WS_TABSTOP ! EDITTEXT IDC_DAMAGEMIN,57,156,20,13,ES_AUTOHSCROLL | ES_NUMBER | ! WS_DISABLED ! EDITTEXT IDC_DAMAGEMAX,91,156,20,13,ES_AUTOHSCROLL | ES_NUMBER | ! WS_DISABLED ! EDITTEXT IDC_ARMOURMIN,57,171,20,13,ES_AUTOHSCROLL | ES_NUMBER | ! WS_DISABLED ! EDITTEXT IDC_ARMOURMAX,91,171,20,13,ES_AUTOHSCROLL | ES_NUMBER | ! WS_DISABLED ! EDITTEXT IDC_REQSTR,57,185,20,13,ES_AUTOHSCROLL | ES_NUMBER | ! WS_DISABLED ! COMBOBOX IDC_CATEGORY,56,216,102,40,CBS_DROPDOWNLIST | CBS_SORT | ! WS_DISABLED | WS_VSCROLL | WS_TABSTOP ! PUSHBUTTON "Add",IDC_ADDCATEGORY,163,216,22,13,WS_DISABLED ! COMBOBOX IDC_SUBSECTION,56,229,102,33,CBS_DROPDOWNLIST | CBS_SORT | ! WS_DISABLED | WS_VSCROLL | WS_TABSTOP ! PUSHBUTTON "Add",IDC_ADDSUBSECTION,163,230,22,13,WS_DISABLED ! EDITTEXT IDC_DESCRIPTION,56,242,102,12,ES_AUTOHSCROLL | ! WS_DISABLED ! CONTROL "Don't Index this Item",IDC_NOINDEX,"Button", ! BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,13,255,88,11 ! EDITTEXT IDC_BUYVALUE,173,75,17,13,ES_AUTOHSCROLL | ES_NUMBER | ! WS_DISABLED ! EDITTEXT IDC_BUYVALUEMAX,205,75,17,13,ES_AUTOHSCROLL | ES_NUMBER | ! WS_DISABLED ! EDITTEXT IDC_SELLVALUE,173,89,17,13,ES_AUTOHSCROLL | ES_NUMBER | ! WS_DISABLED ! EDITTEXT IDC_SELLVALUEMAX,205,89,17,13,ES_AUTOHSCROLL | ES_NUMBER | ! WS_DISABLED ! EDITTEXT IDC_WEIGHT,173,103,50,13,ES_AUTOHSCROLL | WS_DISABLED ! EDITTEXT IDC_HPMIN,173,117,17,13,ES_AUTOHSCROLL | ES_NUMBER | ! WS_DISABLED ! EDITTEXT IDC_HPMAX,205,117,17,13,ES_AUTOHSCROLL | ES_NUMBER | ! WS_DISABLED ! CONTROL "Magical",IDC_MAGICAL,"Button",BS_AUTOCHECKBOX | ! WS_DISABLED | WS_TABSTOP,133,135,41,10 ! COMBOBOX IDC_SPELLID,157,155,74,53,CBS_DROPDOWNLIST | CBS_SORT | ! WS_DISABLED | WS_VSCROLL | WS_TABSTOP ! EDITTEXT IDC_CHARGES,198,171,33,13,ES_AUTOHSCROLL | ES_NUMBER | ! WS_DISABLED ! EDITTEXT IDC_ARMOURBONUS,198,187,33,13,ES_AUTOHSCROLL | ES_NUMBER | ! WS_DISABLED ! PUSHBUTTON "Edit",IDC_TRIGEDIT,368,254,22,13,WS_DISABLED ! EDITTEXT IDC_TRIGGERS,7,269,383,67,ES_MULTILINE | ES_AUTOVSCROLL | ! ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED | WS_VSCROLL ! DEFPUSHBUTTON "OK",IDOK,340,7,50,14 ! PUSHBUTTON "Cancel",IDCANCEL,340,21,50,14 ! LTEXT "Name",IDC_EI_SNAME,7,64,20,8 ! LTEXT "Based On",IDC_EI_SBASE,7,50,32,8 ! LTEXT "Type",IDC_EI_STYPE,7,77,17,8 ! LTEXT "Buy Value",IDC_EI_SBUY,131,77,33,8 ! LTEXT "Sell Value",IDC_EI_SSELL,131,91,32,8 ! LTEXT "Weight",IDC_EI_SWEIGHT,131,105,24,8 ! LTEXT "Category",IDC_EI_SCAT,13,218,29,8 ! LTEXT "Subsection",IDC_EI_SSUB,13,233,36,8 ! LTEXT "Description",IDC_EI_SDESC,14,245,36,8 ! GROUPBOX "Axis Classifications",IDC_EI_GCLASS,7,206,183,61 ! GROUPBOX "Armour / Weapon Attributes",IDC_EI_GATTR,7,131,121,72 ! LTEXT "Skill",IDC_EI_SSKILL,16,143,14,8 ! LTEXT "Damage",IDC_EI_SDAMAGE,16,158,28,8 ! LTEXT "Armour",IDC_EI_SAR,16,173,23,8 ! LTEXT "Required Str",IDC_EI_SREQSTR,16,187,40,8 ! LTEXT "HitPoints",IDC_EI_SHP,131,119,29,8 ! LTEXT "Color",IDC_EI_SCOLOR,7,91,17,8 ! GROUPBOX "Magical Attributes",IDC_EI_GMAGIC,130,146,107,57 ! LTEXT "Spell",IDC_EI_SSPELL,136,157,16,8 ! LTEXT "Charges",IDC_EI_SCHARGES,136,173,27,8 ! LTEXT "Armour Bonus",IDC_EI_SARBONUS,136,189,45,8 ! LTEXT "DupeItem",IDC_EI_SDUPE,83,49,32,8 ! LTEXT "---",IDC_EI_STATIC1,194,77,8,8,0,WS_EX_TRANSPARENT ! LTEXT "Triggers",IDC_EI_STRIG,336,259,26,8 ! LTEXT "---",IDC_EI_STATIC2,194,91,8,8,0,WS_EX_TRANSPARENT ! LTEXT "---",IDC_EI_STATIC4,81,158,8,8,0,WS_EX_TRANSPARENT ! LTEXT "---",IDC_EI_STATIC5,81,173,8,8,0,WS_EX_TRANSPARENT ! LTEXT "---",IDC_EI_STATIC3,194,120,8,8,0,WS_EX_TRANSPARENT ! COMBOBOX IDC_ITEMENTRY,42,7,152,103,CBS_DROPDOWNLIST | WS_VSCROLL | ! WS_TABSTOP ! LTEXT "Entry",IDC_EI_SENTRY,13,9,17,8 ! PUSHBUTTON "New",IDC_ITEM_NEW,13,26,40,12 ! PUSHBUTTON "Edit",IDC_ITEM_EDIT,57,26,40,12 ! PUSHBUTTON "Apply",IDC_ITEM_APPLY,103,26,40,12,NOT WS_VISIBLE ! PUSHBUTTON "Cancel",IDC_ITEM_CANCEL,147,26,40,12,NOT WS_VISIBLE ! CONTROL "",IDC_ITEMDISPLAY,"Static",SS_BITMAP | SS_CENTERIMAGE | ! SS_SUNKEN,250,38,140,140 ! END ! ! IDD_NPCEDIT_DLG DIALOGEX 0, 0, 494, 341 ! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU ! CAPTION "NPC Editor" ! FONT 8, "MS Sans Serif", 0, 0, 0x0 ! BEGIN ! COMBOBOX IDC_NPCENTRY,47,7,154,157,CBS_DROPDOWNLIST | WS_VSCROLL | ! WS_TABSTOP ! PUSHBUTTON "New",IDC_NEWNPC,204,7,44,12 ! PUSHBUTTON "Edit",IDC_EDITNPC,251,7,44,12 ! PUSHBUTTON "Apply Edits",IDC_APPLYNPCEDITS,298,7,44,12,NOT ! WS_VISIBLE ! PUSHBUTTON "Cancel Edits",IDC_CANCELNPCEDITS,345,7,44,12,NOT ! WS_VISIBLE ! EDITTEXT IDC_NPCNAME,71,30,102,14,ES_AUTOHSCROLL | WS_DISABLED ! COMBOBOX IDC_NPCNAMEINDEX,71,46,102,52,CBS_DROPDOWNLIST | ! CBS_SORT | WS_DISABLED | WS_VSCROLL | WS_TABSTOP ! COMBOBOX IDC_NPCSOUND,71,61,102,57,CBS_DROPDOWN | CBS_SORT | ! WS_DISABLED | WS_VSCROLL | WS_TABSTOP ! COMBOBOX IDC_NPCBASEID,71,75,102,60,CBS_DROPDOWNLIST | CBS_SORT | ! WS_DISABLED | WS_VSCROLL | WS_TABSTOP ! COMBOBOX IDC_NPCOLOUR,71,90,86,49,CBS_DROPDOWN | CBS_SORT | ! WS_DISABLED | WS_VSCROLL | WS_TABSTOP ! PUSHBUTTON "",IDC_NPCPALETTE,160,90,13,13,BS_ICON | BS_CENTER | ! BS_VCENTER | WS_DISABLED ! COMBOBOX IDC_NPCICON,71,105,102,51,CBS_DROPDOWN | CBS_SORT | ! WS_DISABLED | WS_VSCROLL | WS_TABSTOP ! COMBOBOX IDC_NPCBRAIN,71,121,102,53,CBS_DROPDOWNLIST | CBS_SORT | ! WS_DISABLED | WS_VSCROLL | WS_TABSTOP ! EDITTEXT IDC_NPCDEFNAME,71,135,102,14,ES_AUTOHSCROLL | ! WS_DISABLED ! EDITTEXT IDC_NPCDESIRES,71,150,102,14,ES_AUTOHSCROLL | ! WS_DISABLED ! EDITTEXT IDC_NPCSPEECH,71,165,102,14,ES_AUTOHSCROLL | WS_DISABLED ! EDITTEXT IDC_NPCEVENTS,71,180,102,14,ES_AUTOHSCROLL | WS_DISABLED ! CONTROL "List5",IDC_NPCATTRIBUTES,"SysListView32",LVS_REPORT | ! LVS_SINGLESEL | LVS_NOSORTHEADER | WS_DISABLED | ! WS_BORDER | WS_TABSTOP,178,32,114,58 ! CONTROL "List6",IDC_SKILLS,"SysListView32",LVS_REPORT | ! LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_DISABLED | ! WS_BORDER | WS_TABSTOP,178,95,114,99 ! CONTROL "No Axis index",IDC_NPCNOINDEX,"Button",BS_AUTOCHECKBOX | ! BS_MULTILINE | WS_DISABLED | WS_TABSTOP,437,116,41,24 ! COMBOBOX IDC_NPCCATEGORY,342,150,122,52,CBS_DROPDOWNLIST | ! CBS_SORT | WS_DISABLED | WS_VSCROLL | WS_TABSTOP ! PUSHBUTTON "Add",IDC_NPCADDCATEGORY,465,150,18,12,WS_DISABLED ! COMBOBOX IDC_NPCSUBSECTION,342,165,122,59,CBS_DROPDOWNLIST | ! CBS_SORT | WS_DISABLED | WS_VSCROLL | WS_TABSTOP ! PUSHBUTTON "Add",IDC_NPCADDSUBSECTION,465,165,18,12,WS_DISABLED ! EDITTEXT IDC_NPCEDITDESCRIPTION,342,180,141,12,ES_AUTOHSCROLL | ! WS_DISABLED ! LISTBOX IDC_NPCATTRLIST,12,217,64,112,LBS_NOINTEGRALHEIGHT | ! WS_DISABLED | WS_VSCROLL | WS_TABSTOP ! CONTROL "Tree1",IDC_NPCATTRCATS,"SysTreeView32",TVS_HASBUTTONS | ! TVS_HASLINES | TVS_LINESATROOT | WS_DISABLED | WS_BORDER | ! WS_TABSTOP,79,217,100,112 ! LISTBOX IDC_NPCATTRCHOICES,181,217,106,112,LBS_SORT | ! LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_DISABLED | ! WS_VSCROLL | WS_HSCROLL | WS_TABSTOP ! CONTROL "List2",IDC_NPCATTRSELECTION,"SysListView32",LVS_REPORT | ! LVS_SINGLESEL | LVS_NOSORTHEADER | WS_DISABLED | ! WS_BORDER | WS_TABSTOP,290,217,191,97 ! EDITTEXT IDC_NPCATTRAMOUNT,321,317,33,12,ES_AUTOHSCROLL | ! WS_DISABLED ! PUSHBUTTON "Add",IDC_NPCATTRADD,407,317,35,12,WS_DISABLED ! PUSHBUTTON "Remove",IDC_NPCATTRREMOVE,444,317,35,12,WS_DISABLED ! CONTROL "Disable Display",IDC_NPCDISABLEDISPLAY,"Button", ! BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,437,42,37,20 ! DEFPUSHBUTTON "OK",IDOK,437,7,50,14 ! PUSHBUTTON "Cancel",IDCANCEL,437,24,50,14 ! GROUPBOX "Axis Classification",IDC_NE_GCLASS,299,139,188,60 ! LTEXT "NPC Entry",IDC_NE_STATIC1,7,9,34,8 ! GROUPBOX "Attributes",IDC_NE_GATTR,7,23,290,176 ! LTEXT "Name",IDC_NE_STATIC2,14,33,20,8 ! LTEXT "Name Index",IDC_NE_STATIC3,14,48,39,8 ! LTEXT "Sound",IDC_NE_STATIC4,14,63,22,8 ! LTEXT "Tracking Icon",IDC_NE_STATIC7,14,108,45,8 ! LTEXT "Brain",IDC_NE_STATIC8,14,123,17,8 ! LTEXT "DefName",IDC_NE_STATIC9,14,138,31,8 ! LTEXT "Desires",IDC_NE_STATIC10,14,153,24,8 ! LTEXT "Basic Speech",IDC_NE_STATIC11,14,168,45,8 ! LTEXT "Basic Events",IDC_NE_STATIC12,14,183,42,8 ! LTEXT "Creature Base",IDC_NE_STATIC5,14,78,46,8 ! LTEXT "Colour",IDC_NE_STATIC6,14,93,21,8 ! GROUPBOX "Miscellaneous Attributes",IDC_NE_GMISC,7,199,480,135 ! LTEXT "Attributes",IDC_NE_STATIC13,14,208,30,8 ! LTEXT "Categories",IDC_NE_STATIC14,79,208,34,8 ! LTEXT "Choices\t\t(D-Click to Add)",IDC_NE_STATIC15,182,208, ! 103,8 ! LTEXT "Selections\t\t\t\t(D-Click to Edit)",IDC_NE_STATIC16, ! 290,208,189,8 ! LTEXT "Amount",IDC_NE_STATIC20,292,319,25,8 ! LTEXT "Category",IDC_NE_STATIC17,304,152,29,8 ! LTEXT "Subsection",IDC_NE_STATIC18,304,167,36,8 ! LTEXT "Description",IDC_NE_STATIC19,304,182,36,8 ! CONTROL "",IDC_NPCIMAGE,"Static",SS_BITMAP | SS_CENTERIMAGE,300, ! 27,124,110 ! END ! ! IDD_ORE_EDIT_DLG DIALOGEX 0, 0, 291, 218 ! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU ! CAPTION "Ore Table Editor" ! FONT 8, "MS Sans Serif", 0, 0, 0x0 ! BEGIN ! CONTROL "List1",IDC_ORELIST,"SysListView32",LVS_REPORT | ! LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,40,277,77 ! PUSHBUTTON "Remove",IDC_OREREMOVE,7,119,44,14 ! PUSHBUTTON "Add",IDC_OREADD,240,119,44,14 ! EDITTEXT IDC_ORENAME,78,134,101,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ORECOLOUR,78,147,101,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ORESKILL,78,160,30,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ORECHANCE,78,173,30,12,ES_AUTOHSCROLL ! EDITTEXT IDC_OREMIN,78,185,30,12,ES_AUTOHSCROLL | ES_NUMBER ! EDITTEXT IDC_OREMAX,122,186,29,12,ES_AUTOHSCROLL | ES_NUMBER ! EDITTEXT IDC_OREINGOT,78,199,100,12,ES_AUTOHSCROLL ! DEFPUSHBUTTON "Save",IDOK,234,7,50,14 ! PUSHBUTTON "Cancel",IDCANCEL,234,24,50,14 ! LTEXT "Name",IDC_ORE_STATIC1,7,136,20,8 ! LTEXT "Colour",IDC_ORE_STATIC2,7,149,21,8 ! LTEXT "Vein %",IDC_ORE_STATIC4,7,175,22,8 ! LTEXT "Minimum Skill",IDC_ORE_STATIC3,7,162,43,8 ! LTEXT "Ore Per Vein",IDC_ORE_STATIC5,7,188,41,8 ! LTEXT "Ingot Item (optional)",IDC_ORE_STATIC6,7,201,63,8 ! LTEXT "--",IDC_ORE_STATIC7,109,187,8,8 ! END ! ! IDD_ADD_DESTINATION DIALOGEX 0, 0, 237, 97 ! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU ! CAPTION "Add Custom Destination" ! FONT 8, "MS Sans Serif", 0, 0, 0x0 ! BEGIN ! COMBOBOX IDC_CATEGORY,47,7,91,50,CBS_DROPDOWNLIST | WS_VSCROLL | ! WS_TABSTOP ! COMBOBOX IDC_SUBSECTION,47,31,91,59,CBS_DROPDOWNLIST | WS_VSCROLL | ! 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_ADC_SX,21,80,8,8 ! LTEXT "Y",IDC_ADC_SY,70,80,8,8 ! LTEXT "Z",IDC_ADC_SZ,124,80,8,8 ! LTEXT "Category",IDC_ACD_SCAT,14,9,29,8 ! LTEXT "Subsection",IDC_ADC_SSUB,7,33,36,8 ! LTEXT "Description",IDC_ADC_SDES,7,57,36,8 ! EDITTEXT IDC_PLANE,187,78,32,12,ES_AUTOHSCROLL | ES_NUMBER ! LTEXT "Plane",IDC_ADC_SP,168,80,19,8 ! END ! ! IDD_EDITGRAYMAP_DLG DIALOGEX 0, 0, 488, 318 ! STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | ! WS_SYSMENU | WS_THICKFRAME ! CAPTION "Map Script Editor" ! FONT 8, "MS Sans Serif", 0, 0, 0x0 ! BEGIN ! CONTROL "Tree1",IDC_REGIONTREE,"SysTreeView32",TVS_HASBUTTONS | ! TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | ! TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,192,98 ! PUSHBUTTON "New Area",IDC_NEWAREA,226,7,53,14 ! PUSHBUTTON "New Room",IDC_NEWROOM,226,22,53,14 ! PUSHBUTTON "Locate Area",IDC_LOCATEAREA,285,7,54,14 ! PUSHBUTTON "Locate Room",IDC_LOCATEROOM,285,22,54,14 ! PUSHBUTTON "Set as new TelePoint",IDC_SETPOINT,343,7,73,14 ! COMBOBOX IDC_VERSION,372,23,44,40,CBS_DROPDOWNLIST | WS_VSCROLL | ! WS_TABSTOP ! LISTBOX IDC_REGIONRECTLIST,7,119,108,45,LBS_SORT | ! LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP ! CONTROL "Draw Rectangles",IDC_DRAWRECTS,"Button",BS_AUTOCHECKBOX | ! WS_TABSTOP,121,118,70,10 ! PUSHBUTTON "Remove Rect",IDC_REMOVERECT,121,131,65,15 ! CONTROL "List2",IDC_MAPVALS,"SysListView32",LVS_REPORT | ! LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,175,190,134 ! DEFPUSHBUTTON "Save Changes",IDOK,425,7,56,14 ! PUSHBUTTON "Cancel",IDCANCEL,425,24,56,14 ! LTEXT "Bounding Rectangles",IDC_STATIC_BR,7,108,69,8 ! LTEXT "Map Center : ",IDC_STATIC_MC,255,47,44,8 ! LTEXT "",IDC_MAPCENTER,301,47,61,8 ! LTEXT "",IDC_CURSORCOORDS,368,47,74,8 ! LTEXT "Values",IDC_STATIC_VALS,7,165,22,8 ! PUSHBUTTON "",IDC_MOVEUP,202,7,15,15,BS_ICON | NOT WS_VISIBLE ! PUSHBUTTON "",IDC_MOVEDOWN,202,23,15,15,BS_ICON | NOT WS_VISIBLE ! CONTROL "",IDC_MAPDISPLAY,"{2AC21540-4C63-4663-BF24-D1DBD9205223}", ! WS_TABSTOP,205,57,276,252 ! ICON 215,IDC_ZOOMOUT,207,42,20,20,SS_NOTIFY | ! SS_REALSIZEIMAGE ! ICON 216,IDC_ZOOMIN,224,42,20,20,SS_NOTIFY | SS_REALSIZEIMAGE ! LTEXT "Plane",IDC_STATIC_PLANE,445,47,19,8 ! LTEXT "0",IDC_PLANE,466,47,12,8 ! LTEXT "Version",IDC_STATIC_VER,345,22,24,14,SS_CENTERIMAGE ! END ! ! IDD_EDITSKILL_DLG DIALOGEX 0, 0, 244, 59 ! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU ! CAPTION "Edit Skill/Stat Values" ! FONT 8, "MS Sans Serif", 0, 0, 0x0 ! BEGIN ! EDITTEXT IDC_SKILL_MIN,51,31,42,14,ES_AUTOHSCROLL ! EDITTEXT IDC_SKILL_MAX,132,31,42,14,ES_AUTOHSCROLL ! DEFPUSHBUTTON "OK",IDOK,187,7,50,14 ! PUSHBUTTON "Cancel",IDCANCEL,187,24,50,14 ! LTEXT "Skill Name:",IDC_ESS_STATIC1,7,10,36,8 ! EDITTEXT IDC_SKILLNAME,53,7,122,14,ES_AUTOHSCROLL | ES_READONLY ! LTEXT "Minimum",IDC_ESS_STATIC2,16,34,28,8 ! LTEXT "Maximum",IDC_ESS_STATIC3,97,34,30,8 ! END ! ! IDD_ADD_VALUE DIALOGEX 0, 0, 223, 46 ! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU ! CAPTION "Add Value" ! FONT 8, "MS Sans Serif", 0, 0, 0x0 ! BEGIN ! EDITTEXT IDC_VALUE,40,7,124,13,ES_AUTOHSCROLL ! EDITTEXT IDC_FILENAME,40,25,124,13,ES_AUTOHSCROLL ! DEFPUSHBUTTON "OK",IDOK,166,7,50,14 ! PUSHBUTTON "Cancel",IDCANCEL,166,24,50,14 ! LTEXT "Name",IDC_AV_SNAME,7,10,20,8,SS_CENTERIMAGE ! LTEXT "Filename",IDC_AV_SFILE,7,27,29,8 ! END ! ! IDD_EDITVALUE DIALOG 0, 0, 186, 46 ! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU ! CAPTION "Dialog" ! FONT 8, "MS Sans Serif" ! BEGIN ! EDITTEXT IDC_TEXTVALUE,7,16,115,13,ES_AUTOHSCROLL ! CONTROL "False",IDC_VALUEENABLED,"Button",BS_AUTOCHECKBOX | NOT ! WS_VISIBLE | WS_TABSTOP,47,17,33,10 ! DEFPUSHBUTTON "OK",IDOK,129,7,50,14 ! PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 ! END ! ! IDD_REGIONSELECTDLG DIALOGEX 0, 0, 303, 314 ! STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | ! WS_SYSMENU ! CAPTION "Region Selection" ! FONT 8, "MS Shell Dlg", 400, 0, 0x1 ! BEGIN ! DEFPUSHBUTTON "OK",IDOK,246,7,50,14 ! PUSHBUTTON "Cancel",IDCANCEL,246,24,50,14 ! LISTBOX IDC_REGION_LIST,7,40,101,267,LBS_NOINTEGRALHEIGHT | ! LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP ! LTEXT "Available Selections",IDC_RSD_STATIC1,7,31,64,8 ! EDITTEXT IDC_REGION_DETAILS,111,40,185,267,ES_MULTILINE | ! ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY ! LTEXT "Details",IDC_RSD_STATIC2,111,31,22,8 ! END ! ! IDD_EDITFLAGS DIALOG 0, 0, 187, 151 ! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU ! CAPTION "Dialog" ! FONT 8, "MS Sans Serif" ! BEGIN ! DEFPUSHBUTTON "OK",IDOK,130,7,50,14 ! PUSHBUTTON "Cancel",IDCANCEL,130,24,50,14 ! LISTBOX IDC_FLAGLIST,7,40,173,104,LBS_NOINTEGRALHEIGHT | ! LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP END *************** *** 173,192 **** #ifdef APSTUDIO_INVOKED ! GUIDELINES DESIGNINFO ! BEGIN ! IDD_FILEREAD_PROGRESS, DIALOG ! BEGIN ! LEFTMARGIN, 7 ! RIGHTMARGIN, 179 ! TOPMARGIN, 7 ! END ! ! IDD_PROFILE_EDIT, DIALOG BEGIN ! LEFTMARGIN, 7 ! RIGHTMARGIN, 292 ! TOPMARGIN, 7 ! BOTTOMMARGIN, 286 ! END END #endif // APSTUDIO_INVOKED --- 539,638 ---- #ifdef APSTUDIO_INVOKED ! GUIDELINES DESIGNINFO BEGIN ! IDD_FILEREAD_PROGRESS, DIALOG ! BEGIN ! LEFTMARGIN, 7 ! RIGHTMARGIN, 179 ! TOPMARGIN, 7 ! END ! ! IDD_PROFILE_EDIT, DIALOG ! BEGIN ! LEFTMARGIN, 7 ! RIGHTMARGIN, 292 ! TOPMARGIN, 7 ! BOTTOMMARGIN, 286 ! END ! ! IDD_ITEMEDIT, DIALOG ! BEGIN ! LEFTMARGIN, 7 ! RIGHTMARGIN, 390 ! TOPMARGIN, 7 ! BOTTOMMARGIN, 336 ! END ! ! IDD_NPCEDIT_DLG, DIALOG ! BEGIN ! LEFTMARGIN, 7 ! RIGHTMARGIN, 487 ! TOPMARGIN, 7 ! BOTTOMMARGIN, 334 ! END ! ! IDD_ORE_EDIT_DLG, DIALOG ! BEGIN ! LEFTMARGIN, 7 ! RIGHTMARGIN, 284 ! TOPMARGIN, 7 ! BOTTOMMARGIN, 211 ! END ! ! IDD_ADD_DESTINATION, DIALOG ! BEGIN ! LEFTMARGIN, 7 ! RIGHTMARGIN, 230 ! TOPMARGIN, 7 ! BOTTOMMARGIN, 90 ! END ! ! IDD_EDITGRAYMAP_DLG, DIALOG ! BEGIN ! LEFTMARGIN, 7 ! RIGHTMARGIN, 481 ! TOPMARGIN, 7 ! BOTTOMMARGIN, 309 ! END ! ! IDD_EDITSKILL_DLG, DIALOG ! BEGIN ! LEFTMARGIN, 7 ! RIGHTMARGIN, 237 ! TOPMARGIN, 7 ! BOTTOMMARGIN, 52 ! END ! ! IDD_ADD_VALUE, DIALOG ! BEGIN ! LEFTMARGIN, 7 ! RIGHTMARGIN, 216 ! TOPMARGIN, 7 ! BOTTOMMARGIN, 39 ! END ! ! IDD_EDITVALUE, DIALOG ! BEGIN ! LEFTMARGIN, 7 ! RIGHTMARGIN, 179 ! TOPMARGIN, 7 ! BOTTOMMARGIN, 39 ! END ! ! IDD_REGIONSELECTDLG, DIALOG ! BEGIN ! LEFTMARGIN, 7 ! RIGHTMARGIN, 296 ! TOPMARGIN, 7 ! BOTTOMMARGIN, 307 ! END ! ! IDD_EDITFLAGS, DIALOG ! BEGIN ! LEFTMARGIN, 7 ! RIGHTMARGIN, 180 ! TOPMARGIN, 7 ! BOTTOMMARGIN, 144 ! END END #endif // APSTUDIO_INVOKED *************** *** 205,214 **** ///////////////////////////////////////////////////////////////////////////// // // String Table // ! STRINGTABLE BEGIN ! IDS_PROJNAME "S_Sphere52" END --- 651,687 ---- ///////////////////////////////////////////////////////////////////////////// // + // Dialog Info + // + + IDD_ITEMEDIT DLGINIT + BEGIN + IDC_SKILL, 0x403, 8, 0 + 0x7241, 0x6863, 0x7265, 0x0079, + IDC_SKILL, 0x403, 8, 0 + 0x6546, 0x636e, 0x6e69, 0x0067, + IDC_SKILL, 0x403, 13, 0 + 0x614d, 0x6563, 0x6966, 0x6867, 0x6974, 0x676e, "\000" + IDC_SKILL, 0x403, 14, 0 + 0x7753, 0x726f, 0x7364, 0x616d, 0x736e, 0x6968, 0x0070, + 0 + END + + IDD_EDITGRAYMAP_DLG DLGINIT + BEGIN + IDC_MAPDISPLAY, 0x376, 29, 0 + 0x0000, 0x0000, 0x0000, 0x0001, 0x2aca, 0x0000, 0x2a60, 0x0000, 0x0000, + 0x0000, 0x0001, 0x000c, 0x0008, 0x0000, "\000" + 0 + END + + + ///////////////////////////////////////////////////////////////////////////// + // // String Table // ! STRINGTABLE BEGIN ! IDS_PROJNAME "S_Sphere52" END Index: S_Sphere52.vcproj =================================================================== RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/S_Sphere52.vcproj,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** S_Sphere52.vcproj 19 Jun 2003 19:13:36 -0000 1.10 --- S_Sphere52.vcproj 1 Jul 2003 14:17:40 -0000 1.11 *************** *** 161,164 **** --- 161,170 ---- </File> <File + RelativePath="EditFlagsDlg.cpp"> + </File> + <File + RelativePath="EditValue.cpp"> + </File> + <File RelativePath="FileReadProgress.cpp"> </File> *************** *** 170,173 **** --- 176,182 ---- </File> <File + RelativePath="MapScriptEditDlg.cpp"> + </File> + <File RelativePath="NPC.cpp"> </File> *************** *** 182,185 **** --- 191,197 ---- </File> <File + RelativePath="RegionSelectDlg.cpp"> + </File> + <File RelativePath="Room.cpp"> </File> *************** *** 269,272 **** --- 281,287 ---- </File> <File + RelativePath="addvaluedialog.cpp"> + </File> + <File RelativePath="attributes.cpp"> </File> *************** *** 321,324 **** --- 336,345 ---- </File> <File + RelativePath="EditFlagsDlg.h"> + </File> + <File + RelativePath="EditValue.h"> + </File> + <File RelativePath="FileReadProgress.h"> </File> *************** *** 330,333 **** --- 351,357 ---- </File> <File + RelativePath="MapScriptEditDlg.h"> + </File> + <File RelativePath="NPC.h"> </File> *************** *** 342,345 **** --- 366,372 ---- </File> <File + RelativePath="RegionSelectDlg.h"> + </File> + <File RelativePath="Resource.h"> </File> *************** *** 427,430 **** --- 454,460 ---- <File RelativePath="XMLConfig.h"> + </File> + <File + RelativePath="addvaluedialog.h"> </File> <File Index: ScriptsMain.cpp =================================================================== RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptsMain.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** ScriptsMain.cpp 26 Jun 2003 22:28:03 -0000 1.20 --- ScriptsMain.cpp 1 Jul 2003 14:17:40 -0000 1.21 *************** *** 1113,1117 **** bool CScriptsMain::SaveLocations() { - #ifdef _AXIS LOG(locale->String(IDS_SCRIPTS_SAVING), locale->String(IDS_SCRIPTS_TLOCATIONS)); CWaitCursor hourglass; --- 1113,1116 ---- *************** *** 1127,1131 **** } CString csLine; ! csLine.Format(_T("// %s created by %s\n"), USER_LOC_FILE, Main->GetVersionTitle()); csfOutput.WriteString(csLine); CTime time; --- 1126,1130 ---- } CString csLine; ! csLine.Format(_T("// %s created by %s\n"), USER_LOC_FILE, Version()); csfOutput.WriteString(csLine); CTime time; *************** *** 1136,1140 **** csfOutput.WriteString(csLine); ! for ( int i = 0; i < this->m_aLocations.GetSize(); i++ ) { CLocation * pLoc = this->m_aLocations[i]; --- 1135,1139 ---- csfOutput.WriteString(csLine); ! for ( int i = 0; i < (int) this->m_aLocations.GetSize(); i++ ) { CLocation * pLoc = this->m_aLocations[i]; *************** *** 1153,1157 **** csfOutput.Close(); ReplaceFiles(TMP_USER_LOC_FILE, USER_LOC_FILE); - #endif return true; } --- 1152,1155 ---- *************** *** 1388,1395 **** void CScriptsMain::ReloadTables() { - /* - if ( m_bNewFormat ) - return; - */ this->UnloadTables(); this->LoadTables(); --- 1386,1389 ---- *************** *** 1431,1436 **** --- 1425,1432 ---- RES_NOTOTITLES, // (SI) Define the noto titles used. RES_OBSCENE, // (SL) A list of obscene words. + RES_ORE, // Table of ores (Sphere 0.52 and earlier) RES_PLEVEL, // Define the list of commands that a PLEVEL can access. (or not access) RES_PLOTITEM, // (Phase this out in favor of better @trigger TEVENT= and EVENT= support.) + RES_POTION, // Definition of a potion (Sphere 0.52 and earlier) RES_PROFESSION, // Define specifics for a char with this skill class. (ex. skill caps) -- used to be SKILLCLASS RES_QUEST, *************** *** 1496,1501 **** --- 1492,1499 ---- _T("NOTOTITLES"), // (SI) Define the noto titles used. _T("OBSCENE"), // (SL) A list of obscene words. + _T("ORE"), // Ore table _T("PLEVEL"), // Define the list of commands that a PLEVEL can access. (or not access) _T("PLOTITEM"), // (Phase this out in favor of better @trigger TEVENT= and EVENT= support.) + _T("POTION"), // Potion definition _T("PROFESSION"), // Define class specifics for a char with this skill class. -- Used to be SKILLCLASS _T("QUEST"), // ability to get accomplishment titles. *************** *** 1553,1557 **** m_pDlg->SetPos(0); m_pDlg->SetRange32(0, (DWORD)csfInput.GetLength()); - // m_pDlg->UpdateData(false); } --- 1551,1554 ---- *************** *** 1569,1576 **** j++; if ( j % 10 == 0 && m_pDlg) - { m_pDlg->SetPos((int)csfInput.GetPosition()); - //m_pDlg->UpdateData(); - } CString csKey = csLine.Mid(1); csKey = csKey.SpanExcluding(_T("]")); --- 1566,1570 ---- *************** *** 1785,1788 **** --- 1779,1787 ---- this->m_tables.m_obscene.m_csFilename = csFile; break; + case RES_ORE: // An ore table + this->m_tables.m_ores.Read(csfInput); + this->m_tables.m_ores.m_dwFileOffset = dwOffset; + this->m_tables.m_ores.m_csFilename = csFile; + break; case RES_PLEVEL: // Define the list of commands that a PLEVEL can access. (or not access) this->m_tables.m_pLevel[iIndex - 1].m_csID.Format(_T("%s %s"), csKey, csIndex); *************** *** 1804,1807 **** --- 1803,1819 ---- } break; + case RES_POTION: + { + CTPotionDef * pPotion = new CTPotionDef; + pPotion->m_csFilename = csFile; + pPotion->m_dwFileOffset = dwOffset; + pPotion->m_csValue = csIndex; + pPotion->m_bType = TYPE_POTION; + int iOld = m_tables.m_potions.Find(csIndex); + if ( iOld != -1 ) + m_tables.m_potions.RemoveAt(iOld); + m_tables.m_potions.Insert(pPotion); + } + break; case RES_QUEST: break; *************** *** 2059,2071 **** } } ! else ! { ! j++; ! if ( j % 100 == 0 && m_pDlg) ! { m_pDlg->SetPos((int)csfInput.GetPosition()); - //m_pDlg->UpdateData(); - } - } } } --- 2071,2076 ---- } } ! else if ( j++ % 100 == 0 && m_pDlg) m_pDlg->SetPos((int)csfInput.GetPosition()); } } *************** *** 2099,2104 **** LOG(locale->String(IDS_SCRIPTS_CWD), cwd); - CreateProgressDialog(); - m_bDeleteDialog = false; m_vFiles.erase(m_vFiles.begin(), m_vFiles.end()); m_vFiles.resize(File_QTY); --- 2104,2107 ---- *************** *** 2108,2122 **** Main->m_pAxis->Login(); CStringArray csaScripts; csaScripts.Copy(m_pProfile->Files()); if ( csaScripts.GetSize() > 0 ) { // Check for updates on the specified scripts - // Make sure the directory for the remote profiles exists - CreateDirectory(m_pProfile->ProfileName(), NULL); for ( int i = 0; i < csaScripts.GetSize(); i++ ) { CString sFile; CMD5Hash md5; ! sFile.Format(_T("%s\\%s"), m_pProfile->ProfileName(), md5.GetHash(csaScripts.GetAt(i))); Main->m_pAxis->GetRemoteFile(csaScripts.GetAt(i), sFile); int j = MapFile(csaScripts.GetAt(i)); --- 2111,2126 ---- Main->m_pAxis->Login(); CStringArray csaScripts; + CString sScriptDirectory = m_pProfile->BaseDirectory() + _T("\\") + m_pProfile->ProfileName(); csaScripts.Copy(m_pProfile->Files()); + // Make sure the directory for the remote profiles exists + CreateDirectory(sScriptDirectory, NULL); if ( csaScripts.GetSize() > 0 ) { // Check for updates on the specified scripts for ( int i = 0; i < csaScripts.GetSize(); i++ ) { CString sFile; CMD5Hash md5; ! sFile.Format(_T("%s\\%s"), sScriptDirectory, md5.GetHash(csaScripts.GetAt(i))); Main->m_pAxis->GetRemoteFile(csaScripts.GetAt(i), sFile); int j = MapFile(csaScripts.GetAt(i)); *************** *** 2128,2137 **** { // Check for updates of the files we know we need to get - CreateDirectory(m_pProfile->ProfileName(), NULL); for ( int i = File_Map; i < File_QTY; i++ ) { CString sFile; CMD5Hash md5; ! sFile.Format(_T("%s\\%s"), m_pProfile->ProfileName(), md5.GetHash(m_pszFiles[i])); Main->m_pAxis->GetRemoteFile(m_pszFiles[i], sFile); m_vFiles[i] = sFile; --- 2132,2140 ---- { // Check for updates of the files we know we need to get for ( int i = File_Map; i < File_QTY; i++ ) { CString sFile; CMD5Hash md5; ! sFile.Format(_T("%s\\%s"), sScriptDirectory, md5.GetHash(m_pszFiles[i])); Main->m_pAxis->GetRemoteFile(m_pszFiles[i], sFile); m_vFiles[i] = sFile; *************** *** 2140,2143 **** --- 2143,2148 ---- Main->m_pAxis->Logout(); // Make sure we know where to get the location files + // By default, these should be in the working directory, but we may + // have downloaded them from the remote server. if ( m_vFiles[File_Loc] == _T("") ) { *************** *** 2152,2156 **** m_vFiles[File_Loc2] = sFile; } ! // If Axiscats is defined, then load it if ( m_vFiles[File_AxisCats] != _T("") ) { --- 2157,2161 ---- m_vFiles[File_Loc2] = sFile; } ! // If axiscats.scp is in our file list, read it. if ( m_vFiles[File_AxisCats] != _T("") ) { *************** *** 2158,2161 **** --- 2163,2167 ---- LoadFile(m_vFiles[File_Loc]); LoadFile(m_vFiles[File_Loc2]); + // No other files need to be loaded. return; } *************** *** 2164,2167 **** --- 2170,2174 ---- { // Local profile + CString sBaseDirectory = m_pProfile->BaseDirectory(); // Has the user selected particular scripts to load? CStringArray csaScripts; *************** *** 2179,2184 **** else { LOG( locale->String(IDS_SCRIPTS_READINGINI)); ! csLoadFile.Format(_T("%s\\%s"), cwd, INI_FILE); m_tables.m_Sphere.m_csFilename = csLoadFile; m_config.m_sSCPBaseDir = cwd; --- 2186,2192 ---- else { + // Find the location of the scripts from sphere.ini LOG( locale->String(IDS_SCRIPTS_READINGINI)); ! csLoadFile.Format(_T("%s\\%s"), sBaseDirectory, INI_FILE); m_tables.m_Sphere.m_csFilename = csLoadFile; m_config.m_sSCPBaseDir = cwd; *************** *** 2189,2195 **** sBasePath = m_config.m_sSCPBaseDir; else ! sBasePath = cwd; if ( sBasePath.Right(1) != _T('\\') ) sBasePath.Append(_T("\\")); for ( int i = File_World; i < File_QTY; i++ ) { --- 2197,2205 ---- sBasePath = m_config.m_sSCPBaseDir; else ! sBasePath = sBaseDirectory; ! // Strip out a trailing backslash, if it exists. if ( sBasePath.Right(1) != _T('\\') ) sBasePath.Append(_T("\\")); + // Populate the filelist with all of the standard files for ( int i = File_World; i < File_QTY; i++ ) { *************** *** 2201,2206 **** --- 2211,2231 ---- m_vFiles[i] = sFile; } + // hoglocs.scp, axiscats.scp and custloc.scp should come from the base directory + m_vFiles[File_AxisCats] = sBaseDirectory + _T("\\axiscats.scp"); + m_vFiles[File_Loc] = sBaseDirectory + _T("\\hoglocs.scp"); + m_vFiles[File_Loc2] = sBaseDirectory + _T("\\custloc.scp"); + } + // Try to load axiscats.scp if it exists + if ( LoadFile(m_vFiles[File_AxisCats]) ) + { + // Load the locations and exit + LoadFile(m_vFiles[File_Loc]); + LoadFile(m_vFiles[File_Loc2]); + return; } } + CreateProgressDialog(); + m_bDeleteDialog = false; + this->LoadDefs(); this->LoadItems(); *************** *** 2380,2387 **** bool CScriptsMain::ReplaceFiles( CString csNewFile, CString csOldFile ) { - // Most likely, the old file name doesn't have the path associated with it. - if (csOldFile.Find(_T(":")) == -1 && csOldFile.Find(_T("ini")) == -1 ) - { - } // Loop through this a few times int i = 0; --- 2405,2408 ---- *************** *** 3038,3053 **** CStdioFile fWorld; CString sWorldfile; ! sWorldfile.Format(_T("%s\\sphereworld.scp"), m_config.m_sWorldBaseDir); if ( fWorld.Open(sWorldfile, CFile::modeRead | CFile::shareDenyNone | CFile::typeText) ) { ! CFileReadProgress progress; ! progress.Create(IDD_FILEREAD_PROGRESS); ! progress.SetRange32(0, (ULONG) fWorld.GetLength()); ! progress.SetPos(0); CString sMessage = locale->String(IDS_TRAVEL_LOADINGSPAWNS); ! progress.m_csMessage.SetWindowText(sMessage); BOOL bStatus = TRUE; CString sLine; DWORD offset; while ( bStatus ) { --- 3059,3077 ---- CStdioFile fWorld; CString sWorldfile; ! if ( m_vFiles[File_World] == _T("") ) ! sWorldfile.Format(_T("%s\\sphereworld.scp"), m_config.m_sWorldBaseDir); ! else ! sWorldfile = m_vFiles[File_World]; if ( fWorld.Open(sWorldfile, CFile::modeRead | CFile::shareDenyNone | CFile::typeText) ) { ! CreateProgressDialog(); ! m_pDlg->SetRange32(0, (ULONG) fWorld.GetLength()); ! m_pDlg->SetPos(0); CString sMessage = locale->String(IDS_TRAVEL_LOADINGSPAWNS); ! m_pDlg->m_csMessage.SetWindowText(sMessage); BOOL bStatus = TRUE; CString sLine; DWORD offset; + int iLine = 0; while ( bStatus ) { *************** *** 3056,3059 **** --- 3080,3085 ---- if ( ! bStatus ) break; + if ( (iLine++ % 1000) == 0 ) + m_pDlg->SetPos(offset); if ( sLine.Find(_T("[WORLDITEM")) == 0 ) { *************** *** 3073,3076 **** --- 3099,3103 ---- } } + DestroyProgressDialog(); fWorld.Close(); return 0; *************** *** 3207,3222 **** CleanWorlditems(); if ( m_sWorldItemFile == _T("") ) ! return -1; CStdioFile fWorld; if ( fWorld.Open(m_sWorldItemFile, CFile::modeRead | CFile::shareDenyNone | CFile::typeText) ) { ! CFileReadProgress progress; ! progress.SetRange32(0, (ULONG) fWorld.GetLength()); ! progress.SetPos(0); CString sMessage = locale->String(IDS_TRAVEL_LOADINGSPAWNS); ! progress.m_csMessage.SetWindowText(sMessage); BOOL bStatus = TRUE; CString sLine; DWORD offset; while ( bStatus ) { --- 3234,3255 ---- CleanWorlditems(); if ( m_sWorldItemFile == _T("") ) ! { ! if ( m_vFiles[File_World] == _T("") ) ! return -1; ! else ! m_sWorldItemFile = m_vFiles[File_World]; ! } CStdioFile fWorld; if ( fWorld.Open(m_sWorldItemFile, CFile::modeRead | CFile::shareDenyNone | CFile::typeText) ) { ! CreateProgressDialog(); ! m_pDlg->SetRange32(0, (ULONG) fWorld.GetLength()); ! m_pDlg->SetPos(0); CString sMessage = locale->String(IDS_TRAVEL_LOADINGSPAWNS); ! m_pDlg->m_csMessage.SetWindowText(sMessage); BOOL bStatus = TRUE; CString sLine; DWORD offset; + int iLine = 0; while ( bStatus ) { *************** *** 3225,3228 **** --- 3258,3263 ---- if ( ! bStatus ) break; + if ( iLine % 1000 == 0 ) + m_pDlg->SetPos(offset); if ( sLine.Find(_T("[WORLDITEM")) == 0 ) { *************** *** 3237,3240 **** --- 3272,3276 ---- } fWorld.Close(); + DestroyProgressDialog(); return 0; } *************** *** 3401,3402 **** --- 3437,3443 ---- } + CString CScriptsMain::Version() + { + // Don't hardcode this!! + return _T("S_Sphere52 version 1.0 alpha"); + } Index: ScriptsMain.h =================================================================== RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptsMain.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** ScriptsMain.h 26 Jun 2003 22:28:04 -0000 1.11 --- ScriptsMain.h 1 Jul 2003 14:17:40 -0000 1.12 *************** *** 327,329 **** --- 327,330 ---- bool m_bMidisFound; void FindMidis(); + CString Version(); }; Index: strings.h =================================================================== RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/strings.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** strings.h 4 Jun 2003 21:47:17 -0000 1.3 --- strings.h 1 Jul 2003 14:17:40 -0000 1.4 *************** *** 55,58 **** --- 55,63 ---- #define IDS_TRAVEL_ALLSPAWNS 445 #define IDS_TRAVEL_LOADINGSPAWNS 446 + #define IDS_TRUE 398 + #define IDS_FALSE 397 + #define IDS_ADDVAL_NAME 241 + #define IDS_ADDVAL_FILE 242 + |