From 2d7443213b3b47f5d09909793873417917549783 Mon Sep 17 00:00:00 2001 From: Flugente Date: Thu, 30 May 2013 00:12:10 +0000 Subject: [PATCH] Fix: last shot of magazine-fed launcher was removed too early git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6104 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Points.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tactical/Points.cpp b/Tactical/Points.cpp index 733d90b76..0a583f8b6 100644 --- a/Tactical/Points.cpp +++ b/Tactical/Points.cpp @@ -2674,7 +2674,7 @@ void DeductAmmo( SOLDIERTYPE *pSoldier, INT8 bInvPos ) (*pAttachment)[0]->data.objectStatus -= (INT8) ceil((double)( 100 / GetExpMagSize(pAttachment) )) ; DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("DeductAmmo: deducting for milkor: resulting status: %d, remove? = %d",(*pAttachment)[0]->data.objectStatus,((*pAttachment)[0]->data.objectStatus <= (INT8) ( 100 / GetExpMagSize(pAttachment) )))); - if ( (*pAttachment)[0]->data.objectStatus <= (INT8) ceil((double)( 100 / GetExpMagSize(pAttachment) ) )) + if ( (*pAttachment)[0]->data.objectStatus < (INT8) ceil((double)( 100 / GetExpMagSize(pAttachment) ) )) { pObj->RemoveAttachment( pAttachment); } @@ -2684,7 +2684,7 @@ void DeductAmmo( SOLDIERTYPE *pSoldier, INT8 bInvPos ) (*pAttachment)[0]->data.objectStatus -= (INT8) ceil((double)( 100 / GetExpMagSize(pAttachment) )) ; DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("DeductAmmo: deducting for OICW GL: resulting status: %d, remove? = %d",(*pAttachment)[0]->data.objectStatus,((*pAttachment)[0]->data.objectStatus <= (INT8) ( 100 / GetExpMagSize(pAttachment) )))); - if ( (*pAttachment)[0]->data.objectStatus <= (INT8) ceil((double)( 100 / GetExpMagSize(pAttachment) ) )) + if ( (*pAttachment)[0]->data.objectStatus < (INT8) ceil((double)( 100 / GetExpMagSize(pAttachment) ) )) { pObj->RemoveAttachment( pAttachment); }