Cleaned up IMP creation code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8350 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2016-12-30 17:43:30 +00:00
parent d6b7dd4d52
commit 58eb840439
9 changed files with 128 additions and 464 deletions
+3 -18
View File
@@ -1118,27 +1118,14 @@ BOOLEAN LoadCharacterPortraitForMainPage( void )
// load it
VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
if( fCharacterIsMale )
if ( gIMPValues[iPortraitNumber].Enabled == 1 )
{
if ( gIMPMaleValues[ iPortraitNumber ].Enabled == 1 )
{
// sprintf( VObjectDesc.ImageFile, "Faces\\%02d.sti", gIMPMaleValues[ iPortraitNumber ].PortraitId );
sprintf( VObjectDesc.ImageFile, "IMPFaces\\%02d.sti", gIMPMaleValues[ iPortraitNumber ].PortraitId );
}
sprintf( VObjectDesc.ImageFile, "IMPFaces\\%02d.sti", gIMPValues[iPortraitNumber].PortraitId );
}
else
{
if ( gIMPFemaleValues[ iPortraitNumber ].Enabled == 1 )
{
//sprintf( VObjectDesc.ImageFile, "Faces\\%02d.sti", gIMPFemaleValues[ iPortraitNumber ].PortraitId );
sprintf( VObjectDesc.ImageFile, "IMPFaces\\%02d.sti", gIMPFemaleValues[ iPortraitNumber ].PortraitId );
}
}
//FilenameForBPP( pPlayerSelectedFaceFileNames[ iPortraitNumber ] , VObjectDesc.ImageFile);
CHECKF(AddVideoObject(&VObjectDesc, &guiCHARACTERPORTRAITFORMAINPAGE));
// now specify
SpecifyButtonIcon( giIMPMainPageButton[4], guiCHARACTERPORTRAITFORMAINPAGE, 0,
33, 23, FALSE );
@@ -1147,8 +1134,6 @@ BOOLEAN LoadCharacterPortraitForMainPage( void )
return( TRUE );
}
BOOLEAN IMP_CanWeDisplayPortrait( )
{
if( iCurrentProfileMode == IMP__VOICE ||