From f421eb452950bdf51a1cfd7decd202f2ee5ee38e Mon Sep 17 00:00:00 2001 From: Flugente Date: Mon, 16 Mar 2015 20:29:27 +0000 Subject: [PATCH] Fix: If the Hicks spot a spy at night, they don't enter combat as often. The Hicks will still enter combat, as this is hardcoded - the fix merely causes them to do this only once instead of every turn.. Their behaviour of becoming hostile at night is hardcoded, inconsistent with other code behaviour, but should stay in. This poses no threat to a properly disguised spy and is merely a small annoyance. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7785 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/opplist.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tactical/opplist.cpp b/Tactical/opplist.cpp index 458f8f53..ae9f3cc2 100644 --- a/Tactical/opplist.cpp +++ b/Tactical/opplist.cpp @@ -2417,7 +2417,7 @@ void ManSeesMan(SOLDIERTYPE *pSoldier, SOLDIERTYPE *pOpponent, INT32 sOppGridNo, } } } - else if ( pSoldier->ubCivilianGroup == HICKS_CIV_GROUP && CheckFact( FACT_HICKS_MARRIED_PLAYER_MERC, 0 ) == FALSE ) + else if ( pSoldier->ubCivilianGroup == HICKS_CIV_GROUP && CheckFact( FACT_HICKS_MARRIED_PLAYER_MERC, 0 ) == FALSE && pSoldier->RecognizeAsCombatant( pOpponent->ubID ) ) { UINT32 uiTime; INT16 sX, sY;