1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Store the profile type in the profile structure and remove superfluous code

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8620 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-09-24 19:36:28 +00:00
parent 8ae2eacfcd
commit 494dbc6e69
41 changed files with 385 additions and 942 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/personnel.cpp
+8 -13
View File
@@ -838,7 +838,7 @@ void RenderPersonnelFace(INT32 iId, INT32 iSlot, BOOLEAN fDead, BOOLEAN fFired,
// special case?..player generated merc
if (fCurrentTeamMode)
{
if ( gProfilesIMP[profileId].ProfilId == profileId )
if ( gMercProfiles[profileId].Type == PROFILETYPE_IMP )
{
sprintf( sTemp, "%s%02d.sti", IMP_FACES_DIR, gMercProfiles[profileId].ubFaceIndex );
}
@@ -862,7 +862,7 @@ void RenderPersonnelFace(INT32 iId, INT32 iSlot, BOOLEAN fDead, BOOLEAN fFired,
return;
}
if ( gProfilesIMP[profileId].ProfilId == profileId )
if ( gMercProfiles[profileId].Type == PROFILETYPE_IMP )
{
sprintf( sTemp, "%s%02d.sti", IMP_FACES_DIR, gMercProfiles[profileId].ubFaceIndex );
}
@@ -2405,7 +2405,7 @@ void DisplayPicturesOfCurrentTeam( void )
if ( pSoldier->ubProfile >= 0 )
{
if ( gProfilesIMP[pSoldier->ubProfile].ProfilId == pSoldier->ubProfile )
if ( gMercProfiles[pSoldier->ubProfile].Type == PROFILETYPE_IMP )
{
sprintf( sTemp, "%s%02d.sti", IMP_SMALL_FACES_DIR, gMercProfiles[pSoldier->ubProfile].ubFaceIndex );
}
@@ -4924,24 +4924,20 @@ INT32 GetIdOfPastMercInSlot( INT32 iSlot )
for( iCounterA = 0; ( ( ( iCounter ) < ( iSlot + giCurrentUpperLeftPortraitNumber ) ) ); iCounterA++ )
{
if( LaptopSaveInfo.ubOtherCharactersList[ iCounterA ] != -1 )
iCounter++;
++iCounter;
}
return( LaptopSaveInfo.ubOtherCharactersList[ iCounterA - 1] );
}
void DisplayPortraitOfPastMerc( INT32 iId , INT32 iCounter, BOOLEAN fDead, BOOLEAN fFired, BOOLEAN fOther )
{
char sTemp[100];
HVOBJECT hFaceHandle;
VOBJECT_DESC VObjectDesc;
if ( gProfilesIMP[iId].ProfilId == iId )
if ( gMercProfiles[iId].Type == PROFILETYPE_IMP )
{
sprintf( sTemp, "%s%02d.sti", IMP_SMALL_FACES_DIR, gMercProfiles[iId].ubFaceIndex );
}
@@ -5324,10 +5320,9 @@ void DisplayDepartedCharName( INT32 iId, INT32 iSlot, INT32 iState )
{
swprintf( sString, L"%s", pPersonnelDepartedStateStrings[ DEPARTED_DEAD ] );
}
//if the merc is an AIM merc
//else if( iId < BIFF )
else if ( gProfilesAIM[ iId ].ProfilId == iId )
else if ( gMercProfiles[iId].Type == PROFILETYPE_AIM )
{
//if dismissed
if( iState == DEPARTED_FIRED )
@@ -5338,7 +5333,7 @@ void DisplayDepartedCharName( INT32 iId, INT32 iSlot, INT32 iState )
//else if its a MERC merc
//else if( iId >= BIFF && iId <= BUBBA )
else if ( gProfilesMERC[ iId ].ProfilId == iId )
else if ( gMercProfiles[iId].Type == PROFILETYPE_MERC )
{
if( iState == DEPARTED_FIRED )
swprintf( sString, L"%s", pPersonnelDepartedStateStrings[ DEPARTED_FIRED ] );
@@ -5347,7 +5342,7 @@ void DisplayDepartedCharName( INT32 iId, INT32 iSlot, INT32 iState )
}
//must be a RPC
//else
else if ( gProfilesRPC[ iId ].ProfilId == iId )
else if ( gMercProfiles[iId].Type == PROFILETYPE_RPC )
{
if( iState == DEPARTED_FIRED )
swprintf( sString, L"%s", pPersonnelDepartedStateStrings[ DEPARTED_FIRED ] );