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

- Fix: when disguised mercs with suspicious gear were spotted, messages were print out, but no uncovering occured

Browse Source 
- Disguised mercs no longer 'stop' when they see a new enemy, as otherwise movement becomes tedious.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6274 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-08-06 20:43:44 +00:00
parent 44b9bf41d8
commit ea478960dd
2 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Control.cpp
+5 -5
View File
@@ -14708,8 +14708,8 @@ BOOLEAN SOLDIERTYPE::LooksLikeACivilian( void )
break; break;
default: default:
{ {
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szCovertTextStr[STR_COVERT_ITEM_SUSPICIOUS], this->GetName(), Item[this->inv[bLoop].usItem].szItemName ); //ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szCovertTextStr[STR_COVERT_ITEM_SUSPICIOUS], this->GetName(), Item[this->inv[bLoop].usItem].szItemName );
return FALSE; //return FALSE;
} }
break; break;
} }
@@ -14859,7 +14859,7 @@ BOOLEAN SOLDIERTYPE::EquipmentTooGood( BOOLEAN fCloselook )
if ( bLoop == HANDPOS || bLoop == SECONDHANDPOS ) if ( bLoop == HANDPOS || bLoop == SECONDHANDPOS )
; ;
// other covert items are simply ignored // other covert items are simply ignored
if ( HasItemFlag(this->inv[bLoop].usItem, COVERT) ) else if ( HasItemFlag(this->inv[bLoop].usItem, COVERT) )
continue; continue;
// further checks it item is not covert. This means that an item that has that tag will not be detected if it is inside a pocket! // further checks it item is not covert. This means that an item that has that tag will not be detected if it is inside a pocket!
else if ( (bLoop == GUNSLINGPOCKPOS || bLoop == HELMETPOS || bLoop == VESTPOS || bLoop == LEGPOS || bLoop == HEAD1POS || bLoop == HEAD2POS || bLoop == KNIFEPOCKPOS) ) else if ( (bLoop == GUNSLINGPOCKPOS || bLoop == HELMETPOS || bLoop == VESTPOS || bLoop == LEGPOS || bLoop == HEAD1POS || bLoop == HEAD2POS || bLoop == KNIFEPOCKPOS) )
@@ -14887,8 +14887,8 @@ BOOLEAN SOLDIERTYPE::EquipmentTooGood( BOOLEAN fCloselook )
break; break;
default: default:
{ {
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szCovertTextStr[STR_COVERT_ITEM_SUSPICIOUS], this->GetName(), Item[this->inv[bLoop].usItem].szItemName ); //ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szCovertTextStr[STR_COVERT_ITEM_SUSPICIOUS], this->GetName(), Item[this->inv[bLoop].usItem].szItemName );
return FALSE; //return FALSE;
} }
break; break;
} }
Tactical/opplist.cpp
+27 -23
View File
@@ -3580,31 +3580,35 @@ void OurTeamSeesSomeone( SOLDIERTYPE * pSoldier, INT8 bNumReRevealed, INT8 bNumN
// How will this feel? // How will this feel?
if ( pSoldier->bTeam == gbPlayerNum ) if ( pSoldier->bTeam == gbPlayerNum )
{ {
// STOP IF WE WERE MOVING.... // Flugente: disguised mercs do not alert us if they see an enemy, as otherwise one has to continously give them new orders
/// Speek up! if ( !(pSoldier->bSoldierFlagMask & (SOLDIER_COVERT_CIV|SOLDIER_COVERT_SOLDIER)) )
if ( bNumReRevealed > 0 && bNumNewEnemies == 0 )
{ {
pSoldier->DoMercBattleSound( BATTLE_SOUND_CURSE1 ); // STOP IF WE WERE MOVING....
/// Speek up!
if ( bNumReRevealed > 0 && bNumNewEnemies == 0 )
{
pSoldier->DoMercBattleSound( BATTLE_SOUND_CURSE1 );
}
else
{
SaySeenQuote( pSoldier, gfPlayerTeamSawCreatures, FALSE, gfPlayerTeamSawJoey );
}
pSoldier->HaultSoldierFromSighting( TRUE );
if ( gTacticalStatus.fEnemySightingOnTheirTurn )
{
// Locate to our guy, then slide to enemy
LocateSoldier( pSoldier->ubID, SETLOCATOR );
// Now slide to other guy....
SlideTo( NOWHERE, gTacticalStatus.ubEnemySightingOnTheirTurnEnemyID, NOBODY ,SETLOCATOR);
}
// Unset User's turn UI
UnSetUIBusy( pSoldier->ubID );
} }
else
{
SaySeenQuote( pSoldier, gfPlayerTeamSawCreatures, FALSE, gfPlayerTeamSawJoey );
}
pSoldier->HaultSoldierFromSighting( TRUE );
if ( gTacticalStatus.fEnemySightingOnTheirTurn )
{
// Locate to our guy, then slide to enemy
LocateSoldier( pSoldier->ubID, SETLOCATOR );
// Now slide to other guy....
SlideTo( NOWHERE, gTacticalStatus.ubEnemySightingOnTheirTurnEnemyID, NOBODY ,SETLOCATOR);
}
// Unset User's turn UI
UnSetUIBusy( pSoldier->ubID );
} }
} }