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

- Fix: wrong face displayed on insurance website

Browse Source 
- Chg: no insurance payout on suspicious deaths (no enemy presence during merc death, or merc died from friendly fire)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8843 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2020-07-05 12:03:44 +00:00
parent 7215d004fc
commit c8627c7234
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/email.cpp
+2 -1
View File
@@ -3422,7 +3422,7 @@ BOOLEAN HandleNewUBMailSpecialMessages( UINT16 usMessageId, INT32 *iResults, Ema
if ( gGameUBOptions.LaptopLinkInsurance == TRUE ) if ( gGameUBOptions.LaptopLinkInsurance == TRUE )
ModifyInsuranceEmails( usMessageId, iResults, pMail, INSUR_PAYMENT_LENGTH ); ModifyInsuranceEmails( usMessageId, iResults, pMail, INSUR_PAYMENT_LENGTH );
} }
else if ( pMail->EmailType == TYPE_E_INSURANCE_L2 && pMail->EmailVersion == TYPE_EMAIL_INSURANCE_COMPANY_EMAIL_JA2_EDT && usMessageId == 211 ) else if ( pMail->EmailType == TYPE_E_INSURANCE_L2 && pMail->EmailVersion == TYPE_EMAIL_INSURANCE_COMPANY_EMAIL_JA2_EDT && usMessageId == INSUR_1HOUR_FRAUD )
{ {
if ( gGameUBOptions.LaptopLinkInsurance == TRUE ) if ( gGameUBOptions.LaptopLinkInsurance == TRUE )
ModifyInsuranceEmails( usMessageId, iResults, pMail, INSUR_1HOUR_FRAUD_LENGTH ); ModifyInsuranceEmails( usMessageId, iResults, pMail, INSUR_1HOUR_FRAUD_LENGTH );
@@ -3505,6 +3505,7 @@ BOOLEAN HandleMailSpecialMessages( UINT16 usMessageId, INT32 *iResults, EmailPtr
case INSUR_SUSPIC: case INSUR_SUSPIC:
case INSUR_SUSPIC_2: case INSUR_SUSPIC_2:
case INSUR_INVEST_OVER: case INSUR_INVEST_OVER:
case INSUR_CHEAT_FRAUD:
ModifyInsuranceEmails( usMessageId, iResults, pMail, INSUR_PAYMENT_LENGTH ); ModifyInsuranceEmails( usMessageId, iResults, pMail, INSUR_PAYMENT_LENGTH );
break; break;
Laptop/email.h
+3
View File
@@ -387,6 +387,9 @@
#define INTEL_ENRICO_INTRO (MILITIAROSTER_INTRO + MILITIAROSTER_INTRO_LENGTH) #define INTEL_ENRICO_INTRO (MILITIAROSTER_INTRO + MILITIAROSTER_INTRO_LENGTH)
#define INTEL_ENRICO_INTRO_LENGTH 5 #define INTEL_ENRICO_INTRO_LENGTH 5
#define INSUR_CHEAT_FRAUD ( INTEL_ENRICO_INTRO + INTEL_ENRICO_INTRO_LENGTH )
#define INSUR_CHEAT_FRAUD_LENGTH 3
#endif #endif
// WANNE: New 1.13 MERC merc mail text for level up that Speck sends // WANNE: New 1.13 MERC merc mail text for level up that Speck sends
Laptop/insurance Contract.cpp
+12 -9
View File
@@ -512,10 +512,7 @@ BOOLEAN DisplayOrderGrid( UINT8 ubGridNumber, UINT8 ubMercID )
CHAR16 sText[800]; CHAR16 sText[800];
BOOLEAN fDisplayMercContractStateTextColorInRed = FALSE; BOOLEAN fDisplayMercContractStateTextColorInRed = FALSE;
SOLDIERTYPE *pSoldier; SOLDIERTYPE *pSoldier = &Menptr[ GetSoldierIDFromMercID( ubMercID ) ];
pSoldier = &Menptr[ GetSoldierIDFromMercID( ubMercID ) ];
usPosX=usPosY=0; usPosX=usPosY=0;
@@ -553,7 +550,7 @@ BOOLEAN DisplayOrderGrid( UINT8 ubGridNumber, UINT8 ubMercID )
// load the mercs face graphic and add it // load the mercs face graphic and add it
VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE; VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
sprintf(sTemp, "FACES\\%02d.sti", ubMercID); sprintf(sTemp, "FACES\\%02d.sti", gMercProfiles[pSoldier->ubProfile].ubFaceIndex );
FilenameForBPP( sTemp, VObjectDesc.ImageFile); FilenameForBPP( sTemp, VObjectDesc.ImageFile);
CHECKF(AddVideoObject(&VObjectDesc, &uiInsMercFaceImage)); CHECKF(AddVideoObject(&VObjectDesc, &uiInsMercFaceImage));
@@ -561,7 +558,7 @@ BOOLEAN DisplayOrderGrid( UINT8 ubGridNumber, UINT8 ubMercID )
GetVideoObject(&hPixHandle, uiInsMercFaceImage ); GetVideoObject(&hPixHandle, uiInsMercFaceImage );
//if the merc is dead, shade the face red //if the merc is dead, shade the face red
if( IsMercDead( ubMercID ) ) if( IsMercDead( pSoldier->ubProfile ) )
{ {
//if the merc is dead //if the merc is dead
//shade the face red, (to signify that he is dead) //shade the face red, (to signify that he is dead)
@@ -648,7 +645,7 @@ BOOLEAN DisplayOrderGrid( UINT8 ubGridNumber, UINT8 ubMercID )
//display the amount of time the merc has left on their Regular contract //display the amount of time the merc has left on their Regular contract
if( IsMercDead( ubMercID ) ) if( IsMercDead( pSoldier->ubProfile ) )
swprintf( sText, L"%s", pMessageStrings[ MSG_LOWERCASE_NA ] ); swprintf( sText, L"%s", pMessageStrings[ MSG_LOWERCASE_NA ] );
else else
swprintf( sText, L"%d", GetTimeRemainingOnSoldiersContract( pSoldier ) ); swprintf( sText, L"%d", GetTimeRemainingOnSoldiersContract( pSoldier ) );
@@ -674,7 +671,7 @@ BOOLEAN DisplayOrderGrid( UINT8 ubGridNumber, UINT8 ubMercID )
// //
//if the soldier has insurance, disply the length of time the merc has left //if the soldier has insurance, disply the length of time the merc has left
if( IsMercDead( ubMercID ) ) if( IsMercDead( pSoldier->ubProfile ) )
swprintf( sText, L"%s", pMessageStrings[ MSG_LOWERCASE_NA ] ); swprintf( sText, L"%s", pMessageStrings[ MSG_LOWERCASE_NA ] );
else if( pSoldier->usLifeInsurance != 0 ) else if( pSoldier->usLifeInsurance != 0 )
@@ -1426,12 +1423,18 @@ void EndInsuranceInvestigation( UINT8 ubPayoutID )
if( gubQuest[ QUEST_FIX_LAPTOP ] == QUESTDONE || gGameUBOptions.LaptopQuestEnabled == FALSE ) if( gubQuest[ QUEST_FIX_LAPTOP ] == QUESTDONE || gGameUBOptions.LaptopQuestEnabled == FALSE )
{ {
if ( gGameUBOptions.LaptopLinkInsurance == TRUE ) if ( gGameUBOptions.LaptopLinkInsurance == TRUE )
AddEmailWithSpecialData( 211, INSUR_1HOUR_FRAUD_LENGTH, INSURANCE_COMPANY, GetWorldTotalMin(), LaptopSaveInfo.pLifeInsurancePayouts[ ubPayoutID ].iPayOutPrice, LaptopSaveInfo.pLifeInsurancePayouts[ ubPayoutID ].ubMercID, TYPE_EMAIL_INSURANCE_COMPANY_EMAIL_JA2_EDT, TYPE_E_INSURANCE_L2 ); AddEmailWithSpecialData( INSUR_1HOUR_FRAUD, INSUR_1HOUR_FRAUD_LENGTH, INSURANCE_COMPANY, GetWorldTotalMin(), LaptopSaveInfo.pLifeInsurancePayouts[ ubPayoutID ].iPayOutPrice, LaptopSaveInfo.pLifeInsurancePayouts[ ubPayoutID ].ubMercID, TYPE_EMAIL_INSURANCE_COMPANY_EMAIL_JA2_EDT, TYPE_E_INSURANCE_L2 );
} }
#else #else
AddEmailWithSpecialData( INSUR_1HOUR_FRAUD, INSUR_1HOUR_FRAUD_LENGTH, INSURANCE_COMPANY, GetWorldTotalMin(), LaptopSaveInfo.pLifeInsurancePayouts[ ubPayoutID ].iPayOutPrice, LaptopSaveInfo.pLifeInsurancePayouts[ ubPayoutID ].ubMercID, TYPE_EMAIL_EMAIL_EDT, TYPE_E_NONE ); AddEmailWithSpecialData( INSUR_1HOUR_FRAUD, INSUR_1HOUR_FRAUD_LENGTH, INSURANCE_COMPANY, GetWorldTotalMin(), LaptopSaveInfo.pLifeInsurancePayouts[ ubPayoutID ].iPayOutPrice, LaptopSaveInfo.pLifeInsurancePayouts[ ubPayoutID ].ubMercID, TYPE_EMAIL_EMAIL_EDT, TYPE_E_NONE );
#endif #endif
} }
// Flugente: also don't pay out if the death was suspicious. I mean, we get this if there were no enemies of the player straight up shot the guy...
else if ( gMercProfiles[LaptopSaveInfo.pLifeInsurancePayouts[ubPayoutID].ubMercID].ubSuspiciousDeath == SUSPICIOUS_DEATH )
{
// fraud, no payout!
AddEmailWithSpecialData( INSUR_CHEAT_FRAUD, INSUR_CHEAT_FRAUD_LENGTH, INSURANCE_COMPANY, GetWorldTotalMin(), LaptopSaveInfo.pLifeInsurancePayouts[ubPayoutID].iPayOutPrice, LaptopSaveInfo.pLifeInsurancePayouts[ubPayoutID].ubMercID, TYPE_EMAIL_EMAIL_EDT, TYPE_E_NONE );
}
else else
{ {
#ifdef JA2UB #ifdef JA2UB