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

Fix: attempting to leave a sector in tactical via vehicle leads crashes the game

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7817 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2015-04-19 09:19:47 +00:00
parent 8ca4f49d61
commit fa0236d45b
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Squads.cpp
+13 -18
View File
@@ -683,15 +683,14 @@ INT8 NumberOfPeopleInSquad( INT8 bSquadValue )
INT8 bCounter = 0;
INT8 bSquadCount = 0;
if( bSquadValue == NO_CURRENT_SQUAD )
if( bSquadValue >= NO_CURRENT_SQUAD )
{
return( 0 );
}
// find number of characters in particular squad.
for( bCounter = 0; bCounter < NUMBER_OF_SOLDIERS_PER_SQUAD ; bCounter++ )
for( bCounter = 0; bCounter < NUMBER_OF_SOLDIERS_PER_SQUAD; ++bCounter )
{
// valid slot?
if( Squad[ bSquadValue ][ bCounter ] != NULL )
{
@@ -709,20 +708,19 @@ INT8 NumberOfNonEPCsInSquad( INT8 bSquadValue )
INT8 bCounter = 0;
INT8 bSquadCount = 0;
if( bSquadValue == NO_CURRENT_SQUAD )
if( bSquadValue >= NO_CURRENT_SQUAD )
{
return( 0 );
}
// find number of characters in particular squad.
for( bCounter = 0; bCounter < NUMBER_OF_SOLDIERS_PER_SQUAD ; bCounter++ )
for( bCounter = 0; bCounter < NUMBER_OF_SOLDIERS_PER_SQUAD; ++bCounter )
{
// valid slot?
if( Squad[ bSquadValue ][ bCounter ] != NULL && !AM_AN_EPC( Squad[ bSquadValue ][ bCounter ] ) )
{
// yep
bSquadCount++;
++bSquadCount;
}
}
@@ -734,13 +732,13 @@ BOOLEAN IsRobotControllerInSquad( INT8 bSquadValue )
{
INT8 bCounter = 0;
if( bSquadValue == NO_CURRENT_SQUAD )
if( bSquadValue >= NO_CURRENT_SQUAD )
{
return( 0 );
}
// find number of characters in particular squad.
for( bCounter = 0; bCounter < NUMBER_OF_SOLDIERS_PER_SQUAD ; bCounter++ )
for( bCounter = 0; bCounter < NUMBER_OF_SOLDIERS_PER_SQUAD ; ++bCounter )
{
// valid slot?
if ( ( Squad[ bSquadValue ][ bCounter ] != NULL ) && Squad[ bSquadValue ][ bCounter ]->ControllingRobot( ) )
@@ -761,7 +759,7 @@ BOOLEAN SectorSquadIsIn(INT8 bSquadValue, INT16 *sMapX, INT16 *sMapY, INT16 *sMa
Assert( bSquadValue < ON_DUTY );
for( bCounter = 0; bCounter < NUMBER_OF_SOLDIERS_PER_SQUAD ; bCounter++ )
for( bCounter = 0; bCounter < NUMBER_OF_SOLDIERS_PER_SQUAD ; ++bCounter )
{
// if valid soldier, get current sector and return
if( Squad[ bSquadValue ][ bCounter ] != NULL )
@@ -772,7 +770,6 @@ BOOLEAN SectorSquadIsIn(INT8 bSquadValue, INT16 *sMapX, INT16 *sMapY, INT16 *sMa
return ( TRUE );
}
}
// return there is no squad
@@ -785,9 +782,7 @@ BOOLEAN CopyPathOfSquadToCharacter( SOLDIERTYPE *pCharacter, INT8 bSquadValue )
// copy path from squad to character
INT8 bCounter = 0;
for( bCounter = 0; bCounter < NUMBER_OF_SOLDIERS_PER_SQUAD ; bCounter++ )
for( bCounter = 0; bCounter < NUMBER_OF_SOLDIERS_PER_SQUAD; ++bCounter )
{
if( ( Squad[ bSquadValue ][ bCounter ] != pCharacter ) &&( Squad[ bSquadValue ][ bCounter ] != NULL ) )
{
@@ -1529,7 +1524,7 @@ BOOLEAN SoldierIsDeadAndWasOnSquad( SOLDIERTYPE *pSoldier, INT8 bSquadValue )
{
INT32 iCounter = 0;
if( bSquadValue == NO_CURRENT_SQUAD )
if( bSquadValue >= NO_CURRENT_SQUAD )
{
return( FALSE );
}
@@ -1599,7 +1594,7 @@ INT8 NumberOfPlayerControllableMercsInSquad( INT8 bSquadValue )
INT8 bCounter = 0;
INT8 bSquadCount = 0;
if( bSquadValue == NO_CURRENT_SQUAD )
if( bSquadValue >= NO_CURRENT_SQUAD )
{
return( 0 );
}
@@ -1618,7 +1613,7 @@ INT8 NumberOfPlayerControllableMercsInSquad( INT8 bSquadValue )
//if ( !AM_AN_EPC( pSoldier ) && !AM_A_ROBOT( pSoldier ) &&
if( !( pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE ) )
{
bSquadCount++;
++bSquadCount;
}
}
}
@@ -1633,7 +1628,7 @@ BOOLEAN DoesVehicleExistInSquad( INT8 bSquadValue )
SOLDIERTYPE *pSoldier;
INT8 bCounter = 0;
if( bSquadValue == NO_CURRENT_SQUAD )
if( bSquadValue >= NO_CURRENT_SQUAD )
{
return( FALSE );
}