From 55ee2131454f52114f4468dfb29a6a764aa73b9a Mon Sep 17 00:00:00 2001
From: tankefugl <tankefugl@67975925-1194-0748-b3d5-c16f83f1a3a1>
Date: Thu, 27 Apr 2006 12:32:35 +0000
Subject: [PATCH] o Force sv_structurelimit to 300 when mp_tournamentmode is
 set to 1

git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@428 67975925-1194-0748-b3d5-c16f83f1a3a1
---
 releases/3.2.0/source/mod/AvHGamerules.cpp | 9 +++++++++
 releases/3.2.0/source/mod/AvHGamerules.h   | 2 ++
 releases/3.2.0/source/mod/AvHPlayer.cpp    | 6 ++----
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/releases/3.2.0/source/mod/AvHGamerules.cpp b/releases/3.2.0/source/mod/AvHGamerules.cpp
index b786ea9b..46fc3d86 100644
--- a/releases/3.2.0/source/mod/AvHGamerules.cpp
+++ b/releases/3.2.0/source/mod/AvHGamerules.cpp
@@ -227,6 +227,7 @@ extern cvar_t							avh_uplink;
 extern cvar_t							avh_gametime;
 extern cvar_t							avh_ironman;
 extern cvar_t                           avh_mapvoteratio;
+extern cvar_t							avh_structurelimit;
 
 BOOL IsSpawnPointValid( CBaseEntity *pPlayer, CBaseEntity *pSpot );
 inline int FNullEnt( CBaseEntity *ent ) { return (ent == NULL) || FNullEnt( ent->edict() ); }
@@ -1766,6 +1767,14 @@ void AvHGamerules::PlayerGotWeapon(CBasePlayer *pPlayer, CBasePlayerItem *pWeapo
 	}
 }
 
+int AvHGamerules::GetStructureLimit()
+{
+	if (GetGameRules()->GetIsTournamentMode())
+		return 300;
+	else
+		return avh_structurelimit.value;
+}
+
 Vector AvHGamerules::GetSpawnAreaCenter(AvHTeamNumber inTeamNumber) const
 {
 	Vector theCenter(0, 0, 0);
diff --git a/releases/3.2.0/source/mod/AvHGamerules.h b/releases/3.2.0/source/mod/AvHGamerules.h
index 397e4372..963691bf 100644
--- a/releases/3.2.0/source/mod/AvHGamerules.h
+++ b/releases/3.2.0/source/mod/AvHGamerules.h
@@ -288,6 +288,8 @@ public:
 
 	bool				GetIsGameInReset() {return this->mGameInReset; };
 
+	int					GetStructureLimit();
+
 protected:
 	void				AutoAssignPlayer(AvHPlayer* inPlayer);
 	void				PerformMapValidityCheck();
diff --git a/releases/3.2.0/source/mod/AvHPlayer.cpp b/releases/3.2.0/source/mod/AvHPlayer.cpp
index 7ac2dfd2..972261cb 100644
--- a/releases/3.2.0/source/mod/AvHPlayer.cpp
+++ b/releases/3.2.0/source/mod/AvHPlayer.cpp
@@ -270,8 +270,6 @@ extern int gWeaponAnimationEventID;
 extern int gMetabolizeSuccessEventID;
 extern int gPhaseInEventID;
 
-extern cvar_t							avh_structurelimit;
-
 // Yucky globals
 extern AvHParticleTemplateListServer    gParticleTemplateList;
 extern AvHSoundListManager              gSoundListManager;
@@ -492,7 +490,7 @@ bool AvHPlayer::AttemptToBuildAlienStructure(AvHMessageID inMessageID)
                 // Check if collision point is valid for building
                 if(AvHSHUGetIsSiteValidForBuild(inMessageID, &theLocation))
                 {
-					if (theNumBuildings < avh_structurelimit.value)
+					if (theNumBuildings < GetGameRules()->GetStructureLimit())
 					{
 						// Make sure there aren't too many buildings in this area already
 						int theNumBuildingsNearby = UTIL_CountEntitiesInSphere(theLocation, BALANCE_VAR(kBuildingVisibilityRadius), theClassName);
@@ -604,7 +602,7 @@ bool AvHPlayer::BuildTech(AvHMessageID inBuildID, const Vector& inPickRay)
                 // Make sure we haven't exceeded the structure limit
                 int theNumBuildings = AvHSUGetStructureCount(inBuildID);
 
-				if(theNumBuildings < avh_structurelimit.value)
+				if(theNumBuildings < GetGameRules()->GetStructureLimit())
 				{
 					if(theNumFriendlyEntitiesInArea < BALANCE_VAR(kMaxMarineEntitiesAllowedInRadius))
 					{