From bf74b894af6a2e4583ec86b61e02fd4d3392e84a Mon Sep 17 00:00:00 2001 From: Wanne Date: Fri, 20 Mar 2009 18:35:52 +0000 Subject: [PATCH] Bugfix: Max Merc limit in multiplayer was not evaluated when hiring merc git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2629 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Merc Hiring.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Tactical/Merc Hiring.cpp b/Tactical/Merc Hiring.cpp index b8af9f614..f7bb302b3 100644 --- a/Tactical/Merc Hiring.cpp +++ b/Tactical/Merc Hiring.cpp @@ -102,7 +102,9 @@ INT8 HireMerc( MERC_HIRE_STRUCT *pHireMerc) if( ( pMerc->bMercStatus != 0 ) && (pMerc->bMercStatus != MERC_ANNOYED_BUT_CAN_STILL_CONTACT ) && ( pMerc->bMercStatus != MERC_HIRED_BUT_NOT_ARRIVED_YET ) ) return( MERC_HIRE_FAILED ); - if( NumberOfMercsOnPlayerTeam() >= gGameExternalOptions.ubGameMaximumNumberOfPlayerMercs ) + + //hayden, 7 member team limit setable in ini + if( NumberOfMercsOnPlayerTeam() >= gGameExternalOptions.ubGameMaximumNumberOfPlayerMercs || (is_client && NumberOfMercsOnPlayerTeam() >= MAX_MERCS) ) return( MERC_HIRE_OVER_PLAYER_LIMIT ); // ATE: if we are to use landing zone, update to latest value