fixed collapsed soldiers sometimes not being able to get up when they should have until next player round

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9200 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Shadooow
2021-10-28 09:36:58 +00:00
parent d238927dd0
commit f0f558f872
2 changed files with 11 additions and 0 deletions
+7
View File
@@ -7199,6 +7199,13 @@ BOOLEAN SOLDIERTYPE::EVENT_InternalGetNewSoldierPath( INT32 sDestGridNo, UINT16
BOOLEAN fAdvancePath = TRUE;
UINT8 fFlags = 0;
//shadooow: if collapsed and enough breath, get up first and wait for new input
if (this->bCollapsed && this->bBreath >= OKBREATH)
{
this->BeginSoldierGetup();
if(!this->bCollapsed) return FALSE;
}
// Ifd this code, make true if a player
if ( fFromUI == 3 )
{
+4
View File
@@ -6306,6 +6306,10 @@ void HandleStanceChangeFromUIKeys( UINT8 ubAnimHeight )
if (gAnimControl[pSoldier->usAnimState].ubEndHeight != ubAnimHeight)
pSoldier->usPendingAnimation = usNewState;
}
else if (pSoldier->bCollapsed && pSoldier->bBreath >= OKBREATH)
{
pSoldier->BeginSoldierGetup();
}
else
{
UIHandleSoldierStanceChange(pSoldier->ubID, ubAnimHeight);