diff --git a/Credits.cpp b/Credits.cpp index b851321b..95f54bcf 100644 --- a/Credits.cpp +++ b/Credits.cpp @@ -1134,22 +1134,30 @@ BOOLEAN GetNextCreditFromTextFile() break; case 70: - wcscpy(zOriginalString, pCreditsJA2113[6]); + wcscpy( zOriginalString, L"tais" ); break; - // Additonal lines for free space case 71: - wcscpy(zOriginalString, L"@T,B40,C208,{; "); + wcscpy( zOriginalString, L"sevenfm" ); break; 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"@}; "); break; // 3.) Sir-Tech Credits default: //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 ) ) { //there are no more credits diff --git a/Tactical/Faces.cpp b/Tactical/Faces.cpp index 5511e593..462fce35 100644 --- a/Tactical/Faces.cpp +++ b/Tactical/Faces.cpp @@ -1843,13 +1843,12 @@ void HandleRenderFaceAdjustments( FACETYPE *pFace, BOOLEAN fDisplayBuffer, BOOLE //------------------------------------Legion 2 by jazz-------------------------------- - UINT8 faceProfileId = MercPtrs[ pFace->ubSoldierID ]->ubProfile; + UINT8 faceProfileId = gMercProfiles[MercPtrs[pFace->ubSoldierID]->ubProfile].ubFaceIndex; BOOLEAN isIMP = FALSE; //IMP if ( gProfilesIMP[ MercPtrs[ pFace->ubSoldierID ]->ubProfile ].ProfilId == MercPtrs[ pFace->ubSoldierID ]->ubProfile ) - { - faceProfileId = gMercProfiles[MercPtrs[ pFace->ubSoldierID ]->ubProfile].ubFaceIndex; + { 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 && ( MercPtrs[ pFace->ubSoldierID ]->inv[HELMETPOS].usItem > 0 ) ) - { - + { uiFaceItemOne=MercPtrs[ pFace->ubSoldierID ]->inv[HELMETPOS].usItem; 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! //if ( !gGameSettings.fOptions[ SHOW_TACTICAL_FACE_ICONS ] ) { - uiFaceItemOne=MercPtrs[ pFace->ubSoldierID ]->inv[HEAD1POS].usItem; uiFaceItemTwo=MercPtrs[ pFace->ubSoldierID ]->inv[HEAD2POS].usItem;