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

Fixed UI movement mode not switching to crawl on character collapse, leading to deadlocks (#231)

Browse Source
This commit is contained in:
Andrzej Fałkowski
2023-10-02 19:32:15 +03:00
committed by GitHub
parent a3be3ecd7e
commit 14ec138fc7
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Points.cpp
+1 -1
View File
@@ -3214,7 +3214,7 @@ BOOLEAN CheckForMercContMove( SOLDIERTYPE *pSoldier )
return( FALSE ); return( FALSE );
} }
if( pSoldier->stats.bLife >= OKLIFE ) if( pSoldier->stats.bLife >= OKLIFE && !(pSoldier->bCollapsed && pSoldier->bBreath < OKBREATH) )
{ {
if( pSoldier->sGridNo != pSoldier->pathing.sFinalDestination || pSoldier->bGoodContPath ) if( pSoldier->sGridNo != pSoldier->pathing.sFinalDestination || pSoldier->bGoodContPath )
{ {
Tactical/Soldier Control.cpp
+2
View File
@@ -21855,6 +21855,8 @@ void SoldierCollapse( SOLDIERTYPE *pSoldier )
pSoldier->bCollapsed = TRUE; pSoldier->bCollapsed = TRUE;
pSoldier->usUIMovementMode = CRAWLING;
pSoldier->ReceivingSoldierCancelServices( ); pSoldier->ReceivingSoldierCancelServices( );
// CC has requested - handle sight here... // CC has requested - handle sight here...