From 975d68c23573d4909d6c38f901d012c4f9358cdf Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Wed, 25 Feb 2009 14:59:55 +0000
Subject: [PATCH] remove assault entities in non-assault games

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5966 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/assault.qc | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/data/qcsrc/server/assault.qc b/data/qcsrc/server/assault.qc
index 78addc063..d67e28839 100644
--- a/data/qcsrc/server/assault.qc
+++ b/data/qcsrc/server/assault.qc
@@ -51,6 +51,11 @@ void assault_objective_use() {
 }
 
 void spawnfunc_target_objective() {
+	if(!g_assault)
+	{
+		remove(self);
+		return;
+	}
 	self.classname = "target_objective";
 	self.use = assault_objective_use;
 	assault_objective_reset();
@@ -155,6 +160,11 @@ void target_objective_decrease_findtarget()
 //=============================================================================
 
 void spawnfunc_target_objective_decrease() {
+	if(!g_assault)
+	{
+		remove(self);
+		return;
+	}
 
 	self.classname = "target_objective_decrease";
 
@@ -171,6 +181,11 @@ void spawnfunc_target_objective_decrease() {
 
 // destructible walls that can be used to trigger target_objective_decrease
 void spawnfunc_func_assault_destructible() {
+	if(!g_assault)
+	{
+		remove(self);
+		return;
+	}
 	self.spawnflags = 3;
 	spawnfunc_func_breakable();
 }
@@ -188,6 +203,11 @@ void assault_wall_think() {
 }
 
 void spawnfunc_func_assault_wall() {
+	if(!g_assault)
+	{
+		remove(self);
+		return;
+	}
 	self.classname = "func_assault_wall";
 	self.mdl = self.model;
 	setmodel(self, self.mdl);
@@ -209,6 +229,11 @@ void target_assault_roundend_use() {
 }
 
 void spawnfunc_target_assault_roundend() {
+	if(!g_assault)
+	{
+		remove(self);
+		return;
+	}
 	self.winning = 0; // round not yet won by attackers
 	self.classname = "target_assault_roundend";
 	self.use = target_assault_roundend_use;
@@ -250,6 +275,11 @@ entity ent,oldself;
 }
 
 void spawnfunc_target_assault_roundstart() {
+	if(!g_assault)
+	{
+		remove(self);
+		return;
+	}
 	assault_attacker_team = COLOR_TEAM1;
 	self.classname = "target_assault_roundstart";
 	self.use = assault_roundstart_use;
-- 
2.39.2