From 6e1676c94f5bccabae9ce2d3e74c526ec70860df Mon Sep 17 00:00:00 2001 From: silversurfer Date: Mon, 6 Jun 2016 14:45:23 +0000 Subject: [PATCH] Fix (by Sevenfm): height difference penalty calculation for cowering targets in OCTH was using wrong target git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8249 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameVersion.cpp | 18 +++++++++--------- Tactical/Weapons.cpp | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/GameVersion.cpp b/GameVersion.cpp index 97fb90ce..d2da9557 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -15,9 +15,9 @@ #ifdef JA2EDITOR #ifdef JA2UB - CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.8248 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.8249 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8248 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8249 (Development Build)" }; #endif // ------------------------------ @@ -27,11 +27,11 @@ //DEBUG BUILD VERSION #ifdef JA2UB - CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.8248 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.8249 (Development Build)" }; #elif defined (JA113DEMO) - CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8248 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8249 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8248 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8249 (Development Build)" }; #endif #elif defined CRIPPLED_VERSION @@ -46,16 +46,16 @@ //RELEASE BUILD VERSION #ifdef JA2UB - CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.8248 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.8249 (Development Build)" }; #elif defined (JA113DEMO) - CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8248 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8249 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Release v1.13.8248 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release v1.13.8249 (Development Build)" }; #endif #endif -CHAR8 czVersionNumber[16] = { "Build 16.06.05" }; //YY.MM.DD +CHAR8 czVersionNumber[16] = { "Build 16.06.06" }; //YY.MM.DD CHAR16 zTrackingNumber[16] = { L"Z" }; // SAVE_GAME_VERSION is defined in header, change it there diff --git a/Tactical/Weapons.cpp b/Tactical/Weapons.cpp index f7d27340..c61e9fe3 100644 --- a/Tactical/Weapons.cpp +++ b/Tactical/Weapons.cpp @@ -7768,9 +7768,9 @@ UINT32 CalcChanceToHitGun(SOLDIERTYPE *pSoldier, INT32 sGridNo, INT16 ubAimTime, if (pSoldier->pathing.bLevel == pTarget->pathing.bLevel && pSoldier->pathing.bLevel > 0) sCoweringPenalty = 0; // No cowering penalties when both are on the roof! - else if (pSoldier->pathing.bLevel < pSoldier->pathing.bLevel && gAnimControl[ pTarget->usAnimState ].ubHeight == ANIM_PRONE) + else if (pSoldier->pathing.bLevel < pTarget->pathing.bLevel && gAnimControl[ pTarget->usAnimState ].ubHeight == ANIM_PRONE) sCoweringPenalty *= 2; // Much harder to shoot at anyone cowering above you. - else if (pSoldier->pathing.bLevel > pSoldier->pathing.bLevel) + else if (pSoldier->pathing.bLevel > pTarget->pathing.bLevel) sCoweringPenalty /= 2; // Much easier to shoot at cowerers below you. iChance -= sCoweringPenalty; }