mirror of
https://github.com/1dot13/source.git
synced 2026-09-02 14:36:06 +02:00
Changing MAX_NUMBER_PLAYER_MERCS midgame no longer renders savegames unloadable, as the teamsize is stored in the savegame anyway
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:
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user