1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: a bomb object could be cloned if unsucessfully apllied to someone else

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7842 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2015-05-02 17:19:46 +00:00
parent bf077971bc
commit 96d0b1d312
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Control.cpp
+7 -7
View File
@@ -1985,11 +1985,11 @@ INT16 SOLDIERTYPE::CalcActionPoints( void )
// HEADROCK HAM 3.6: This was the wrong place to put AP_MIN_LIMIT. The value here should be AP_MINIMUM, which is // HEADROCK HAM 3.6: This was the wrong place to put AP_MIN_LIMIT. The value here should be AP_MINIMUM, which is
// the minimum amount of APs a character can GAIN each turn on top of what he had last turn. AP_MIN_LIMIT has been // the minimum amount of APs a character can GAIN each turn on top of what he had last turn. AP_MIN_LIMIT has been
// moved to CalcNewActionPoints() where it belongs. // moved to CalcNewActionPoints() where it belongs.
if ( ubPoints < APBPConstants[AP_MINIMUM] ) if (ubPoints < APBPConstants[AP_MINIMUM])
ubPoints = APBPConstants[AP_MINIMUM]; ubPoints = APBPConstants[AP_MINIMUM];
// make sure action points doesn't exceed the permitted maximum // make sure action points doesn't exceed the permitted maximum
ubMaxAPs = gubMaxActionPoints[this->ubBodyType]; ubMaxAPs = gubMaxActionPoints[ this->ubBodyType ];
//if (GameOption[INCREASEDAP] % 2 == 1) //if (GameOption[INCREASEDAP] % 2 == 1)
// maxAPs += APBPConstants[AP_INCREASE]; // maxAPs += APBPConstants[AP_INCREASE];
@@ -20078,18 +20078,18 @@ void SOLDIERTYPE::EVENT_SoldierApplyItemToPerson( INT32 sGridNo, UINT8 ubDirecti
// Dirty // Dirty
fInterfacePanelDirty = DIRTYLEVEL2; fInterfacePanelDirty = DIRTYLEVEL2;
} }
else if ( Item[usItem].usItemClass == IC_BOMB ) else if ( Item[ usItem ].usItemClass == IC_BOMB )
{ {
success = AutoPlaceObjectAnywhere( pSoldier, pObj, FALSE ); success = AutoPlaceObject( pSoldier, pObj, FALSE );
} }
this->DoMercBattleSound( BATTLE_SOUND_COOL1 );
} }
DeductPoints( this, GetAPsToApplyItem( this, sGridNo ), APBPConstants[BP_APPLYITEM], AFTERACTION_INTERRUPT ); DeductPoints( this, GetAPsToApplyItem( this, sGridNo ), APBPConstants[BP_APPLYITEM], AFTERACTION_INTERRUPT );
if ( !success ) if ( !success )
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, New113Message[MSG113_COULD_NOT_APPLY], this->GetName( ), Item[usItem].szLongItemName, pSoldier->GetName( ) ); ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, New113Message[ MSG113_COULD_NOT_APPLY ], this->GetName(), Item[usItem].szLongItemName, pSoldier->GetName() );
else
this->DoMercBattleSound( BATTLE_SOUND_COOL1 );
} }
else else
{ {