1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: Mercs would act independently after taking part in a boxing match (broken in rev 7178). I reactivated the old fix with an additional check for boxing state so loading a savegame during a boxing match will not break the boxing match.

Browse Source 
Bugfix: When a squad had the scouting trait,  CAN_DETECT_ENEMY_PRESENSE_IN_SECTORS_AROUND = TRUE and CAN_DETERMINE_ENEMY_NUMBERS_IN_SECTORS_AROUND = FALSE the map always showed enemy teams next to the player squad because of the false positives feature. I disabled this feature completely until a believable mechanism is implemented for a chance based false positive reporting.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7273 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2014-06-16 10:20:18 +00:00
parent 2a799a5870
commit 0e15435069
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaveLoadGame.cpp
+11 -8
View File
@@ -6298,18 +6298,21 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
//now change the savegame format so that temp files are saved and loaded correctly
guiCurrentSaveGameVersion = SAVE_GAME_VERSION;
// Flugente: should not be needed anymore
// silversurfer: added additional check to only remove the flags when there is no boxing activity going on at the moment.
// WANNE: This should fix the bug if any merc are still under PC control. This could happen after boxing in SAN MONA.
/*SOLDIERTYPE *pTeamSoldier;
for (INT8 bLoop=gTacticalStatus.Team[gbPlayerNum].bFirstID; bLoop <= gTacticalStatus.Team[gbPlayerNum].bLastID; bLoop++)
if ( gTacticalStatus.bBoxingState == NOT_BOXING )
{
pTeamSoldier=MercPtrs[bLoop];
SOLDIERTYPE *pTeamSoldier;
for (INT8 bLoop=gTacticalStatus.Team[gbPlayerNum].bFirstID; bLoop <= gTacticalStatus.Team[gbPlayerNum].bLastID; bLoop++)
{
pTeamSoldier=MercPtrs[bLoop];
if (pTeamSoldier->flags.uiStatusFlags & SOLDIER_PCUNDERAICONTROL)
pTeamSoldier->flags.uiStatusFlags &= (~SOLDIER_PCUNDERAICONTROL);
if (pTeamSoldier->flags.uiStatusFlags & SOLDIER_PCUNDERAICONTROL)
pTeamSoldier->flags.uiStatusFlags &= (~SOLDIER_PCUNDERAICONTROL);
pTeamSoldier->DeleteBoxingFlag();
}*/
pTeamSoldier->DeleteBoxingFlag();
}
}
return( TRUE );
}