simply assault code a bit

diff --git a/qcsrc/server/assault.qc b/qcsrc/server/assault.qc
index 05b2cc750232e5fbc65a5136decf6d524c864fee..3006189834d91bc722d331cb046f034ccbfd5150 100644 (file)
--- 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 51f8cf2c15560a53da75ee365e4f3e42079ea122..5f265468c90ff1a6facc5d1b2050cee3ad4f4892 100644 (file)
--- 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;