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

Changing MAX_NUMBER_PLAYER_MERCS midgame no longer renders savegames unloadable, as the teamsize is stored in the savegame anyway

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6294 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-08-19 23:27:50 +00:00
parent 4b0094902a
commit 74f52b3982
11 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/AimMembers.cpp
+1 -1
View File
@@ -2457,7 +2457,7 @@ void BtnAuthorizeButtonCallback(GUI_BUTTON *btn,INT32 reason)
// WDS DEBUG
if (LaptopSaveInfo.iCurrentBalance == 4500001) {
unsigned hired = 0;
while (hired < gGameExternalOptions.ubGameMaximumNumberOfPlayerMercs) {
while (hired < OUR_TEAM_SIZE_NO_VEHICLE) {
if (AimMemberHireMerc()) {
// giIdOfLastHiredMerc = AimMercArray[gbCurrentIndex];
giIdOfLastHiredMerc = gAimAvailability[AimMercArray[gbCurrentIndex]].ProfilId;
Laptop/IMP HomePage.cpp
+2 -1
View File
@@ -26,6 +26,7 @@
#include "Game Clock.h"
// WDS - make number of mercenaries, etc. be configurable
#include "Squads.h"
#include "Overhead.h" // added by Flugente for OUR_TEAM_SIZE_NO_VEHICLE
#endif
#ifdef JA2UB
@@ -383,7 +384,7 @@ void ProcessPlayerInputActivationString( void )
BOOLEAN freeMercSlot = TRUE;
// WANNE: Check total number of hired mercs
if( NumberOfMercsOnPlayerTeam() >= gGameExternalOptions.ubGameMaximumNumberOfPlayerMercs )
if( NumberOfMercsOnPlayerTeam() >= OUR_TEAM_SIZE_NO_VEHICLE )
{
freeMercSlot = FALSE;
}
Laptop/IMP MainPage.cpp
+2 -1
View File
@@ -22,6 +22,7 @@
#include "GameSettings.h"
#include "Soldier Profile.h"
#include "Squads.h"
#include "Overhead.h" // added by Flugente for OUR_TEAM_SIZE_NO_VEHICLE
#endif
#include "IMP Confirm.h"
@@ -603,7 +604,7 @@ void BtnIMPMainPageBeginCallback(GUI_BUTTON *btn,INT32 reason)
DoLapTopMessageBox( MSG_BOX_IMP_STYLE, pImpPopUpStrings[ 3 ], LAPTOP_SCREEN, MSG_BOX_FLAG_OK, BeginMessageBoxCallBack);
}
else if( NumberOfMercsOnPlayerTeam() >= gGameExternalOptions.ubGameMaximumNumberOfPlayerMercs )
else if( NumberOfMercsOnPlayerTeam() >= OUR_TEAM_SIZE_NO_VEHICLE )
{
DoLapTopMessageBox( MSG_BOX_IMP_STYLE, pImpPopUpStrings[ 5 ], LAPTOP_SCREEN, MSG_BOX_FLAG_OK, BeginMessageBoxCallBack);
}