mirror of
https://github.com/1dot13/source.git
synced 2026-07-29 13:52:17 +02:00
Cleaned up attachment removal code
Fixed rare issue with squads and movement groups not being defined at game start. Fixed wrong type declarations in header files git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8407 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -1754,14 +1754,18 @@ void PlotATemporaryPathForCharacter( SOLDIERTYPE *pCharacter, INT16 sX, INT16 sY
|
||||
return;
|
||||
}
|
||||
|
||||
// Bob: make sure we have a valid movement group
|
||||
UINT8 soldierGroupId = GetSoldierGroupId(pCharacter);
|
||||
if (soldierGroupId == 0) {
|
||||
soldierGroupId = tryToRecoverSquadsAndMovementGroups(pCharacter);
|
||||
}
|
||||
|
||||
// build path
|
||||
pTempCharacterPath = BuildAStrategicPath( pTempCharacterPath, GetLastSectorIdInCharactersPath( pCharacter ) , ( INT16 )( sX + sY*( MAP_WORLD_X ) ), GetSoldierGroupId( pCharacter ), FALSE /*, TRUE */ );
|
||||
pTempCharacterPath = BuildAStrategicPath( pTempCharacterPath, GetLastSectorIdInCharactersPath( pCharacter ) , ( INT16 )( sX + sY*( MAP_WORLD_X ) ), soldierGroupId, FALSE /*, TRUE */ );
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
// clear out character path list, after and including this sector
|
||||
UINT32 ClearPathAfterThisSectorForCharacter( SOLDIERTYPE *pCharacter, INT16 sX, INT16 sY )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user