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

- Fix: face gear was not shown for non-IMP mercs if their face index wasn't their profile number

Browse Source 
- Fix: missing credits

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8582 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-07-22 15:23:45 +00:00
parent a1763f9169
commit 29772b45de
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Credits.cpp
+12 -4
View File
@@ -1134,22 +1134,30 @@ BOOLEAN GetNextCreditFromTextFile()
break; break;
case 70: case 70:
wcscpy(zOriginalString, pCreditsJA2113[6]); wcscpy( zOriginalString, L"tais" );
break; break;
// Additonal lines for free space
case 71: case 71:
wcscpy(zOriginalString, L"@T,B40,C208,{; "); wcscpy( zOriginalString, L"sevenfm" );
break; break;
case 72: case 72:
wcscpy(zOriginalString, pCreditsJA2113[6]);
break;
// Additional lines for free space
case 73:
wcscpy(zOriginalString, L"@T,B40,C208,{; ");
break;
case 74:
wcscpy(zOriginalString, L"@}; "); wcscpy(zOriginalString, L"@}; ");
break; break;
// 3.) Sir-Tech Credits // 3.) Sir-Tech Credits
default: default:
//Get the current Credit record //Get the current Credit record
uiStartLoc = CREDITS_LINESIZE * (guiCurrentCreditRecord-(72+1)); uiStartLoc = CREDITS_LINESIZE * (guiCurrentCreditRecord-(74+1));
if( !LoadEncryptedDataFromFile( CRDT_NAME_OF_CREDIT_FILE, zOriginalString, uiStartLoc, CREDITS_LINESIZE ) ) if( !LoadEncryptedDataFromFile( CRDT_NAME_OF_CREDIT_FILE, zOriginalString, uiStartLoc, CREDITS_LINESIZE ) )
{ {
//there are no more credits //there are no more credits
Tactical/Faces.cpp
+3 -6
View File
@@ -1843,13 +1843,12 @@ void HandleRenderFaceAdjustments( FACETYPE *pFace, BOOLEAN fDisplayBuffer, BOOLE
//------------------------------------Legion 2 by jazz-------------------------------- //------------------------------------Legion 2 by jazz--------------------------------
UINT8 faceProfileId = MercPtrs[ pFace->ubSoldierID ]->ubProfile; UINT8 faceProfileId = gMercProfiles[MercPtrs[pFace->ubSoldierID]->ubProfile].ubFaceIndex;
BOOLEAN isIMP = FALSE; BOOLEAN isIMP = FALSE;
//IMP //IMP
if ( gProfilesIMP[ MercPtrs[ pFace->ubSoldierID ]->ubProfile ].ProfilId == MercPtrs[ pFace->ubSoldierID ]->ubProfile ) if ( gProfilesIMP[ MercPtrs[ pFace->ubSoldierID ]->ubProfile ].ProfilId == MercPtrs[ pFace->ubSoldierID ]->ubProfile )
{ {
faceProfileId = gMercProfiles[MercPtrs[ pFace->ubSoldierID ]->ubProfile].ubFaceIndex;
isIMP = TRUE; isIMP = TRUE;
} }
@@ -1969,8 +1968,7 @@ void HandleRenderFaceAdjustments( FACETYPE *pFace, BOOLEAN fDisplayBuffer, BOOLE
if (gGameSettings.fOptions[ TOPTION_SHOW_TACTICAL_FACE_GEAR ] == TRUE && MercPtrs[ pFace->ubSoldierID ]->stats.bLife > 0 && if (gGameSettings.fOptions[ TOPTION_SHOW_TACTICAL_FACE_GEAR ] == TRUE && MercPtrs[ pFace->ubSoldierID ]->stats.bLife > 0 &&
( MercPtrs[ pFace->ubSoldierID ]->inv[HELMETPOS].usItem > 0 ) ) ( MercPtrs[ pFace->ubSoldierID ]->inv[HELMETPOS].usItem > 0 ) )
{ {
uiFaceItemOne=MercPtrs[ pFace->ubSoldierID ]->inv[HELMETPOS].usItem; uiFaceItemOne=MercPtrs[ pFace->ubSoldierID ]->inv[HELMETPOS].usItem;
if ( uiFaceItemOne != NONE && zNewFaceGear[uiFaceItemOne].Type == 1 ) //back if ( uiFaceItemOne != NONE && zNewFaceGear[uiFaceItemOne].Type == 1 ) //back
@@ -1988,7 +1986,6 @@ void HandleRenderFaceAdjustments( FACETYPE *pFace, BOOLEAN fDisplayBuffer, BOOLE
// silversurfer: don't overwrite icons if they shall be shown! // silversurfer: don't overwrite icons if they shall be shown!
//if ( !gGameSettings.fOptions[ SHOW_TACTICAL_FACE_ICONS ] ) //if ( !gGameSettings.fOptions[ SHOW_TACTICAL_FACE_ICONS ] )
{ {
uiFaceItemOne=MercPtrs[ pFace->ubSoldierID ]->inv[HEAD1POS].usItem; uiFaceItemOne=MercPtrs[ pFace->ubSoldierID ]->inv[HEAD1POS].usItem;
uiFaceItemTwo=MercPtrs[ pFace->ubSoldierID ]->inv[HEAD2POS].usItem; uiFaceItemTwo=MercPtrs[ pFace->ubSoldierID ]->inv[HEAD2POS].usItem;