From 02c53cdf16236b7f2cb243a566c40446374281b9 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sun, 2 Sep 2012 21:39:59 +0000
Subject: [PATCH] fixed a bug that caused crashes when using food system,
 external feeding or covert ops while TOPTION_SHOW_TACTICAL_FACE_ICONS was
 false

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5547 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Faces.cpp | 62 ++++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/Tactical/Faces.cpp b/Tactical/Faces.cpp
index a4cd5fe4d..f241fc4c8 100644
--- a/Tactical/Faces.cpp
+++ b/Tactical/Faces.cpp
@@ -2287,42 +2287,46 @@ void HandleRenderFaceAdjustments( FACETYPE *pFace, BOOLEAN fDisplayBuffer, BOOLE
 		bNumRightIcons++;
 	}
 
-	// Flugente: food system - symbols used if hungry or thirsty
-	if ( gGameOptions.fFoodSystem )
+	// Flugente: only display these symbols if using the new portrait icons
+	if ( gGameSettings.fOptions[ TOPTION_SHOW_TACTICAL_FACE_ICONS ] == TRUE )
 	{
-		if ( MercPtrs[ pFace->ubSoldierID ]->bDrinkLevel < FoodMoraleMods[FOOD_MERC_START_SHOW_HUNGER_SYMBOL].bThreshold )
+		// Flugente: food system - symbols used if hungry or thirsty
+		if ( gGameOptions.fFoodSystem )
 		{
-			DoRightIcon( uiRenderBuffer, pFace, sFaceX, sFaceY, bNumRightIcons, 19 );
-			bNumRightIcons++;	
-		}
+			if ( MercPtrs[ pFace->ubSoldierID ]->bDrinkLevel < FoodMoraleMods[FOOD_MERC_START_SHOW_HUNGER_SYMBOL].bThreshold )
+			{
+				DoRightIcon( uiRenderBuffer, pFace, sFaceX, sFaceY, bNumRightIcons, 19 );
+				bNumRightIcons++;	
+			}
 		
-		if ( MercPtrs[ pFace->ubSoldierID ]->bFoodLevel < FoodMoraleMods[FOOD_MERC_START_SHOW_HUNGER_SYMBOL].bThreshold )
-		{
-			DoRightIcon( uiRenderBuffer, pFace, sFaceX, sFaceY, bNumRightIcons, 20 );
-			bNumRightIcons++;
+			if ( MercPtrs[ pFace->ubSoldierID ]->bFoodLevel < FoodMoraleMods[FOOD_MERC_START_SHOW_HUNGER_SYMBOL].bThreshold )
+			{
+				DoRightIcon( uiRenderBuffer, pFace, sFaceX, sFaceY, bNumRightIcons, 20 );
+				bNumRightIcons++;
+			}
 		}
-	}
-	// Flugente: are we supplying ammo to someone else?
-	if ( gGameExternalOptions.ubExternalFeeding > 0 )
-	{
-		UINT8 ubID1 = 0;
-		UINT16 ubGunSlot1 = 0;
-		UINT16 ubFaceSlot1 = 0;
-		UINT8 ubID2 = 0;
-		UINT16 ubGunSlot2 = 0;
-		UINT16 ubFaceSlot2 = 0;
-		if ( MercPtrs[ pFace->ubSoldierID ]->IsFeedingExternal( &ubID1, &ubGunSlot1, &ubFaceSlot1, &ubID2, &ubGunSlot2, &ubFaceSlot2 ) )
+		// Flugente: are we supplying ammo to someone else?
+		if ( gGameExternalOptions.ubExternalFeeding > 0 )
 		{
-			DoRightIcon( uiRenderBuffer, pFace, sFaceX, sFaceY, bNumRightIcons, 21 );
-			bNumRightIcons++;
+			UINT8 ubID1 = 0;
+			UINT16 ubGunSlot1 = 0;
+			UINT16 ubFaceSlot1 = 0;
+			UINT8 ubID2 = 0;
+			UINT16 ubGunSlot2 = 0;
+			UINT16 ubFaceSlot2 = 0;
+			if ( MercPtrs[ pFace->ubSoldierID ]->IsFeedingExternal( &ubID1, &ubGunSlot1, &ubFaceSlot1, &ubID2, &ubGunSlot2, &ubFaceSlot2 ) )
+			{
+				DoRightIcon( uiRenderBuffer, pFace, sFaceX, sFaceY, bNumRightIcons, 21 );
+				bNumRightIcons++;
+			}
 		}
-	}
 
-	// Flugente: add an icon if we are currently in disguise
-	if ( MercPtrs[ pFace->ubSoldierID ]->bSoldierFlagMask & (SOLDIER_COVERT_CIV|SOLDIER_COVERT_SOLDIER) )
-	{
-		DoRightIcon( uiRenderBuffer, pFace, sFaceX, sFaceY, bNumRightIcons, 22 );
-		bNumRightIcons++;
+		// Flugente: add an icon if we are currently in disguise
+		if ( MercPtrs[ pFace->ubSoldierID ]->bSoldierFlagMask & (SOLDIER_COVERT_CIV|SOLDIER_COVERT_SOLDIER) )
+		{
+			DoRightIcon( uiRenderBuffer, pFace, sFaceX, sFaceY, bNumRightIcons, 22 );
+			bNumRightIcons++;
+		}
 	}
 
 		switch( pSoldier->bAssignment )