Merge remote-tracking branch 'origin/master' into terencehill/menu_focus_stuff

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_triggers.qc

diff --git a/qcsrc/server/g_triggers.qc b/qcsrc/server/g_triggers.qc
index 10a78fb99dfe0230943211b4f259c47f7a7f2185..12c75ae9e57199fb5499b0a910c5ecda94d3ed42 100644 (file)
--- a/qcsrc/server/g_triggers.qc
+++ b/qcsrc/server/g_triggers.qc
@@ -66,7 +66,7 @@ void SUB_UseTargets()
                if(clienttype(activator) == CLIENTTYPE_REAL)
                {
                        centerprint (activator, self.message);
-                       if (!self.noise)
+                       if (self.noise == "")
                                play2(activator, "misc/talk.wav");
                }
        }
@@ -255,6 +255,7 @@ void multi_reset()
                self.solid = SOLID_BBOX;
        }
        self.think = func_null;
+       self.nextthink = 0;
        self.team = self.team_saved;
 }
 
@@ -360,6 +361,7 @@ void delay_use()
 void delay_reset()
 {
        self.think = func_null;
+       self.nextthink = 0;
 }
 
 void spawnfunc_trigger_delay()
@@ -474,17 +476,6 @@ void trigger_hurt_touch()
                        Damage(other, self, self, self.dmg, DEATH_HURTTRIGGER, other.origin, '0 0 0');
                }
        }
-       else
-       {
-               if (!other.owner)
-               {
-                       if (other.classname == "rune")                  // reset runes
-                       {
-                               EXACTTRIGGER_TOUCH;
-                               other.nextthink = min(other.nextthink, time + 1);
-                       }
-               }
-       }
 
        return;
 }
@@ -506,9 +497,9 @@ void spawnfunc_trigger_hurt()
        self.enemy = world; // I hate you all
        if (!self.dmg)
                self.dmg = 1000;
-       if (!self.message)
+       if (self.message == "")
                self.message = "was in the wrong place";
-       if (!self.message2)
+       if (self.message2 == "")
                self.message2 = "was thrown into a world of hurt by";
        // self.message = "someone like %s always gets wrongplaced";
 
@@ -1337,9 +1328,9 @@ void spawnfunc_misc_laser()
        if(self.colormod == '0 0 0')
                if(!self.alpha)
                        self.colormod = '1 0 0';
-       if(!self.message)
+       if(self.message == "")
                self.message = "saw the light";
-       if (!self.message2)
+       if (self.message2 == "")
                self.message2 = "was pushed into a laser by";
        if(!self.scale)
                self.scale = 1;