1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

BUGZILLA #549: Fixed mercs not showing up on MERC website

Browse Source 
o Workaround for old bugged savegames: If passed day 30, make merc available on MERC website
o Fixed problems with merc not showing up after Larry was added
o Fixed white background graphic when MERC website is down (broken link)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4583 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-07-21 16:38:11 +00:00
parent 9630f0f21f
commit 20e1e49964
4 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaveLoadGame.cpp
+22
View File
@@ -5058,6 +5058,28 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
}
}
}
// WANNE: There were some problems in older savegames, that the MERC are not available on the merc site. Just recalculate the correct number of mercs
// Players that have a bugged savegame and are above Day 50 get ALL Merc on the website!
if(guiCurrentSaveGameVersion < FIXED_MERC_NOT_AVAILABLE_ON_MERC_WEBSITE)
{
// WORKAROUND: If player passed day 30, make merc available on MERC website!
if (LaptopSaveInfo.gubLastMercIndex <= 6 && GetWorldDay() >= 30)
{
LaptopSaveInfo.gubLastMercIndex = 0;
for(UINT8 i=0; i<NUM_PROFILES; i++)
{
if ( gConditionsForMercAvailability[i].ProfilId != 0 && (gConditionsForMercAvailability[i].NewMercsAvailable == TRUE || gConditionsForMercAvailability[i].StartMercsAvailable == TRUE ))
{
LaptopSaveInfo.gubLastMercIndex ++;
}
}
if (LaptopSaveInfo.gubLastMercIndex > 0)
LaptopSaveInfo.gubLastMercIndex = LaptopSaveInfo.gubLastMercIndex - 1;
}
}
// ---------------------------------------------------------------------------