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

- Improvement of M.E.R.C availability (by silversurfer)

Browse Source 
o Now you can change the MercAvailability.xml file during a game

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6286 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-08-15 20:20:06 +00:00
parent 5f4c5e63e5
commit a08175906d
2 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/mercs.cpp
+28 -6
View File
@@ -333,6 +333,7 @@ BOOLEAN AreAnyOfTheNewMercsAvailable();
void ShouldAnyNewMercMercBecomeAvailable();
BOOLEAN CanMercBeAvailableYet( UINT8 ubMercToCheck );
UINT32 CalcMercDaysServed();
void RevaluateMercArray(); // silversurfer: for better savegame compatibility
#ifdef JA2UB
void MarkSpeckImportantQuoteUsed( UINT32 uiQuoteNum );
BOOLEAN HasImportantSpeckQuoteBeingSaid( UINT32 uiQuoteNum );
@@ -356,22 +357,43 @@ BOOLEAN SaveNewMercsToSaveGameFile( HWFILE hFile )
BOOLEAN LoadNewMercsFromLoadGameFile( HWFILE hFile )
{
UINT32 uiNumBytesRead;
CONTITION_FOR_MERC_AVAILABLE ConditionsForMercAvailabilityLoad[ NUM_PROFILES ];
FileRead( hFile, &gConditionsForMercAvailability, sizeof( gConditionsForMercAvailability ), &uiNumBytesRead );
if( uiNumBytesRead != sizeof( gConditionsForMercAvailability ) )
FileRead( hFile, &ConditionsForMercAvailabilityLoad, sizeof( ConditionsForMercAvailabilityLoad ), &uiNumBytesRead );
if( uiNumBytesRead != sizeof( ConditionsForMercAvailabilityLoad ) )
{
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
// silversurfer: Now update the true gConditionsForMercAvailability array with the data from the savegame.
// Take every index of gConditionsForMercAvailability array that we initialized in GameInitMercs() and see
// if we can find a matching profile ID in ConditionsForMercAvailabilityLoad array that we loaded from the savegame.
// This prevents some issues when old savegames are loaded with updated MercAvailability.xml.
for ( UINT8 i=0; i<NUM_PROFILES; i++)
{
if ( gConditionsForMercAvailability[i].ProfilId != 0 )
{
for ( UINT8 ilook=0; ilook<NUM_PROFILES; ilook++)
{
if ( ConditionsForMercAvailabilityLoad[ilook].ProfilId == gConditionsForMercAvailability[i].ProfilId )
{
// found a match! Now copy the data from the savegame to the gConditionsForMercAvailability array but ONLY relevant data!
gConditionsForMercAvailability[i].NewMercsAvailable = ConditionsForMercAvailabilityLoad[ilook].NewMercsAvailable;
gConditionsForMercAvailability[i].StartMercsAvailable = ConditionsForMercAvailabilityLoad[ilook].StartMercsAvailable;
break;
}
}
}
}
// update list of mercs for M.E.R.C website
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
// silversurfer: this function updates the list of available mercs (gubMercArray) and makes sure that
// it matches the contents of gConditionsForMercAvailability array
void RevaluateMercArray()
{
UINT8 i;
Laptop/mercs.h
-1
View File
@@ -110,7 +110,6 @@ enum
BOOLEAN CanMercBeAvailableDuringInit( UINT8 ubMercToCheck );// anv: for all mercs available
void RevaluateMercArray(); // silversurfer: for somewhat better savegame compatibility
void GameInitMercs();
BOOLEAN EnterMercs();
void ExitMercs();