From c54e61ce75a91c03ab52d87d7bef9438230c8532 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Thu, 7 May 2009 19:10:04 +0000
Subject: [PATCH] Bugfix: Morale and ice-cream truck (by Headrock)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2823 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Morale.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Tactical/Morale.cpp b/Tactical/Morale.cpp
index 68d3ab1f..36f08e5c 100644
--- a/Tactical/Morale.cpp
+++ b/Tactical/Morale.cpp
@@ -827,7 +827,17 @@ void HourlyMoraleUpdate( void )
 							continue;
 						}
 					}
-					bOpinion = pProfile->bMercOpinion[ pOtherSoldier->ubProfile ];
+
+					// WANNE: Fix by Headrock: Morale and the ice-cream truck.
+					if (pOtherSoldier->ubProfile < 75)
+                    {
+                        bOpinion = pProfile->bMercOpinion[ pOtherSoldier->ubProfile ];
+                    }
+                    else
+                    {
+                        bOpinion = 0;
+                    }
+
 					if (bOpinion == HATED_OPINION)
 					{