From 9ed906a5532251d4a90331c2b411696c69870bdc Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Mon, 28 Jan 2013 14:15:20 +0000
Subject: [PATCH] Fixed (by Buggler) - Fixed wrong image size in
 Personnel/Departure screen by correcting sti directory pointer - Fixed
 shopkeeper & repair interface IMP portrait bug due to wrong image size in
 33Face & 65Face for IMP

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5821 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Laptop/personnel.cpp | 41 ++++++++---------------------------------
 1 file changed, 8 insertions(+), 33 deletions(-)

diff --git a/Laptop/personnel.cpp b/Laptop/personnel.cpp
index 5446c007..d5609ce3 100644
--- a/Laptop/personnel.cpp
+++ b/Laptop/personnel.cpp
@@ -4802,40 +4802,15 @@ void DisplayPortraitOfPastMerc( INT32 iId , INT32 iCounter, BOOLEAN fDead, BOOLE
 	VOBJECT_DESC	VObjectDesc;
 	
 	
-		if ( ( iId >= 0 ) && ( iId < 100 ) && ( gProfilesIMP[ iId ].ProfilId == iId ) )
-		{
-			sprintf( sTemp, "%s%02d.sti", IMP_FACES_DIR, gMercProfiles[iId].ubFaceIndex );
-		} 
-		else if ( ( iId > 99 ) && ( gProfilesIMP[ iId ].ProfilId == iId ) )
-		{			
-			sprintf(sTemp, "%s%03d.sti", IMP_FACES_DIR,	gMercProfiles[iId].ubFaceIndex);			
-		}
-		else if ( ( iId >= 0 ) && ( iId < 100 ))
-		{			
-			sprintf(sTemp, "%s%02d.sti", FACES_DIR,	gMercProfiles[iId].ubFaceIndex);			
-		}
-		else 
-		{			
-			sprintf(sTemp, "%s%03d.sti", FACES_DIR,	gMercProfiles[iId].ubFaceIndex);			
-		}
+	if ( ( iId >= 0 ) && ( iId < 100 ) && ( gProfilesIMP[ iId ].ProfilId == iId ) )
+		sprintf( sTemp, "%s%02d.sti", IMP_SMALL_FACES_DIR, gMercProfiles[iId].ubFaceIndex );
+	else if ( ( iId > 99 ) && ( gProfilesIMP[ iId ].ProfilId == iId ) )		
+		sprintf(sTemp, "%s%03d.sti", IMP_SMALL_FACES_DIR, gMercProfiles[iId].ubFaceIndex);
+	else if ( ( iId >= 0 ) && ( iId < 100 ))			
+		sprintf(sTemp, "%s%02d.sti", SMALL_FACES_DIR, gMercProfiles[iId].ubFaceIndex);
+	else			
+		sprintf(sTemp, "%s%03d.sti", SMALL_FACES_DIR, gMercProfiles[iId].ubFaceIndex);
 	
-/*
-	if( ( 50 < 	iId	)&&( 57 > 	iId	) ) 
-	{
-		sprintf( sTemp, "%s%03d.sti", SMALL_FACES_DIR, 	gMercProfiles[ iId ].ubFaceIndex );
-	} 
-	else 
-	{
-		if(	iId	< 100 ) 
-		{
-			sprintf(sTemp, "%s%02d.sti", SMALL_FACES_DIR, gMercProfiles[ iId ].ubFaceIndex );			
-		} 
-		else 
-		{		
-			sprintf(sTemp, "%s%03d.sti", SMALL_FACES_DIR,	gMercProfiles[ iId ].ubFaceIndex	);			
-		}
-	}
-*/
 	VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
 	FilenameForBPP(sTemp, VObjectDesc.ImageFile);
 	CHECKV(AddVideoObject(&VObjectDesc, &guiFACE));