diff --git a/GameVersion.cpp b/GameVersion.cpp index 68245e5c..c5dd6215 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.2227" }; +CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.2292" }; #elif defined JA2BETAVERSION //BETA/TEST BUILD VERSION -CHAR16 zVersionLabel[256] = { L"Debug v1.13.2227" }; +CHAR16 zVersionLabel[256] = { L"Debug v1.13.2292" }; #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.2240" }; + CHAR16 zVersionLabel[256] = { L"Release v1.13.2292" }; #endif -CHAR8 czVersionNumber[16] = { "Build 08.07.14" }; //YY.MM.DD +CHAR8 czVersionNumber[16] = { "Build 08.08.05" }; //YY.MM.DD CHAR16 zTrackingNumber[16] = { L"Z" }; diff --git a/Laptop/IMP MainPage.cpp b/Laptop/IMP MainPage.cpp index 50967210..e9b03d7d 100644 --- a/Laptop/IMP MainPage.cpp +++ b/Laptop/IMP MainPage.cpp @@ -1031,7 +1031,12 @@ INT32 CountEmptyIMPSlots( INT8 iSex ) INT32 GetSexOfIMP(INT32 iIMPId) { INT32 ui; - for (ui = 0; ui < CountIMPSlots(); ++ui) + //CHRISL: There is "padding" build into the iaIMPSLots array. The index after the last male and female entry are both set + // to -1. The following loop, however, does not take this into consideration. A female IMP using iIMPId 56 will never + // get setup correctly, resulting in the "Assert(FALSE)" the occurs after the loop. Since the array is initially setup + // by adding 2 to the male/female totals, do the same here. + //for (ui = 0; ui < CountIMPSlots(); ++ui) + for (ui = 0; ui < CountIMPSlots()+2; ++ui) { if (gGameExternalOptions.iaIMPSlots[ui] == iIMPId) { diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index 3ae45821..c056de47 100644 --- a/Tactical/Interface Items.cpp +++ b/Tactical/Interface Items.cpp @@ -521,10 +521,10 @@ INV_ATTACHXY gItemDescAttachmentsXY[] = INV_ATTACHXY gMapItemDescAttachmentsXY[] = { - 173, 10, SM_INV_SLOT_HEIGHT, 26, INV_BAR_DX + 2, INV_BAR_DY, - 211, 10, SM_INV_SLOT_HEIGHT, 26, INV_BAR_DX + 2, INV_BAR_DY, - 173, 36, SM_INV_SLOT_HEIGHT, 26, INV_BAR_DX + 2, INV_BAR_DY, - 211, 36, SM_INV_SLOT_HEIGHT, 26, INV_BAR_DX + 2, INV_BAR_DY + 171, 10, SM_INV_SLOT_HEIGHT, 26, INV_BAR_DX + 2, INV_BAR_DY, + 209, 10, SM_INV_SLOT_HEIGHT, 26, INV_BAR_DX + 2, INV_BAR_DY, + 171, 36, SM_INV_SLOT_HEIGHT, 26, INV_BAR_DX + 2, INV_BAR_DY, + 209, 36, SM_INV_SLOT_HEIGHT, 26, INV_BAR_DX + 2, INV_BAR_DY }; SGPRect gItemDescProsConsRects[] = diff --git a/ja2_2005Express.vcproj b/ja2_2005Express.vcproj index cddd49f7..f70a09ca 100644 --- a/ja2_2005Express.vcproj +++ b/ja2_2005Express.vcproj @@ -66,7 +66,7 @@