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

Fix: adding new mercs to the MERC webpage in an ongoing campaign destroyed sort order and made mercs unavailable (by silversurfer)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6278 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-08-08 20:49:41 +00:00
parent ea478960dd
commit a543b33c4b
2 changed files with 75 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/mercs.cpp
+74 -2
View File
@@ -363,9 +363,81 @@ BOOLEAN LoadNewMercsFromLoadGameFile( HWFILE hFile )
return( FALSE );
}
// make sure that gubMercArray (the list of mercs for M.E.R.C website) is populated with
// the same mercs as gConditionsForMercAvailability that we just read from the savegame
RevaluateMercArray();
return( TRUE );
}
// silversurfer: this function checks if gubMercArray contains the same list of mercs as gConditionsForMercAvailability
// if not there will be problems with display of mercs on M.E.R.C website so we will force an update
void RevaluateMercArray()
{
UINT8 i;
NUMBER_OF_MERCS = 0;
LAST_MERC_ID = -1;
NUMBER_OF_BAD_MERCS = -1;
// first clear gubMercArray
for ( i=0; i<NUM_PROFILES; i++)
{
gubMercArray[ i ] = 0;
}
// now fill it again with the mercs from the savegame
for(i=0; i<NUM_PROFILES; i++)
{
if ( gConditionsForMercAvailability[i].ProfilId != 0 )
{
NUMBER_OF_MERCS = NUMBER_OF_MERCS + 1;
LAST_MERC_ID = LAST_MERC_ID + 1;
gubMercArray[ i ] = gConditionsForMercAvailability[i].ProfilId;
}
}
// check how many mercs are supposed to be available
for(i=0; i<NUM_PROFILES; i++)
{
if ( gConditionsForMercAvailability[i].StartMercsAvailable == TRUE && gConditionsForMercAvailability[i].NewMercsAvailable == FALSE )
NUMBER_OF_BAD_MERCS = NUMBER_OF_BAD_MERCS + 1;
}
// usually MERC_WEBSITE_ALL_MERCS_AVAILABLE could only be set on game start but now we can do it here too
if(!gGameExternalOptions.fAllMercsAvailable)
{
LaptopSaveInfo.gubLastMercIndex = NUMBER_OF_BAD_MERCS;
}
else
{
for(i=0; i<NUMBER_OF_MERCS; i++)
{
if( CanMercBeAvailableDuringInit(i) )
{
// mercs that were not unlocked will now be unlocked
gConditionsForMercAvailabilityTemp[i].StartMercsAvailable = TRUE;
gConditionsForMercAvailabilityTemp[i].NewMercsAvailable = FALSE;
gConditionsForMercAvailability[i].StartMercsAvailable = TRUE;
gConditionsForMercAvailability[i].NewMercsAvailable = FALSE;
}
else
{
// make sure that we don't accidentally lock an already unlocked merc
if ( gConditionsForMercAvailability[i].StartMercsAvailable == FALSE )
{
gConditionsForMercAvailabilityTemp[i].StartMercsAvailable = FALSE;
gConditionsForMercAvailabilityTemp[i].NewMercsAvailable = FALSE;
gConditionsForMercAvailability[i].StartMercsAvailable = FALSE;
gConditionsForMercAvailability[i].NewMercsAvailable = FALSE;
LAST_MERC_ID--;
}
}
}
LaptopSaveInfo.gubLastMercIndex = LAST_MERC_ID;
}
}
BOOLEAN CanMercBeAvailableDuringInit( UINT8 ubMercToCheck )// anv: for all mercs available
{
if( gConditionsForMercAvailability[ubMercToCheck].Drunk == TRUE )
@@ -424,9 +496,9 @@ void GameInitMercs()
if( CanMercBeAvailableDuringInit(i) )
{
gConditionsForMercAvailabilityTemp[i].StartMercsAvailable = TRUE;
gConditionsForMercAvailabilityTemp[i].NewMercsAvailable = TRUE;
gConditionsForMercAvailabilityTemp[i].NewMercsAvailable = FALSE;
gConditionsForMercAvailability[i].StartMercsAvailable = TRUE;
gConditionsForMercAvailability[i].NewMercsAvailable = TRUE;
gConditionsForMercAvailability[i].NewMercsAvailable = FALSE;
}
else
{
Laptop/mercs.h
+1
View File
@@ -110,6 +110,7 @@ enum
BOOLEAN CanMercBeAvailableDuringInit( UINT8 ubMercToCheck );// anv: for all mercs available
void RevaluateMercArray(); // silversurfer: for somewhat better savegame compatibility
void GameInitMercs();
BOOLEAN EnterMercs();
void ExitMercs();