This commit is contained in:
Overhaul
2007-06-29 10:40:05 +00:00
parent dc441a425d
commit e6024e5151
46 changed files with 4912 additions and 46 deletions
+2 -1
View File
@@ -1506,7 +1506,7 @@ BOOLEAN ExecuteOverhead( )
if ( pSoldier->usPathDataSize != MAX_PATH_LIST_SIZE )
{
#ifdef JA2BETAVERSION
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_TESTVERSION, L"Path for %s ( %d ) did not make merc get to dest .", pSoldier->name, pSoldier->ubID );
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_TESTVERSION, L"Path for %s ( %d ) did not make merc get to dest (%d spaces away).", pSoldier->name, pSoldier->ubID, PythSpacesAway( pSoldier->sFinalDestination, pSoldier->sGridNo) );
#endif
}
@@ -1534,6 +1534,7 @@ BOOLEAN ExecuteOverhead( )
if ( gTacticalStatus.uiFlags & TURNBASED && gTacticalStatus.uiFlags & INCOMBAT)
{
ActionDone( pSoldier);
SoldierGotoStationaryStance( pSoldier );
continue;
}
else