mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00:23 +02:00
- Optimized a few code bits
- Enemy ranks has now size 20 instead of 500 - Fix: losing your disguise makes you lose your disguise again git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5687 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
+7
-11
@@ -4040,7 +4040,7 @@ UINT8 LastActiveTeamMember( UINT8 ubTeam )
|
||||
|
||||
void CheckForPotentialAddToBattleIncrement( SOLDIERTYPE *pSoldier )
|
||||
{
|
||||
UINT16 iCounter2;
|
||||
UINT16 iCounter2;
|
||||
// Check if we are a threat!
|
||||
if ( !pSoldier->aiData.bNeutral && (pSoldier->bSide != gbPlayerNum ) )
|
||||
{
|
||||
@@ -4079,17 +4079,13 @@ UINT16 iCounter2;
|
||||
*/
|
||||
|
||||
//New Group by Jazz
|
||||
for( iCounter2 = REBEL_CIV_GROUP; iCounter2 < NUM_CIV_GROUPS; iCounter2++ )
|
||||
{
|
||||
if ( pSoldier->ubCivilianGroup == iCounter2 && zCivGroupName[iCounter2].AddToBattle == TRUE )
|
||||
{
|
||||
if ( FindObjClass( pSoldier, IC_WEAPON ) != NO_SLOT )
|
||||
{
|
||||
gTacticalStatus.bNumFoughtInBattle[ pSoldier->bTeam ]++;
|
||||
}
|
||||
}
|
||||
if ( FindObjClass( pSoldier, IC_WEAPON ) != NO_SLOT && pSoldier->ubCivilianGroup >= REBEL_CIV_GROUP && pSoldier->ubCivilianGroup < NUM_CIV_GROUPS )
|
||||
{
|
||||
if ( zCivGroupName[pSoldier->ubCivilianGroup].AddToBattle == TRUE )
|
||||
{
|
||||
gTacticalStatus.bNumFoughtInBattle[ pSoldier->bTeam ]++;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user