diff --git a/GameVersion.cpp b/GameVersion.cpp index 79e213cb..ecaf76dd 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -13,12 +13,12 @@ #ifdef JA2EDITOR //MAP EDITOR BUILD VERSION -CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.2032" }; +CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.2037" }; #elif defined JA2BETAVERSION //BETA/TEST BUILD VERSION -CHAR16 zVersionLabel[256] = { L"Debug v1.13.2032" }; +CHAR16 zVersionLabel[256] = { L"Debug v1.13.2037" }; #elif defined CRIPPLED_VERSION @@ -28,11 +28,11 @@ CHAR16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - CHAR16 zVersionLabel[256] = { L"Release v1.13.2032" }; + CHAR16 zVersionLabel[256] = { L"Release v1.13.2037" }; #endif -CHAR8 czVersionNumber[16] = { "Build 08.04.15" }; //YY.MM.DD +CHAR8 czVersionNumber[16] = { "Build 08.04.16" }; //YY.MM.DD CHAR16 zTrackingNumber[16] = { L"Z" }; diff --git a/Tactical/Soldier Profile.cpp b/Tactical/Soldier Profile.cpp index 067287fa..3eb954d1 100644 --- a/Tactical/Soldier Profile.cpp +++ b/Tactical/Soldier Profile.cpp @@ -997,7 +997,7 @@ SOLDIERTYPE *ChangeSoldierTeam( SOLDIERTYPE *pSoldier, UINT8 ubTeam ) //CHRISL: Rather then resorting the profile, which recreates all the items, what if we simply try and sort the // objects that are already attached to the RPC we're hiring? - if(UsingNewInventorySystem() == true) + //if(UsingNewInventorySystem() == true) { // Start by direct copy of all BODYPOS items (armor, hands, head and LBE) for(cnt = 0; cnt < (UINT32)BODYPOSFINAL; cnt++) diff --git a/ja2_2005Express.vcproj b/ja2_2005Express.vcproj index 6bd05ecd..eacacb19 100644 --- a/ja2_2005Express.vcproj +++ b/ja2_2005Express.vcproj @@ -66,7 +66,7 @@