diff --git a/.github/workflows/build.yml b/.github/workflows/UOX3Build.yml similarity index 70% rename from .github/workflows/build.yml rename to .github/workflows/UOX3Build.yml index 74423761a..d74d4d83f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/UOX3Build.yml @@ -8,7 +8,6 @@ on: - '**.dfn' - '**.scp' - '**.txt' - - '**.html' - '**.md' - '**.html' - '**.sln' @@ -21,7 +20,6 @@ on: - '**.dfn' - '**.scp' - '**.txt' - - '**.html' - '**.md' - '**.html' - '**.sln' @@ -36,19 +34,20 @@ jobs: build: strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-13] + os: [ubuntu-latest, windows-latest, macos-13] + # You can convert this to a matrix build if you need cross-platform coverage. + # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - with: - submodules: true - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type run: cmake make/cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} - name: Build - # Build + # Build your program with the given configuration run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} diff --git a/make/VS2017/uox3.vcxproj b/make/VS2017/uox3.vcxproj index 48baf8638..b712ba8ea 100644 --- a/make/VS2017/uox3.vcxproj +++ b/make/VS2017/uox3.vcxproj @@ -474,7 +474,7 @@ true true - + Disabled Disabled true @@ -1419,7 +1419,7 @@ - + @@ -1436,7 +1436,6 @@ - diff --git a/make/VS2017/uox3.vcxproj.filters b/make/VS2017/uox3.vcxproj.filters index 022e4f485..b5955147c 100644 --- a/make/VS2017/uox3.vcxproj.filters +++ b/make/VS2017/uox3.vcxproj.filters @@ -3,7 +3,7 @@ {46478ac4-f349-4dc4-9db5-938cb6f14841} - *.cpp + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx {cd40ad04-825d-48bb-9a86-ff3ee1b2925e} @@ -22,7 +22,7 @@ {94278091-bf08-4009-be0a-03cb0d9f0fc2} - *.h* + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd {e69fb852-15bb-499d-a73e-13f7b97c87b5} @@ -56,6 +56,7 @@ {d5c774e7-3238-46bf-bb3a-5e16a36b5b77} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms {47123d74-35f3-41ba-b7ee-c4d15af5c6af} @@ -65,6 +66,10 @@ Source Files + + + Source Files\Script + Source Files\Script @@ -77,7 +82,12 @@ Source Files\Script - + + + + Source Files\Base Objects + + Source Files\Base Objects @@ -104,15 +114,11 @@ Source Files\Base Objects - - Source Files\Base Objects - - + Source Files\Base Objects - - Source Files\Subsystem - + + Source Files\Subsystem @@ -125,9 +131,6 @@ Source Files\Subsystem - - Source Files\Subsystem - Source Files\Subsystem @@ -137,9 +140,6 @@ Source Files\Subsystem - - Source Files\Subsystem - Source Files\Subsystem @@ -161,18 +161,21 @@ Source Files\Subsystem - - Source Files\Subsystem - Source Files\Subsystem Source Files\Subsystem + + Source Files\Subsystem + Source Files\Subsystem + + Source Files\Subsystem + Source Files\Subsystem @@ -188,6 +191,9 @@ Source Files\Subsystem + + Source Files\Subsystem + Source Files\Subsystem @@ -203,6 +209,8 @@ Source Files\Subsystem + + Source Files\Other @@ -215,6 +223,9 @@ Source Files\Other + + Source Files\Other + Source Files\Other @@ -239,9 +250,14 @@ Source Files\Other + + Source Files\Other + Source Files\Other + + Source Files\JS Engine @@ -263,24 +279,22 @@ Source Files\JS Engine + + Source Files\Network Source Files\Network - - Source Files\UOData - - - Source Files\UOData - Source Files\Network Source Files\Network + + Source Files\Utility @@ -290,26 +304,42 @@ Source Files\Utility - - Source Files\Subsystem + + + + Source Files\UOData - - Source Files + + Source Files\UOData - - Source Files + + Source Files\UOData + - + Header Files - - Header Files + + + + Header Files\Script - - Header Files + + Header Files\Script + + Header Files\Script + + + Header Files\Script + + + Header Files\Script + + + Header Files\Base Objects @@ -328,36 +358,29 @@ Header Files\Base Objects + + Header Files\Base Objects + + + Header Files\Base Objects + Header Files\Base Objects Header Files\Base Objects - + Header Files\Base Objects - + Header Files\Base Objects Header Files\Base Objects - - Header Files\Script - - - Header Files\Script - - - Header Files\Script - - - Header Files\Script - - - Header Files\Script - + + Header Files\Subsystem @@ -367,6 +390,9 @@ Header Files\Subsystem + + Header Files\Subsystem + Header Files\Subsystem @@ -394,9 +420,6 @@ Header Files\Subsystem - - Header Files\Subsystem - Header Files\Subsystem @@ -409,9 +432,15 @@ Header Files\Subsystem + + Header Files\Subsystem + Header Files\Subsystem + + Header Files\Other + Header Files\Subsystem @@ -421,6 +450,11 @@ Header Files\Subsystem + + Header Files\Subsystem + + + Header Files\Other @@ -430,13 +464,13 @@ Header Files\Other - + Header Files\Other - + Header Files\Other - + Header Files\Other @@ -445,24 +479,26 @@ Header Files\Other - + Header Files\Other - + Header Files\Other - + Header Files\Other - + Header Files\Other Header Files\Other - + Header Files\Other + + Header Files\JS Engine @@ -490,9 +526,11 @@ Header Files\JS Engine - + Header Files\JS Engine + + Header Files\Network @@ -502,42 +540,36 @@ Header Files\Network - - Header Files - - - Header Files\UOData - - - Header Files\UOData - - - Header Files\Network No. 1 - Header Files\Network + + + Header Files\Utility Header Files\Utility - - Header Files\Base Objects - - + Header Files\Utility - - Header Files\Subsystem + + + + Header Files\UOData - - Header Files + + Header Files\UOData - - Header Files + + Header Files\UOData + + + Header Files\UOData + diff --git a/make/VS2022/uox3.vcxproj b/make/VS2022/uox3.vcxproj index 2e2d14e49..1978d7850 100644 --- a/make/VS2022/uox3.vcxproj +++ b/make/VS2022/uox3.vcxproj @@ -90,164 +90,201 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + diff --git a/make/VS2022/uox3.vcxproj.filters b/make/VS2022/uox3.vcxproj.filters index ae0e11fa8..e23a44689 100644 --- a/make/VS2022/uox3.vcxproj.filters +++ b/make/VS2022/uox3.vcxproj.filters @@ -5,14 +5,6 @@ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - {cd40ad04-825d-48bb-9a86-ff3ee1b2925e} @@ -28,6 +20,10 @@ {5dc0e64e-1161-4bdd-b7a9-08309a58eb14} + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + {e69fb852-15bb-499d-a73e-13f7b97c87b5} @@ -58,19 +54,22 @@ {4e9f44ee-ffe6-4241-9ba9-faa06b8bcd9b} + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + {47123d74-35f3-41ba-b7ee-c4d15af5c6af} - - - Resource Files - - Source Files + + + Source Files\Script + Source Files\Script @@ -83,7 +82,15 @@ Source Files\Script - + + + + Source Files\Base Objects + + + Source Files\Base Objects + + Source Files\Base Objects @@ -107,9 +114,11 @@ Source Files\Base Objects - + Source Files\Base Objects + + Source Files\Subsystem @@ -122,9 +131,6 @@ Source Files\Subsystem - - Source Files\Subsystem - Source Files\Subsystem @@ -134,9 +140,6 @@ Source Files\Subsystem - - Source Files\Subsystem - Source Files\Subsystem @@ -158,18 +161,21 @@ Source Files\Subsystem - - Source Files\Subsystem - Source Files\Subsystem Source Files\Subsystem + + Source Files\Subsystem + Source Files\Subsystem + + Source Files\Subsystem + Source Files\Subsystem @@ -185,6 +191,9 @@ Source Files\Subsystem + + Source Files\Subsystem + Source Files\Subsystem @@ -200,6 +209,8 @@ Source Files\Subsystem + + Source Files\Other @@ -212,6 +223,9 @@ Source Files\Other + + Source Files\Other + Source Files\Other @@ -236,9 +250,14 @@ Source Files\Other + + Source Files\Other + Source Files\Other + + Source Files\JS Engine @@ -260,24 +279,22 @@ Source Files\JS Engine + + Source Files\Network Source Files\Network - - Source Files\UOData - - - Source Files\UOData - Source Files\Network Source Files\Network + + Source Files\Utility @@ -287,33 +304,42 @@ Source Files\Utility - - Source Files\Subsystem - - - Source Files - - - Source Files + + + + Source Files\UOData - - - Source Files + + Source Files\UOData - - Source Files + + Source Files\UOData + - + Header Files - - Header Files + + + + Header Files\Script - - Header Files + + Header Files\Script + + + Header Files\Script + + + Header Files\Script + + + Header Files\Script + + Header Files\Base Objects @@ -332,36 +358,29 @@ Header Files\Base Objects + + Header Files\Base Objects + + + Header Files\Base Objects + Header Files\Base Objects Header Files\Base Objects - + Header Files\Base Objects - + Header Files\Base Objects Header Files\Base Objects - - Header Files\Script - - - Header Files\Script - - - Header Files\Script - - - Header Files\Script - - - Header Files\Script - + + Header Files\Subsystem @@ -371,6 +390,9 @@ Header Files\Subsystem + + Header Files\Subsystem + Header Files\Subsystem @@ -398,9 +420,6 @@ Header Files\Subsystem - - Header Files\Subsystem - Header Files\Subsystem @@ -413,9 +432,15 @@ Header Files\Subsystem + + Header Files\Subsystem + Header Files\Subsystem + + Header Files\Other + Header Files\Subsystem @@ -425,6 +450,11 @@ Header Files\Subsystem + + Header Files\Subsystem + + + Header Files\Other @@ -434,13 +464,13 @@ Header Files\Other - + Header Files\Other - + Header Files\Other - + Header Files\Other @@ -449,21 +479,26 @@ Header Files\Other - + + Header Files\Other + + Header Files\Other Header Files\Other - + Header Files\Other Header Files\Other - + Header Files\Other + + Header Files\JS Engine @@ -491,6 +526,11 @@ Header Files\JS Engine + + Header Files\JS Engine + + + Header Files\Network @@ -500,47 +540,45 @@ Header Files\Network - - Header Files - - - Header Files\UOData - - - Header Files\UOData - - - Header Files\Network No. 1 - Header Files\Network + + + Header Files\Utility Header Files\Utility - - Header Files\Base Objects - - + Header Files\Utility - - Header Files\Subsystem + + + + Header Files\UOData - - Header Files + + Header Files\UOData - - Header Files + + Header Files\UOData + + + Header Files\UOData - + Resource Files + + + Resource Files + + \ No newline at end of file diff --git a/make/XCode/uox3.xcodeproj/project.pbxproj b/make/XCode/uox3.xcodeproj/project.pbxproj index 364a25f65..cc8952325 100644 --- a/make/XCode/uox3.xcodeproj/project.pbxproj +++ b/make/XCode/uox3.xcodeproj/project.pbxproj @@ -14,7 +14,7 @@ 64A9011D293E3DD4009B54DA /* books.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64A90078293E3DD4009B54DA /* books.cpp */; }; 64A9011E293E3DD4009B54DA /* cAccountClass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64A9007A293E3DD4009B54DA /* cAccountClass.cpp */; }; 64A9011F293E3DD4009B54DA /* calcfuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64A9007C293E3DD4009B54DA /* calcfuncs.cpp */; }; - 64A90120293E3DD4009B54DA /* cBaseobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64A9007D293E3DD4009B54DA /* cBaseobject.cpp */; }; + 64A90120293E3DD4009B54DA /* cBaseObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64A9007D293E3DD4009B54DA /* cBaseObject.cpp */; }; 64A90121293E3DD4009B54DA /* cChar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64A9007F293E3DD4009B54DA /* cChar.cpp */; }; 64A90122293E3DD4009B54DA /* cConsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64A90081293E3DD4009B54DA /* cConsole.cpp */; }; 64A90123293E3DD4009B54DA /* cDice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64A90083293E3DD4009B54DA /* cDice.cpp */; }; @@ -131,7 +131,7 @@ 64A9007A293E3DD4009B54DA /* cAccountClass.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cAccountClass.cpp; sourceTree = ""; }; 64A9007B293E3DD4009B54DA /* cAccountClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cAccountClass.h; sourceTree = ""; }; 64A9007C293E3DD4009B54DA /* calcfuncs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = calcfuncs.cpp; sourceTree = ""; }; - 64A9007D293E3DD4009B54DA /* cBaseobject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cBaseobject.cpp; sourceTree = ""; }; + 64A9007D293E3DD4009B54DA /* cBaseObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cBaseObject.cpp; sourceTree = ""; }; 64A9007E293E3DD4009B54DA /* cBaseObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cBaseObject.h; sourceTree = ""; }; 64A9007F293E3DD4009B54DA /* cChar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cChar.cpp; sourceTree = ""; }; 64A90080293E3DD4009B54DA /* cChar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cChar.h; sourceTree = ""; }; @@ -200,7 +200,7 @@ 64A900C0293E3DD4009B54DA /* findfuncs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = findfuncs.cpp; sourceTree = ""; }; 64A900C1293E3DD4009B54DA /* funcdecl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = funcdecl.h; sourceTree = ""; }; 64A900C2293E3DD4009B54DA /* GenericList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenericList.h; sourceTree = ""; }; - 64A900C3293E3DD4009B54DA /* gump.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gump.h; sourceTree = ""; }; + 64A900C3293E3DD4009B54DA /* CGump.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CGump.h; sourceTree = ""; }; 64A900C4293E3DD4009B54DA /* gumps.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gumps.cpp; sourceTree = ""; }; 64A900C5293E3DD4009B54DA /* house.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = house.cpp; sourceTree = ""; }; 64A900C6293E3DD4009B54DA /* IP4Address.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IP4Address.cpp; sourceTree = ""; }; @@ -325,15 +325,14 @@ 64A90074293E3DD4009B54DA /* source */ = { isa = PBXGroup; children = ( - 64E2F798293FD53200546A08 /* Leftover */, - 64E2F791293FCE4800546A08 /* Subsystem */, - 64E2F797293FCE8C00546A08 /* Utility */, - 64E2F796293FCE8400546A08 /* UOData */, 64E2F795293FCE7500546A08 /* Script */, + 64E2F790293FCE3800546A08 /* Base Objects */, + 64E2F791293FCE4800546A08 /* Subsystem */, 64E2F792293FCE5900546A08 /* Other */, - 64E2F794293FCE6C00546A08 /* Network */, 64E2F793293FCE6200546A08 /* JS Engine */, - 64E2F790293FCE3800546A08 /* Base Objects */, + 64E2F794293FCE6C00546A08 /* Network */, + 64E2F797293FCE8C00546A08 /* Utility */, + 64E2F796293FCE8400546A08 /* UOData */, 64A90089293E3DD4009B54DA /* Changelog.txt */, 64A90103293E3DD4009B54DA /* uox3.cpp */, 64A90104293E3DD4009B54DA /* uox3.h */, @@ -355,13 +354,11 @@ 64E2F790293FCE3800546A08 /* Base Objects */ = { isa = PBXGroup; children = ( - 64A90112293E3DD4009B54DA /* uoxstruct.h */, - 64A900E1293E3DD4009B54DA /* PageVector.h */, - 64A900C1293E3DD4009B54DA /* funcdecl.h */, - 64A900DD293E3DD4009B54DA /* ObjectFactory.cpp */, - 64A900DE293E3DD4009B54DA /* ObjectFactory.h */, - 64A9007D293E3DD4009B54DA /* cBaseobject.cpp */, + 64A90077293E3DD4009B54DA /* boats.cpp */, + 64A9007D293E3DD4009B54DA /* cBaseObject.cpp */, 64A9007E293E3DD4009B54DA /* cBaseObject.h */, + 64A9007F293E3DD4009B54DA /* cChar.cpp */, + 64A90080293E3DD4009B54DA /* cChar.h */, 64A90081293E3DD4009B54DA /* cConsole.cpp */, 64A90082293E3DD4009B54DA /* cConsole.h */, 64A90086293E3DD4009B54DA /* cGuild.cpp */, @@ -376,6 +373,11 @@ 64A900B1293E3DD4009B54DA /* cSpawnRegion.h */, 64A900B2293E3DD4009B54DA /* cThreadQueue.cpp */, 64A900B3293E3DD4009B54DA /* cThreadQueue.h */, + 64A900C1293E3DD4009B54DA /* funcdecl.h */, + 64A900DD293E3DD4009B54DA /* ObjectFactory.cpp */, + 64A900DE293E3DD4009B54DA /* ObjectFactory.h */, + 64A900E1293E3DD4009B54DA /* PageVector.h */, + 64A90112293E3DD4009B54DA /* uoxstruct.h */, 64A900E8293E3DD4009B54DA /* queue.cpp */, ); name = "Base Objects"; @@ -384,49 +386,41 @@ 64E2F791293FCE4800546A08 /* Subsystem */ = { isa = PBXGroup; children = ( - 64A900FA293E3DD4009B54DA /* teffect.h */, - 64A900E7293E3DD4009B54DA /* quantityfuncs.cpp */, - 64A900CA293E3DD4009B54DA /* jail.h */, - 64A900C3293E3DD4009B54DA /* gump.h */, - 64A90093293E3DD4009B54DA /* cMagic.h */, - 64A90085293E3DD4009B54DA /* cEffects.h */, - 64A90077293E3DD4009B54DA /* boats.cpp */, + 64A900FD293E3DD4009B54DA /* townregion.cpp */, + 64A900FE293E3DD4009B54DA /* townregion.h */, 64A90078293E3DD4009B54DA /* books.cpp */, 64A90079293E3DD4009B54DA /* books.h */, 64A9007A293E3DD4009B54DA /* cAccountClass.cpp */, 64A9007B293E3DD4009B54DA /* cAccountClass.h */, - 64A9007F293E3DD4009B54DA /* cChar.cpp */, - 64A90080293E3DD4009B54DA /* cChar.h */, + 64A90085293E3DD4009B54DA /* cEffects.h */, 64A90088293E3DD4009B54DA /* CGump.cpp */, + 64A900C3293E3DD4009B54DA /* CGump.h */, 64A9008A293E3DD4009B54DA /* cHTMLSystem.cpp */, 64A9008B293E3DD4009B54DA /* cHTMLSystem.h */, - 64A90095293E3DD4009B54DA /* cmdtable.cpp */, - 64A90096293E3DD4009B54DA /* cmdtable.h */, + 64A90093293E3DD4009B54DA /* cMagic.h */, 64A90099293E3DD4009B54DA /* combat.cpp */, 64A9009A293E3DD4009B54DA /* combat.h */, 64A9009B293E3DD4009B54DA /* commands.cpp */, 64A9009C293E3DD4009B54DA /* commands.h */, 64A900A3293E3DD4009B54DA /* cRaces.cpp */, 64A900A4293E3DD4009B54DA /* cRaces.h */, - 64A900A9293E3DD4009B54DA /* cServerData.cpp */, - 64A900AA293E3DD4009B54DA /* cServerData.h */, 64A900B6293E3DD4009B54DA /* cWeather.cpp */, 64A900B7293E3DD4009B54DA /* cWeather.hpp */, 64A900C4293E3DD4009B54DA /* gumps.cpp */, 64A900C5293E3DD4009B54DA /* house.cpp */, 64A900C8293E3DD4009B54DA /* items.cpp */, 64A900C9293E3DD4009B54DA /* jail.cpp */, + 64A900CA293E3DD4009B54DA /* jail.h */, 64A900CD293E3DD4009B54DA /* lineofsight.cpp */, 64A900CE293E3DD4009B54DA /* magic.cpp */, 64A900CF293E3DD4009B54DA /* magic.h */, - 64A900D2293E3DD4009B54DA /* mapstuff.cpp */, - 64A900D3293E3DD4009B54DA /* mapstuff.h */, 64A900D4293E3DD4009B54DA /* movement.cpp */, 64A900D5293E3DD4009B54DA /* movement.h */, 64A900D6293E3DD4009B54DA /* msgboard.cpp */, 64A900D7293E3DD4009B54DA /* msgboard.h */, 64A900E2293E3DD4009B54DA /* PartySystem.cpp */, 64A900E3293E3DD4009B54DA /* PartySystem.h */, + 64A900E7293E3DD4009B54DA /* quantityfuncs.cpp */, 64A900E9293E3DD4009B54DA /* regions.cpp */, 64A900EA293E3DD4009B54DA /* regions.h */, 64A900F0293E3DD4009B54DA /* skills.cpp */, @@ -435,6 +429,7 @@ 64A900F3293E3DD4009B54DA /* speech.cpp */, 64A900F4293E3DD4009B54DA /* speech.h */, 64A900F9293E3DD4009B54DA /* targeting.cpp */, + 64A900FA293E3DD4009B54DA /* teffect.h */, 64A900FF293E3DD4009B54DA /* trade.cpp */, 64A90113293E3DD4009B54DA /* vendor.cpp */, 64A90114293E3DD4009B54DA /* weight.cpp */, @@ -450,28 +445,35 @@ 64E2F792293FCE5900546A08 /* Other */ = { isa = PBXGroup; children = ( - 64A90100293E3DD4009B54DA /* typedefs.h */, - 64A900E5293E3DD4009B54DA /* power.h */, - 64A900D1293E3DD4009B54DA /* mapclasses.h */, - 64A900BC293E3DD4009B54DA /* enums.h */, - 64A900AD293E3DD4009B54DA /* cSkillClass.h */, - 64A90092293E3DD4009B54DA /* classes.h */, 64A90075293E3DD4009B54DA /* ai.cpp */, 64A90076293E3DD4009B54DA /* archive.cpp */, 64A9007C293E3DD4009B54DA /* calcfuncs.cpp */, 64A90083293E3DD4009B54DA /* cDice.cpp */, 64A90084293E3DD4009B54DA /* cdice.h */, + 64A90092293E3DD4009B54DA /* classes.h */, + 64A90095293E3DD4009B54DA /* cmdtable.cpp */, + 64A90096293E3DD4009B54DA /* cmdtable.h */, + 64A9009D293E3DD4009B54DA /* ConfigOS.h */, 64A900A2293E3DD4009B54DA /* cPlayerAction.cpp */, 64A900A5293E3DD4009B54DA /* CResponse.cpp */, 64A900A6293E3DD4009B54DA /* CResponse.h */, + 64A900AD293E3DD4009B54DA /* cSkillClass.h */, 64A900B4293E3DD4009B54DA /* cVersionClass.cpp */, 64A900B5293E3DD4009B54DA /* cVersionClass.h */, 64A900BA293E3DD4009B54DA /* dist.cpp */, 64A900BB293E3DD4009B54DA /* effect.cpp */, + 64A900BC293E3DD4009B54DA /* enums.h */, 64A900BF293E3DD4009B54DA /* fileio.cpp */, 64A900C0293E3DD4009B54DA /* findfuncs.cpp */, + 64A900C2293E3DD4009B54DA /* GenericList.h */, 64A900DC293E3DD4009B54DA /* npcs.cpp */, + 64A900DF293E3DD4009B54DA /* osunique.cpp */, + 64A900E0293E3DD4009B54DA /* osunique.hpp */, 64A900E4293E3DD4009B54DA /* pcmanage.cpp */, + 64A900E5293E3DD4009B54DA /* power.h */, + 64A900E6293E3DD4009B54DA /* Prerequisites.h */, + 64A90100293E3DD4009B54DA /* typedefs.h */, + 64A90111293E3DD4009B54DA /* UOXStdHeaders.h */, ); name = Other; sourceTree = ""; @@ -518,6 +520,8 @@ 64E2F795293FCE7500546A08 /* Script */ = { isa = PBXGroup; children = ( + 64A900A9293E3DD4009B54DA /* cServerData.cpp */, + 64A900AA293E3DD4009B54DA /* cServerData.h */, 64A900AB293E3DD4009B54DA /* cServerDefinitions.cpp */, 64A900AC293E3DD4009B54DA /* cServerDefinitions.h */, 64A900B8293E3DD4009B54DA /* Dictionary.cpp */, @@ -533,6 +537,9 @@ 64E2F796293FCE8400546A08 /* UOData */ = { isa = PBXGroup; children = ( + 64A900D1293E3DD4009B54DA /* mapclasses.h */, + 64A900D2293E3DD4009B54DA /* mapstuff.cpp */, + 64A900D3293E3DD4009B54DA /* mapstuff.h */, 64A900D8293E3DD4009B54DA /* MultiMul.cpp */, 64A900D9293E3DD4009B54DA /* MultiMul.hpp */, 64A90101293E3DD4009B54DA /* UOPData.cpp */, @@ -554,21 +561,6 @@ name = Utility; sourceTree = ""; }; - 64E2F798293FD53200546A08 /* Leftover */ = { - isa = PBXGroup; - children = ( - 64A9009D293E3DD4009B54DA /* ConfigOS.h */, - 64A900C2293E3DD4009B54DA /* GenericList.h */, - 64A900DF293E3DD4009B54DA /* osunique.cpp */, - 64A900E0293E3DD4009B54DA /* osunique.hpp */, - 64A900E6293E3DD4009B54DA /* Prerequisites.h */, - 64A900FD293E3DD4009B54DA /* townregion.cpp */, - 64A900FE293E3DD4009B54DA /* townregion.h */, - 64A90111293E3DD4009B54DA /* UOXStdHeaders.h */, - ); - name = Leftover; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -596,7 +588,7 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = 1; - LastUpgradeCheck = 1410; + LastUpgradeCheck = 1430; TargetAttributes = { 64A90069293E3DA3009B54DA = { CreatedOnToolsVersion = 14.1; @@ -675,7 +667,7 @@ 64A90123293E3DD4009B54DA /* cDice.cpp in Sources */, 64A9012E293E3DD4009B54DA /* CPacketReceive.cpp in Sources */, 64A9012A293E3DD4009B54DA /* cmdtable.cpp in Sources */, - 64A90120293E3DD4009B54DA /* cBaseobject.cpp in Sources */, + 64A90120293E3DD4009B54DA /* cBaseObject.cpp in Sources */, 64A90135293E3DD4009B54DA /* cServerDefinitions.cpp in Sources */, 64A90166293E3DD4009B54DA /* vendor.cpp in Sources */, 64A9015B293E3DD4009B54DA /* speech.cpp in Sources */, @@ -767,6 +759,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -825,6 +818,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -848,6 +842,7 @@ buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CODE_SIGN_STYLE = Automatic; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = CF264WE69M; ENABLE_HARDENED_RUNTIME = YES; GCC_CHAR_IS_UNSIGNED_CHAR = YES; @@ -867,6 +862,7 @@ buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CODE_SIGN_STYLE = Automatic; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = CF264WE69M; ENABLE_HARDENED_RUNTIME = YES; GCC_CHAR_IS_UNSIGNED_CHAR = YES; diff --git a/make/XCode/uox3.xcodeproj/xcshareddata/xcschemes/uox3.xcscheme b/make/XCode/uox3.xcodeproj/xcshareddata/xcschemes/uox3.xcscheme index 1330b5053..0e5f58993 100644 --- a/make/XCode/uox3.xcodeproj/xcshareddata/xcschemes/uox3.xcscheme +++ b/make/XCode/uox3.xcodeproj/xcshareddata/xcschemes/uox3.xcscheme @@ -1,6 +1,6 @@ :${PROJECT_SOURCE_DIR}/../../assets/uox3.rc> +# Script Group + ../../source/cServerData.cpp + ../../source/cServerData.h + ../../source/cServerDefinitions.cpp + ../../source/cServerDefinitions.h + ../../source/Dictionary.cpp + ../../source/Dictionary.h + ../../source/scriptc.cpp + ../../source/scriptc.h + ../../source/ssection.cpp + ../../source/ssection.h +# Base Object Group + ../../source/boats.cpp + ../../source/cBaseObject.cpp + ../../source/cBaseObject.h + ../../source/cChar.cpp + ../../source/cChar.h + ../../source/cConsole.cpp + ../../source/cConsole.h + ../../source/cGuild.cpp + ../../source/cGuild.h + ../../source/cItem.cpp + ../../source/cItem.h + ../../source/cMultiObj.cpp + ../../source/cMultiObj.h + ../../source/cSocket.cpp + ../../source/cSocket.h + ../../source/cSpawnRegion.cpp + ../../source/cSpawnRegion.h + ../../source/cThreadQueue.cpp + ../../source/cThreadQueue.h + ../../source/funcdecl.h + ../../source/ObjectFactory.cpp + ../../source/ObjectFactory.h + ../../source/PageVector.h + ../../source/uoxstruct.h +# Subsystem Group Group ../../source/books.cpp + ../../source/books.h ../../source/cAccountClass.cpp - ../../source/calcfuncs.cpp - ../../source/cBaseobject.cpp - ../../source/cChar.cpp - ../../source/cConsole.cpp - ../../source/cDice.cpp - ../../source/cGuild.cpp + ../../source/cAccountClass.h + ../../source/cEffects.h ../../source/CGump.cpp + ../../source/CGump.h ../../source/cHTMLSystem.cpp - ../../source/cItem.cpp - ../../source/CJSEngine.cpp - ../../source/CJSMapping.cpp - ../../source/cmdtable.cpp - ../../source/cMultiObj.cpp + ../../source/cHTMLSystem.h + ../../source/cMagic.h ../../source/combat.cpp + ../../source/combat.h ../../source/commands.cpp - ../../source/CPacketReceive.cpp - ../../source/CPacketSend.cpp - ../../source/cPlayerAction.cpp + ../../source/commands.h ../../source/cRaces.cpp - ../../source/CResponse.cpp - ../../source/cScript.cpp - ../../source/cServerData.cpp - ../../source/cServerDefinitions.cpp - ../../source/cSocket.cpp - ../../source/cSpawnRegion.cpp - ../../source/cThreadQueue.cpp - ../../source/cVersionClass.cpp + ../../source/cRaces.h ../../source/cWeather.cpp - ../../source/Dictionary.cpp - ../../source/dist.cpp - ../../source/effect.cpp - ../../source/EventTimer.cpp - ../../source/fileio.cpp - ../../source/findfuncs.cpp + ../../source/cWeather.hpp ../../source/gumps.cpp ../../source/house.cpp - ../../source/IP4Address.cpp ../../source/items.cpp ../../source/jail.cpp - ../../source/JSEncapsulate.cpp + ../../source/jail.h ../../source/lineofsight.cpp ../../source/magic.cpp - ../../source/mapstuff.cpp + ../../source/magic.h ../../source/movement.cpp + ../../source/movement.h ../../source/msgboard.cpp - ../../source/MultiMul.cpp - ../../source/network.cpp - ../../source/npcs.cpp - ../../source/ObjectFactory.cpp + ../../source/msgboard.h ../../source/PartySystem.cpp - ../../source/pcmanage.cpp + ../../source/PartySystem.h ../../source/quantityfuncs.cpp ../../source/queue.cpp ../../source/regions.cpp - ../../source/scriptc.cpp - ../../source/SEFunctions.cpp + ../../source/regions.h ../../source/skills.cpp + ../../source/skills.h ../../source/sound.cpp ../../source/speech.cpp - ../../source/ssection.cpp - ../../source/osunique.cpp - ../../source/StringUtility.cpp + ../../source/speech.h ../../source/targeting.cpp + ../../source/teffect.h ../../source/townregion.cpp + ../../source/townregion.h ../../source/trade.cpp - ../../source/UOPData.cpp - ../../source/uox3.cpp - ../../source/UOXJSMethods.cpp - ../../source/UOXJSPropertyFuncs.cpp ../../source/vendor.cpp ../../source/weight.cpp + ../../source/weight.h ../../source/wholist.cpp + ../../source/wholist.h ../../source/worldmain.cpp - ../../source/TimeUtility.cpp - ../../source/osunique.hpp - ../../source/books.h - ../../source/cAccountClass.h - ../../source/cBaseObject.h - ../../source/cChar.h - ../../source/cConsole.h + ../../source/worldmain.h +# Other group + ../../source/ai.cpp + ../../source/archive.cpp + ../../source/calcfuncs.cpp + ../../source/cDice.cpp ../../source/cdice.h - ../../source/cEffects.h - ../../source/cGuild.h - ../../source/cHTMLSystem.h - ../../source/cItem.h - ../../source/CJSEngine.h - ../../source/CJSMapping.h ../../source/classes.h - ../../source/cMagic.h + ../../source/cmdtable.cpp ../../source/cmdtable.h - ../../source/cMultiObj.h - ../../source/combat.h - ../../source/commands.h ../../source/ConfigOS.h - ../../source/CPacketReceive.h - ../../source/CPacketSend.h - ../../source/cRaces.h + ../../source/cPlayerAction.cpp + ../../source/CResponse.cpp ../../source/CResponse.h - ../../source/cScript.h - ../../source/cServerData.h - ../../source/cServerDefinitions.h ../../source/cSkillClass.h - ../../source/cSocket.h - ../../source/cSpawnRegion.h - ../../source/cThreadQueue.h + ../../source/cVersionClass.cpp ../../source/cVersionClass.h - ../../source/cWeather.hpp - ../../source/Dictionary.h + ../../source/dist.cpp + ../../source/effect.cpp ../../source/enums.h - ../../source/EventTimer.hpp - ../../source/funcdecl.h + ../../source/fileio.cpp + ../../source/findfuncs.cpp ../../source/GenericList.h - ../../source/gump.h - ../../source/IP4Address.hpp - ../../source/jail.h - ../../source/JSEncapsulate.h - ../../source/magic.h - ../../source/mapclasses.h - ../../source/mapstuff.h - ../../source/movement.h - ../../source/msgboard.h - ../../source/MultiMul.hpp - ../../source/network.h - ../../source/ObjectFactory.h - ../../source/PageVector.h - ../../source/PartySystem.h + ../../source/npcs.cpp + ../../source/osunique.cpp + ../../source/osunique.hpp + ../../source/pcmanage.cpp ../../source/power.h ../../source/Prerequisites.h - ../../source/regions.h - ../../source/scriptc.h - ../../source/SEFunctions.h - ../../source/skills.h - ../../source/speech.h - ../../source/ssection.h - ../../source/StringUtility.hpp - ../../source/teffect.h - ../../source/townregion.h ../../source/typedefs.h - ../../source/UOPData.hpp - ../../source/uox3.h + ../../source/UOXStdHeaders.h +# JS Engine group + ../../source/CJSEngine.cpp + ../../source/CJSEngine.h + ../../source/CJSMapping.cpp + ../../source/CJSMapping.h + ../../source/cScript.cpp + ../../source/cScript.h + ../../source/JSEncapsulate.cpp + ../../source/JSEncapsulate.h + ../../source/SEFunctions.cpp + ../../source/SEFunctions.h ../../source/UOXJSClasses.h + ../../source/UOXJSMethods.cpp ../../source/UOXJSMethods.h ../../source/UOXJSPropertyEnums.h + ../../source/UOXJSPropertyFuncs.cpp ../../source/UOXJSPropertyFuncs.h - ../..//source/UOXJSPropertySpecs.h - ../../source/UOXStdHeaders.h - ../../source/uoxstruct.h - ../../source/weight.h - ../../source/wholist.h - ../../source/worldmain.h + ../../source/UOXJSPropertySpecs.h +# Network group + ../../source/CPacketReceive.cpp + ../../source/CPacketReceive.h + ../../source/CPacketSend.cpp + ../../source/CPacketSend.h + ../../source/network.cpp + ../../source/network.h + ../../source/IP4Address.cpp + ../../source/IP4Address.hpp +# Utility group + ../../source/StringUtility.cpp + ../../source/StringUtility.hpp + ../../source/TimeUtility.cpp ../../source/TimeUtility.hpp - $<$:${PROJECT_SOURCE_DIR}/../../assets/uox3.rc> + ../../source/EventTimer.cpp + ../../source/EventTimer.hpp +# UOData group + ../../source/mapclasses.h + ../../source/mapstuff.cpp + ../../source/mapstuff.h + ../../source/MultiMul.cpp + ../../source/MultiMul.hpp + ../../source/UOPData.cpp + ../../source/UOPData.hpp ) # ************************************************************************* diff --git a/source/CGump.cpp b/source/CGump.cpp index b4865ea3d..65c323966 100644 --- a/source/CGump.cpp +++ b/source/CGump.cpp @@ -4,7 +4,7 @@ /***************************/ #include "uox3.h" -#include "gump.h" +#include "CGump.h" #include "CPacketSend.h" #include diff --git a/source/gump.h b/source/CGump.h similarity index 97% rename from source/gump.h rename to source/CGump.h index d35efde63..f3053df74 100644 --- a/source/gump.h +++ b/source/CGump.h @@ -1,5 +1,5 @@ -#ifndef __GUMP_H__ -#define __GUMP_H__ +#ifndef __CGUMP_H__ +#define __CGUMP_H__ void MultiGumpCallback( CSocket *mySocket, SERIAL GumpSerial, UI32 Button ); diff --git a/source/Changelog.txt b/source/Changelog.txt index 168f00563..13b15602c 100644 --- a/source/Changelog.txt +++ b/source/Changelog.txt @@ -1,3 +1,6 @@ +24/08/2023 - punt + Fixed a memory leak with regions.cpp, related to worldsaves + 07/07/2023 - Xuri Fixed an issue which could cause lamp posts to turn into tall candelabras when light levels change @@ -10038,7 +10041,7 @@ Changed: 2001-09-12 22:19 darkangelab * cItem.cpp, cItem.h, cmdtable.cpp, commands.cpp, effect.cpp, - funcdecl.h, gump.h, gumps.cpp, magic.cpp, magic.h, targeting.cpp, + funcdecl.h, CGump.h, gumps.cpp, magic.cpp, magic.h, targeting.cpp, uox3.cpp, uoxstruct.h: create.scp item creation now tracks which entry it was made from CItem now has some more const'd functions (weather related) @@ -10378,7 +10381,7 @@ Changed: 2001-08-20 13:09 toinzane * cGuild.cpp, cItem.cpp, cItem.h, cScript.cpp, cmdtable.cpp, - commands.cpp, funcdecl.h, gump.h, gumps.cpp, items.cpp, queue.cpp, + commands.cpp, funcdecl.h, CGump.h, gumps.cpp, items.cpp, queue.cpp, skills.cpp, targeting.cpp, townregion.cpp, wholist.cpp: Removed ItemHand() stuff entirely, (This will cause your worldfile to report invalid tags, this is normal, just save and reload the @@ -10635,7 +10638,7 @@ Changed: 2001-08-08 14:23 toinzane * ai.cpp, books.cpp, books.h, cClick.cpp, cGuild.cpp, cmdtable.cpp, - commands.cpp, commands.h, funcdecl.h, gump.h, gumps.cpp, html.cpp, + commands.cpp, commands.h, funcdecl.h, CGump.h, gumps.cpp, html.cpp, jail.cpp, necro.cpp, network.cpp, speech.cpp, targeting.cpp, uox3.cpp, vendor.cpp: Many more object conversions. @@ -12346,7 +12349,7 @@ Changed: cServerDefinitions.h, cSocket.cpp, cSocket.h, cThreadQueue.cpp, cThreadQueue.h, calcfuncs.cpp, cdice.h, classes.h, combat.h, commands.h, configure, configure.in, enums.h, fileio.cpp, - funcdecl.h, gump.h, handlers.h, hash.h, install-sh, magic.cpp, + funcdecl.h, CGump.h, handlers.h, hash.h, install-sh, magic.cpp, magic.h, mapclasses.h, mapstuff.cpp, mapstuff.h, missing, mkinstalldirs, movement.h, network.cpp, network.h, packets.h, regions.h, skills.h, speech.h, ssection.h, targeting.cpp, @@ -12604,7 +12607,7 @@ Changed: * Dictionary.cpp, Dictionary.h, cSkillClass.h, cSocket.cpp, cSocket.h, cThreadQueue.cpp, cThreadQueue.h, cWeather.cpp, cWeather.hpp, debug.cpp, debug.h, dist.cpp, effect.cpp, enums.h, - fileio.cpp, fileio.h, funcdecl.h, globals.cpp, gump.h, gumps.cpp, + fileio.cpp, fileio.h, funcdecl.h, globals.cpp, CGump.h, gumps.cpp, handlers.h, hash.cpp, hash.h, house.cpp, html.cpp, im.cpp, im.h, itemhandler.cpp, PageVector.h, items.cpp, magic.cpp, magic.h, mapclasses.h, mapstuff.cpp, mapstuff.h, movement.cpp, movement.h, diff --git a/source/SEFunctions.cpp b/source/SEFunctions.cpp index 5ac51e6d0..384d1632f 100644 --- a/source/SEFunctions.cpp +++ b/source/SEFunctions.cpp @@ -25,7 +25,7 @@ #include "cVersionClass.h" #include "Dictionary.h" #include "speech.h" -#include "gump.h" +#include "CGump.h" #include "ObjectFactory.h" #include "network.h" #include "UOXJSClasses.h" diff --git a/source/UOXJSMethods.cpp b/source/UOXJSMethods.cpp index 55483145c..a7dc81496 100644 --- a/source/UOXJSMethods.cpp +++ b/source/UOXJSMethods.cpp @@ -26,7 +26,7 @@ #include "cGuild.h" #include "skills.h" #include "speech.h" -#include "gump.h" +#include "CGump.h" #include "CJSMapping.h" #include "cScript.h" #include "cEffects.h" diff --git a/source/cBaseobject.cpp b/source/cBaseObject.cpp similarity index 100% rename from source/cBaseobject.cpp rename to source/cBaseObject.cpp diff --git a/source/cConsole.cpp b/source/cConsole.cpp index af04abb50..5374b14b7 100644 --- a/source/cConsole.cpp +++ b/source/cConsole.cpp @@ -497,7 +497,7 @@ auto CConsole::Error(const std::string& msg) -> void } catch( const std::exception &e ) { - std::cerr << "Error print reporting 'error'. Error was: " << msg << std::endl; + std::cerr << "Error print reporting 'error'. Error was: " << e.what() << std::endl; exit( 1 ); } } diff --git a/source/cHTMLSystem.cpp b/source/cHTMLSystem.cpp index 3963c14f9..730c682a8 100644 --- a/source/cHTMLSystem.cpp +++ b/source/cHTMLSystem.cpp @@ -8,7 +8,7 @@ #include "cRaces.h" #include "cServerDefinitions.h" #include "ssection.h" -#include "gump.h" +#include "CGump.h" #include "scriptc.h" #include "CPacketSend.h" #include "ObjectFactory.h" diff --git a/source/cPlayerAction.cpp b/source/cPlayerAction.cpp index b20f0f1c0..128d71fb7 100644 --- a/source/cPlayerAction.cpp +++ b/source/cPlayerAction.cpp @@ -14,7 +14,7 @@ #include "books.h" #include "magic.h" #include "townregion.h" -#include "gump.h" +#include "CGump.h" #include "cGuild.h" #include "ssection.h" #include "cServerDefinitions.h" diff --git a/source/cmdtable.cpp b/source/cmdtable.cpp index e4e789fcd..8943cde84 100644 --- a/source/cmdtable.cpp +++ b/source/cmdtable.cpp @@ -19,7 +19,7 @@ #include "PageVector.h" #include "speech.h" #include "cHTMLSystem.h" -#include "gump.h" +#include "CGump.h" #include "cEffects.h" #include "classes.h" #include "regions.h" diff --git a/source/gumps.cpp b/source/gumps.cpp index 539284441..52d58771b 100644 --- a/source/gumps.cpp +++ b/source/gumps.cpp @@ -1,5 +1,5 @@ #include "uox3.h" -#include "gump.h" +#include "CGump.h" #include "cGuild.h" #include "townregion.h" #include "cServerDefinitions.h" diff --git a/source/npcs.cpp b/source/npcs.cpp index 591ad5b9a..137421861 100644 --- a/source/npcs.cpp +++ b/source/npcs.cpp @@ -199,7 +199,7 @@ auto CCharStuff::ChooseNpcToCreate( const std::vector(i) ); continue; } } diff --git a/source/queue.cpp b/source/queue.cpp index 212719fd6..fbefc8d3e 100644 --- a/source/queue.cpp +++ b/source/queue.cpp @@ -7,7 +7,7 @@ #include "uox3.h" #include "PageVector.h" -#include "gump.h" +#include "CGump.h" PageVector *GMQueue; PageVector *CounselorQueue; diff --git a/source/regions.cpp b/source/regions.cpp index 89960322c..7d01d90ea 100644 --- a/source/regions.cpp +++ b/source/regions.cpp @@ -4,7 +4,7 @@ #include "StringUtility.hpp" #include "ObjectFactory.h" #include - +#include #define DEBUG_REGIONS 0 CMapHandler *MapRegion; @@ -778,6 +778,9 @@ auto CMapHandler::PopulateList( SI16 x, SI16 y, UI08 worldNumber ) -> std::vecto //o------------------------------------------------------------------------------------------------o //| Purpose - Saves out data from MapRegions to worldfiles //o------------------------------------------------------------------------------------------------o +constexpr size_t BUFFERSIZE = 1024 * 1024 ; +static auto streamBuffer = std::vector(BUFFERSIZE,0) ; + void CMapHandler::Save( void ) { const SI16 AreaX = UpperX / 8; // we're storing 8x8 grid arrays together @@ -791,9 +794,6 @@ void CMapHandler::Save( void ) onePercent += static_cast(( mapWidth / MapColSize ) * ( mapHeight / MapRowSize )); } onePercent /= 100.0f; - const size_t bufferSize = 1024 * 1024; - char* buffer = ( char* )malloc( bufferSize ); - const char blockDiscriminator[] = "\n\n---REGION---\n\n"; UI32 count = 0; const UI32 s_t = GetClock(); @@ -850,7 +850,7 @@ void CMapHandler::Save( void ) continue; } - writeDestination.rdbuf()->pubsetbuf( buffer, bufferSize ); + writeDestination.rdbuf()->pubsetbuf( streamBuffer.data(), BUFFERSIZE ); for( UI08 xCnt = 0; xCnt < 8; ++xCnt ) // walk through each part of the 8x8 grid, left->right { diff --git a/source/targeting.cpp b/source/targeting.cpp index 0faccefc7..fc1bd1cec 100644 --- a/source/targeting.cpp +++ b/source/targeting.cpp @@ -6,7 +6,7 @@ #include "commands.h" #include "cMagic.h" #include "ssection.h" -#include "gump.h" +#include "CGump.h" #include "CJSMapping.h" #include "cScript.h" #include "cEffects.h" diff --git a/source/townregion.cpp b/source/townregion.cpp index c60990edb..e2c5e6924 100644 --- a/source/townregion.cpp +++ b/source/townregion.cpp @@ -6,7 +6,7 @@ #include "skills.h" #include "speech.h" #include "ssection.h" -#include "gump.h" +#include "CGump.h" #include "mapstuff.h" #include "scriptc.h" #include "CPacketSend.h" diff --git a/source/uox3.cpp b/source/uox3.cpp index 72e8679f0..4eff3645a 100644 --- a/source/uox3.cpp +++ b/source/uox3.cpp @@ -60,7 +60,7 @@ #include "cVersionClass.h" #include "ssection.h" #include "cHTMLSystem.h" -#include "gump.h" +#include "CGump.h" #include "CJSMapping.h" #include "cScript.h" #include "cEffects.h" diff --git a/spidermonkey/make/XCode/jscript/jscript.xcodeproj/project.pbxproj b/spidermonkey/make/XCode/jscript/jscript.xcodeproj/project.pbxproj index 288bd9762..cc574c97c 100644 --- a/spidermonkey/make/XCode/jscript/jscript.xcodeproj/project.pbxproj +++ b/spidermonkey/make/XCode/jscript/jscript.xcodeproj/project.pbxproj @@ -1046,6 +1046,7 @@ 56BA2FAB2A95B9990064EB36 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_WARN_COMMA = NO; CODE_SIGN_STYLE = Automatic; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = CF264WE69M; @@ -1062,6 +1063,7 @@ 56BA2FAC2A95B9990064EB36 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_WARN_COMMA = NO; CODE_SIGN_STYLE = Automatic; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = CF264WE69M;