From: Rudolf Polzer <divVerent@xonotic.org>
Date: Sun, 12 Jun 2011 12:03:02 +0000 (+0200)
Subject: simply assault code a bit
X-Git-Tag: xonotic-v0.5.0~211^2~5
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=7d6a0c4cebcd4b9e97ad9bfa559984170bdce983;p=xonotic%2Fxonotic-data.pk3dir.git

simply assault code a bit
---

diff --git a/qcsrc/server/assault.qc b/qcsrc/server/assault.qc
index 05b2cc750..300618983 100644
--- a/qcsrc/server/assault.qc
+++ b/qcsrc/server/assault.qc
@@ -30,9 +30,6 @@ void assault_objective_reset() {
 }
 
 void assault_objective_use() {
-	if(other.classname == "info_player_deathmatch") // a spawn, a spawn
-		return;
-
 	// activate objective
 	self.health = 100;
 	//print("^2Activated objective ", self.targetname, "=", etos(self), "\n");
diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 51f8cf2c1..5f265468c 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1084,7 +1084,11 @@ void PutClientInServer (void)
 		oldself = self;
 		self = spot;
 			activator = oldself;
+				string s;
+				s = self.target;
+				self.target = string_null;
 				SUB_UseTargets();
+				self.target = s;
 			activator = world;
 		self = oldself;