From f084927d07e6c468a3554255a31e481b0e1dfa02 Mon Sep 17 00:00:00 2001
From: MaddMugsy <MaddMugsy@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Fri, 23 Jun 2006 21:09:51 +0000
Subject: [PATCH] -made sure rocket launcher / tank warning doesn't come up for
 militia -made a better fix for snipers not firing

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@292 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/opplist.cpp        | 2 +-
 TacticalAI/AIMain.cpp       | 4 ----
 TacticalAI/DecideAction.cpp | 4 +++-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Tactical/opplist.cpp b/Tactical/opplist.cpp
index d678a19b..c63ece69 100644
--- a/Tactical/opplist.cpp
+++ b/Tactical/opplist.cpp
@@ -805,7 +805,7 @@ void HandleSight(SOLDIERTYPE *pSoldier, UINT8 ubSightFlags)
 
 	if ( pSoldier->bNewSituation && !(pSoldier->uiStatusFlags & SOLDIER_PC) )
 	{
-		HaultSoldierFromSighting( pSoldier, (pSoldier->bAction != AI_ACTION_FIRE_GUN) );
+		HaultSoldierFromSighting( pSoldier, TRUE );
 	}
 	pSoldier->bNewSituation = __max( pSoldier->bNewSituation, bTempNewSituation );
 		
diff --git a/TacticalAI/AIMain.cpp b/TacticalAI/AIMain.cpp
index 90c3c0c3..04f92c5b 100644
--- a/TacticalAI/AIMain.cpp
+++ b/TacticalAI/AIMain.cpp
@@ -1094,10 +1094,6 @@ void FreeUpNPCFromTurning(SOLDIERTYPE *pSoldier, INT8 bLook)
 		//HandleSight(pSoldier,SIGHT_LOOK | SIGHT_RADIO); // no interrupt possible
     }
 
-   if (pSoldier->bOrders == SNIPER )
-    {
-		HandleSight(pSoldier,SIGHT_LOOK | SIGHT_RADIO); 
-    }
   }
 }
 
diff --git a/TacticalAI/DecideAction.cpp b/TacticalAI/DecideAction.cpp
index fed356f5..b0da397b 100644
--- a/TacticalAI/DecideAction.cpp
+++ b/TacticalAI/DecideAction.cpp
@@ -4845,6 +4845,8 @@ INT8 DecideAction(SOLDIERTYPE *pSoldier)
  UINT32		uiStartTime, uiEndTime;
 #endif
 
+	if ( pSoldier->bTeam != MILITIA_TEAM )
+	{
 	if ( !sniperwarning && pSoldier->bOrders == SNIPER )
 	{
 		ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Watch out for snipers..." );
@@ -4857,7 +4859,7 @@ INT8 DecideAction(SOLDIERTYPE *pSoldier)
 		//TODO: don't say this again after reloading a savegame
 		SayQuoteFromAnyBodyInSector( QUOTE_WEARY_SLASH_SUSPUCIOUS );
 	}
-
+	}
  // turn off cautious flag
 	pSoldier->fAIFlags &= (~AI_CAUTIOUS);
 	//reset flank count