From 36eb30827043de82fc6c7e934dc89337880d50b7 Mon Sep 17 00:00:00 2001 From: ChrisL Date: Thu, 9 Apr 2009 20:43:52 +0000 Subject: [PATCH] Made an APBPConstant a little clearer. Before it was labeled as part of the suppression system when in reality it's not. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2701 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameSettings.cpp | 2 +- Init.h | 2 +- Tactical/Overhead.cpp | 4 ++-- Tactical/Soldier Control.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index 6c96886c..e16c7b72 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -1066,7 +1066,7 @@ void LoadGameAPBPConstants() APBPConstants[AP_UNJAM] = DynamicAdjustAPConstants(iniReader.ReadInteger("APConstants","AP_UNJAM",2),2); APBPConstants[AP_MAX_SUPPRESSED] = DynamicAdjustAPConstants(iniReader.ReadInteger("APConstants","AP_MAX_SUPPRESSED",64),64); APBPConstants[AP_MAX_TURN_SUPPRESSED] = DynamicAdjustAPConstants(iniReader.ReadInteger("APConstants","AP_MAX_TURN_SUPPRESSED",200),200); - APBPConstants[AP_MIN_SUPPRESSION_LIMIT] = DynamicAdjustAPConstants(iniReader.ReadInteger("APConstants","AP_MIN_SUPPRESSION_LIMIT",-100),-100); + APBPConstants[AP_MIN_LIMIT] = DynamicAdjustAPConstants(iniReader.ReadInteger("APConstants","AP_MIN_LIMIT",-100),-100); APBPConstants[AP_LOST_PER_MORALE_DROP] = DynamicAdjustAPConstants(iniReader.ReadInteger("APConstants","AP_LOST_PER_MORALE_DROP",12),12); APBPConstants[AP_SUPPRESSION_MOD] = DynamicAdjustAPConstants(iniReader.ReadInteger("APConstants","AP_SUPPRESSION_MOD",24),24); APBPConstants[DEFAULT_APS] = DynamicAdjustAPConstants(iniReader.ReadInteger("APConstants","DEFAULT_APS",80),80); diff --git a/Init.h b/Init.h index b330e39f..cc643525 100644 --- a/Init.h +++ b/Init.h @@ -91,7 +91,7 @@ AP_UNJAM, AP_WRONG_MAG, AP_MAX_SUPPRESSED, AP_MAX_TURN_SUPPRESSED, -AP_MIN_SUPPRESSION_LIMIT, +AP_MIN_LIMIT, AP_LOST_PER_MORALE_DROP, AP_SUPPRESSION_MOD, AUTOFIRE_SHOTS_AP_VALUE, diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp index cb7a43cd..df343e48 100644 --- a/Tactical/Overhead.cpp +++ b/Tactical/Overhead.cpp @@ -7456,9 +7456,9 @@ void HandleSuppressionFire( UINT8 ubTargetedMerc, UINT8 ubCausedAttacker ) DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("HandleSuppressionFire: reduce action points")); // Reduce action points! // HEADROCK HAM Beta 2.2: Enforce a minimum limit via INI. - if (pSoldier->bActionPoints - ubPointsLost < APBPConstants[AP_MIN_SUPPRESSION_LIMIT] ) + if (pSoldier->bActionPoints - ubPointsLost < APBPConstants[AP_MIN_LIMIT] ) { - pSoldier->bActionPoints = APBPConstants[AP_MIN_SUPPRESSION_LIMIT]; + pSoldier->bActionPoints = APBPConstants[AP_MIN_LIMIT]; } else { diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index febf78b3..a6dc5639 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -1850,8 +1850,8 @@ INT16 SOLDIERTYPE::CalcActionPoints( void ) // If resulting APs are below our permitted minimum, raise them to it! // HEADROCK: Enforce new minimums due to suppression. I should've done this neater though. - if (ubPoints < APBPConstants[AP_MIN_SUPPRESSION_LIMIT]) - ubPoints = APBPConstants[AP_MIN_SUPPRESSION_LIMIT]; + if (ubPoints < APBPConstants[AP_MIN_LIMIT]) + ubPoints = APBPConstants[AP_MIN_LIMIT]; // make sure action points doesn't exceed the permitted maximum ubMaxAPs = gubMaxActionPoints[ this->ubBodyType ];