mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
FixFix: non-merc planted explosives that fire fragments caused crashes. A few functions had to be fixed.
Note: keep in mind that we cannot assume that BULLET's pFirer will be valid. Check wether ubFirerID is NOBODY first. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6776 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -15949,7 +15949,7 @@ void SOLDIERTYPE::StartMultiTurnAction(UINT8 usActionType)
|
||||
void SOLDIERTYPE::CancelMultiTurnAction(BOOLEAN fFinished)
|
||||
{
|
||||
// stop action
|
||||
if ( !fFinished )
|
||||
if ( !fFinished && this->usMultiTurnAction )
|
||||
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szMTATextStr[STR_MTA_CANCEL], this->GetName(), szMTATextStr[this->usMultiTurnAction] );
|
||||
|
||||
bOverTurnAPS = 0;
|
||||
|
||||
Reference in New Issue
Block a user