1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes NPCs going back to cower animation after collapsing which also caused them not to die properly (by Shadooow).

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9006 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2021-05-06 18:38:31 +00:00
parent a38b3b414f
commit 422c72b957
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Ani.cpp
+20 -12
View File
@@ -4895,22 +4895,30 @@ BOOLEAN OKFallDirection( SOLDIERTYPE *pSoldier, INT32 sGridNo, INT8 bLevel, UINT
BOOLEAN HandleCheckForDeathCommonCode( SOLDIERTYPE *pSoldier )
{
// Do we have a primary pending animation?
if ( pSoldier->usPendingAnimation2 != NO_PENDING_ANIMATION )
//shadooow: fix for going back to cower animation after collapsing
if (pSoldier->CheckForBreathCollapse() || pSoldier->bCollapsed)
{
pSoldier->ChangeSoldierState( pSoldier->usPendingAnimation2, 0, FALSE );
pSoldier->usPendingAnimation2 = NO_PENDING_ANIMATION;
return( TRUE );
}
// CHECK IF WE HAVE A PENDING ANIMATION HERE
if ( pSoldier->usPendingAnimation != NO_PENDING_ANIMATION )
{
pSoldier->ChangeSoldierState( pSoldier->usPendingAnimation, 0, FALSE );
pSoldier->usPendingAnimation = NO_PENDING_ANIMATION;
return( TRUE );
pSoldier->usPendingAnimation2 = NO_PENDING_ANIMATION;
}
else
{
// Do we have a primary pending animation?
if (pSoldier->usPendingAnimation2 != NO_PENDING_ANIMATION)
{
pSoldier->ChangeSoldierState(pSoldier->usPendingAnimation2, 0, FALSE);
pSoldier->usPendingAnimation2 = NO_PENDING_ANIMATION;
return(TRUE);
}
// CHECK IF WE HAVE A PENDING ANIMATION HERE
if (pSoldier->usPendingAnimation != NO_PENDING_ANIMATION)
{
pSoldier->ChangeSoldierState(pSoldier->usPendingAnimation, 0, FALSE);
pSoldier->usPendingAnimation = NO_PENDING_ANIMATION;
return(TRUE);
}
}
// OTHERWISE, GOTO APPROPRIATE STOPANIMATION!
pSoldier->bCollapsed = TRUE;