From 61fac0c0f8f2bbd5de0c43e417272a876b851b3d Mon Sep 17 00:00:00 2001
From: ChrisL <ChrisL@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Tue, 7 Jun 2011 16:30:51 +0000
Subject: [PATCH] BUGFIX 501 - portraits weren't being re-initialized when
 changing the TOPTION_SHOW_TACTICAL_FACE_ICONS parameter.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4484 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Options Screen.cpp     | Bin 126162 -> 126932 bytes
 Tactical/Interface.cpp |  93 ++++++++++++++++++++++-------------------
 Tactical/Interface.h   |   2 +-
 3 files changed, 52 insertions(+), 43 deletions(-)

diff --git a/Options Screen.cpp b/Options Screen.cpp
index 086d9b5c453f212c580cd99758aa9caba5070de4..9504e3bf9fb627f25dcd0cf58060478a844a51ca 100644
GIT binary patch
delta 366
zcmca~ll{tl_6<q~ll}BH<U<$|8Il=F7&3umB0~;?8<?NU;0fgCGvsZasvmfBx&sHJ
zj4WQ2(>Jm)dQOjNXXH{1VQ^${W(WbA;0$E>FvJ7R1c|r;Ss*cg20w=2?YB7?14Sl3
zh+y+{X7FGL0?Gsf)mkwq0NJTP*W>{)$W<UWWinI&#S|C{fG#QmiWUJyL9z-A>0ovN
zLk5taJe^U7QI&u*?@KXygPo~Klrw==#7;hVL)6$4i-XVuBmmWU+XZDA51t1Ar*%()

delta 38
wcmV+>0NMZ4-v`p!2e2YAlRB6RvN5{Yw{{8vMii64kP4UJ(E%2>P9On>&sCTZtN;K2

diff --git a/Tactical/Interface.cpp b/Tactical/Interface.cpp
index c3d0ba376..7553636bc 100644
--- a/Tactical/Interface.cpp
+++ b/Tactical/Interface.cpp
@@ -274,6 +274,55 @@ UINT32 CalcUIMessageDuration( STR16 wString );
 
 
 
+BOOLEAN InitializeTacticalPortraits(	)
+{
+	VOBJECT_DESC	VObjectDesc;
+
+	//CHRISL: Moved from InitializeTacticalInterface so we can reinitialize portait graphics as we need to
+	//legion 2 jazz
+	if (gGameSettings.fOptions[ TOPTION_SHOW_TACTICAL_FACE_ICONS ] == TRUE) 
+	{
+		//additional face icons (legion 2)
+		if (gGameExternalOptions.bTacticalFaceIconStyle == 0) 
+		{	
+			FilenameForBPP("INTERFACE\\portraiticons_a.sti", VObjectDesc.ImageFile);
+
+			if( !AddVideoObject( &VObjectDesc, &guiPORTRAITICONS ) )
+				AssertMsg(0, "Missing INTERFACE\\portraiticons_a.sti" );
+		}	
+		else if (gGameExternalOptions.bTacticalFaceIconStyle == 1) 
+		{	
+			FilenameForBPP("INTERFACE\\portraiticons_b.sti", VObjectDesc.ImageFile);
+
+			if( !AddVideoObject( &VObjectDesc, &guiPORTRAITICONS ) )
+				AssertMsg(0, "Missing INTERFACE\\portraiticons_b.sti" );
+		}	
+		else if (gGameExternalOptions.bTacticalFaceIconStyle == 2) 
+		{
+			FilenameForBPP("INTERFACE\\portraiticons_c.sti", VObjectDesc.ImageFile);
+
+			if( !AddVideoObject( &VObjectDesc, &guiPORTRAITICONS ) )
+				AssertMsg(0, "Missing INTERFACE\\portraiticons_c.sti" );
+		}
+		else if (gGameExternalOptions.bTacticalFaceIconStyle == 3) 
+		{
+			FilenameForBPP("INTERFACE\\portraiticons_d.sti", VObjectDesc.ImageFile);
+
+			if( !AddVideoObject( &VObjectDesc, &guiPORTRAITICONS ) )
+				AssertMsg(0, "Missing INTERFACE\\portraiticons_d.sti" );
+		}		
+	}
+	else 
+	{
+		// JA2 classic face icons
+		FilenameForBPP("INTERFACE\\portraiticons.sti", VObjectDesc.ImageFile);
+
+		if( !AddVideoObject( &VObjectDesc, &guiPORTRAITICONS ) )
+			AssertMsg(0, "Missing INTERFACE\\portraiticons.sti" );
+	}
+
+	return ( TRUE );
+}
 
 BOOLEAN InitializeTacticalInterface(	)
 {
@@ -421,48 +470,8 @@ BOOLEAN InitializeTacticalInterface(	)
 
 	VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
 	
-	//legion 2 jazz
-	if (gGameSettings.fOptions[ TOPTION_SHOW_TACTICAL_FACE_ICONS ] == TRUE) 
-	{
-		//additional face icons (legion 2)
-		if (gGameExternalOptions.bTacticalFaceIconStyle == 0) 
-		{	
-			FilenameForBPP("INTERFACE\\portraiticons_a.sti", VObjectDesc.ImageFile);
-
-			if( !AddVideoObject( &VObjectDesc, &guiPORTRAITICONS ) )
-				AssertMsg(0, "Missing INTERFACE\\portraiticons_a.sti" );
-		}	
-		else if (gGameExternalOptions.bTacticalFaceIconStyle == 1) 
-		{	
-			FilenameForBPP("INTERFACE\\portraiticons_b.sti", VObjectDesc.ImageFile);
-
-			if( !AddVideoObject( &VObjectDesc, &guiPORTRAITICONS ) )
-				AssertMsg(0, "Missing INTERFACE\\portraiticons_b.sti" );
-		}	
-		else if (gGameExternalOptions.bTacticalFaceIconStyle == 2) 
-		{
-			FilenameForBPP("INTERFACE\\portraiticons_c.sti", VObjectDesc.ImageFile);
-
-			if( !AddVideoObject( &VObjectDesc, &guiPORTRAITICONS ) )
-				AssertMsg(0, "Missing INTERFACE\\portraiticons_c.sti" );
-		}
-		else if (gGameExternalOptions.bTacticalFaceIconStyle == 3) 
-		{
-			FilenameForBPP("INTERFACE\\portraiticons_d.sti", VObjectDesc.ImageFile);
-
-			if( !AddVideoObject( &VObjectDesc, &guiPORTRAITICONS ) )
-				AssertMsg(0, "Missing INTERFACE\\portraiticons_d.sti" );
-		}		
-	}
-	else 
-	{
-		// JA2 classic face icons
-		FilenameForBPP("INTERFACE\\portraiticons.sti", VObjectDesc.ImageFile);
-
-		if( !AddVideoObject( &VObjectDesc, &guiPORTRAITICONS ) )
-			AssertMsg(0, "Missing INTERFACE\\portraiticons.sti" );
-	}
-			
+	//CHRISL: Moved to seperate function so we can call seperately
+	InitializeTacticalPortraits();
 						
 	//legion
 	if (gGameSettings.fOptions[ TOPTION_SHOW_TACTICAL_FACE_GEAR ] == TRUE) 
diff --git a/Tactical/Interface.h b/Tactical/Interface.h
index cb91abcbe..620d0c01c 100644
--- a/Tactical/Interface.h
+++ b/Tactical/Interface.h
@@ -204,7 +204,7 @@ typedef enum
 
 } InterfacePanelDefines;
 
-
+BOOLEAN InitializeTacticalPortraits( );
 BOOLEAN InitializeTacticalInterface( );
 BOOLEAN ShutdownTacticalInterface( );
 extern BOOLEAN	fInterfacePanelDirty;