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

Merged from revision: 6961

Browse Source 
- Bugfix: John Kulba (and other NPCs) did not show up on MERC website even if MERC_WEBSITE_ALL_MERC_AVAILABLE  = TRUE (by anv)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6962 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-02-22 16:44:15 +00:00
parent d888067d81
commit 201fcf4001
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/mercs.cpp
+5 -4
View File
@@ -3094,7 +3094,9 @@ void ShouldAnyNewMercMercBecomeAvailable()
//Kaiden: Added this if test to make sure that the "New Mercs Available" //Kaiden: Added this if test to make sure that the "New Mercs Available"
// e-mail doesn't show up and no unneccessary checks are made when you // e-mail doesn't show up and no unneccessary checks are made when you
// have the ALL_MERCS_AT_MERC set to TRUE in the INI file. // have the ALL_MERCS_AT_MERC set to TRUE in the INI file.
if(!gGameExternalOptions.fAllMercsAvailable) // anv: ALL_MERCS_AT_MERC doesn't cover mercs that can be unlocked depending on in-campaign conditions (e.g. Kulba)
// if ALL_MERCS_AT_MERC is on, .StartMercsAvailable = TRUE anyway, so there won't be any conflicts or unnecessary emails
//if(!gGameExternalOptions.fAllMercsAvailable)
{ {
for(UINT8 i=0; i<NUM_PROFILES; i++) for(UINT8 i=0; i<NUM_PROFILES; i++)
{ {
@@ -3130,11 +3132,10 @@ BOOLEAN CanMercBeAvailableYet( UINT8 ubMercToCheck )
if(gGameExternalOptions.fEnableRecruitableJohnKulba == TRUE) if(gGameExternalOptions.fEnableRecruitableJohnKulba == TRUE)
{ {
if( LaptopSaveInfo.bJohnEscorted == TRUE if( LaptopSaveInfo.bJohnEscorted == TRUE
&& LaptopSaveInfo.uiJohnEscortedDate + gGameExternalOptions.ubRecruitableJohnKulbaDelay < GetWorldDay() ) && LaptopSaveInfo.uiJohnEscortedDate + gGameExternalOptions.ubRecruitableJohnKulbaDelay <= GetWorldDay() )
{ {
return( TRUE ); return( TRUE );
} } else
else
{ {
return( FALSE ); return( FALSE );
} }