mirror of
https://github.com/1dot13/source.git
synced 2026-09-09 14:46:05 +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:
@@ -146,7 +146,7 @@ INT8 HireMerc( MERC_HIRE_STRUCT *pHireMerc)
|
||||
|
||||
|
||||
//hayden, 7 member team limit setable in ini
|
||||
if( NumberOfMercsOnPlayerTeam() >= gGameExternalOptions.ubGameMaximumNumberOfPlayerMercs || (is_client && NumberOfMercsOnPlayerTeam() >= cMaxMercs) )
|
||||
if( NumberOfMercsOnPlayerTeam() >= OUR_TEAM_SIZE_NO_VEHICLE || (is_client && NumberOfMercsOnPlayerTeam() >= cMaxMercs) )
|
||||
return( MERC_HIRE_OVER_PLAYER_LIMIT );
|
||||
|
||||
// ATE: if we are to use landing zone, update to latest value
|
||||
|
||||
Reference in New Issue
Block a user