From 1a2c89eea13b093048a904e77da9a4d253d8f15a Mon Sep 17 00:00:00 2001 From: Wanne Date: Mon, 1 Aug 2011 21:57:47 +0000 Subject: [PATCH] - Improved Bugfix: BUGZILLA #556: Fixed CTD if enemy bleeds to death at the end of a players turn git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4598 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Soldier Ani.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Tactical/Soldier Ani.cpp b/Tactical/Soldier Ani.cpp index 8cbe8d476..7fd31af9a 100644 --- a/Tactical/Soldier Ani.cpp +++ b/Tactical/Soldier Ani.cpp @@ -3348,13 +3348,11 @@ BOOLEAN HandleSoldierDeath( SOLDIERTYPE *pSoldier , BOOLEAN *pfMadeCorpse ) ////////////////////////////////////////////////////////////// - // WANNE: This should fix crash that could occur if enemy bleeds to death - if ( pSoldier->ubAttackerID < 254 ) { // IF this guy has an attacker and he's a good guy, play sound if ( ubAttacker != NOBODY ) { - if ( MercPtrs[ pSoldier->ubAttackerID ]->bTeam == gbPlayerNum && gTacticalStatus.ubAttackBusyCount > 0 ) + if ( MercPtrs[ pSoldier->ubAttackerID ] != NULL && MercPtrs[ pSoldier->ubAttackerID ]->bTeam == gbPlayerNum && gTacticalStatus.ubAttackBusyCount > 0 ) { gTacticalStatus.fKilledEnemyOnAttack = TRUE; gTacticalStatus.ubEnemyKilledOnAttack = pSoldier->ubID;