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

Fix: robot could get the 'covert' property when added to the team

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7628 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-11-01 17:01:00 +00:00
parent 62cb6f44fa
commit 30ae48c8d7
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Control.cpp
+2 -2
View File
@@ -15960,7 +15960,7 @@ BOOLEAN SOLDIERTYPE::RecognizeAsCombatant( UINT8 ubTargetID )
void SOLDIERTYPE::LooseDisguise( void ) void SOLDIERTYPE::LooseDisguise( void )
{ {
// loose any covert flags // loose any covert flags
this->usSoldierFlagMask &= ~(SOLDIER_COVERT_CIV | SOLDIER_COVERT_SOLDIER); this->usSoldierFlagMask &= ~(SOLDIER_COVERT_CIV | SOLDIER_COVERT_SOLDIER | SOLDIER_COVERT_NPC_SPECIAL);
// rehandle sight for everybody // rehandle sight for everybody
SOLDIERTYPE* pSoldier; SOLDIERTYPE* pSoldier;
@@ -17413,7 +17413,7 @@ void SOLDIERTYPE::SoldierPropertyUpkeep( )
{ {
this->usSoldierFlagMask &= ~SOLDIER_BATTLE_PARTICIPATION; this->usSoldierFlagMask &= ~SOLDIER_BATTLE_PARTICIPATION;
} }
} }
// check if Soldier can use the spell skillwise, with fAPCheck = TRUE also check current APs // check if Soldier can use the spell skillwise, with fAPCheck = TRUE also check current APs
BOOLEAN SOLDIERTYPE::CanUseSkill( INT8 iSkill, BOOLEAN fAPCheck ) BOOLEAN SOLDIERTYPE::CanUseSkill( INT8 iSkill, BOOLEAN fAPCheck )
Tactical/Soldier Profile.cpp
+5 -2
View File
@@ -2031,8 +2031,11 @@ BOOLEAN RecruitEPC( UINT8 ubCharNum )
// Set whatkind of merc am i // Set whatkind of merc am i
pNewSoldier->ubWhatKindOfMercAmI = MERC_TYPE__EPC; pNewSoldier->ubWhatKindOfMercAmI = MERC_TYPE__EPC;
// Flugente: people recruited in Arulco are known to the enemy as civilians or even soldiers. So they will be covert when recruited. Of course, this is not for the rebels... // Flugente: people recruited in Arulco are known to the enemy as civilians or even soldiers. So they will be covert when recruited. Of course, this is not for the rebels/vehicles/robots
pNewSoldier->usSoldierFlagMask |= (SOLDIER_COVERT_CIV|SOLDIER_COVERT_NPC_SPECIAL); if ( !(pNewSoldier->flags.uiStatusFlags & (SOLDIER_ROBOT | SOLDIER_VEHICLE) ) )
{
pNewSoldier->usSoldierFlagMask |= (SOLDIER_COVERT_CIV | SOLDIER_COVERT_NPC_SPECIAL);
}
UpdateTeamPanelAssignments( ); UpdateTeamPanelAssignments( );