From 7f6d44183ae2b56be8daa1c6a7402a8c2c5537a3 Mon Sep 17 00:00:00 2001 From: silversurfer Date: Fri, 27 May 2016 07:55:44 +0000 Subject: [PATCH] Fix (by Sevenfm): breath points for walking with a weapon raised were calculated incorrectly git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8240 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameVersion.cpp | 16 ++++++++-------- Tactical/Points.cpp | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/GameVersion.cpp b/GameVersion.cpp index 13f17a0a6..62338eb2e 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.8239 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.8240 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8239 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8240 (Development Build)" }; #endif // ------------------------------ @@ -27,11 +27,11 @@ //DEBUG BUILD VERSION #ifdef JA2UB - CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.8239 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.8240 (Development Build)" }; #elif defined (JA113DEMO) - CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8239 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8240 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8239 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8240 (Development Build)" }; #endif #elif defined CRIPPLED_VERSION @@ -46,11 +46,11 @@ //RELEASE BUILD VERSION #ifdef JA2UB - CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.8239 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.8240 (Development Build)" }; #elif defined (JA113DEMO) - CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8239 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8240 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Release v1.13.8239 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release v1.13.8240 (Development Build)" }; #endif #endif diff --git a/Tactical/Points.cpp b/Tactical/Points.cpp index 4f13ac4a0..5dd265e73 100644 --- a/Tactical/Points.cpp +++ b/Tactical/Points.cpp @@ -294,7 +294,7 @@ INT16 TerrainBreathPoints(SOLDIERTYPE * pSoldier, INT32 sGridNo, INT8 bDir, UINT return(0); } - if ( ubMovementCost == WALKING_WEAPON_RDY || ubMovementCost == WALKING_DUAL_RDY ) + if ( usMovementMode == WALKING_WEAPON_RDY || usMovementMode == WALKING_DUAL_RDY ) { iPoints += APBPConstants[BP_MOVEMENT_READY]; }