Merge remote branch 'refs/remotes/origin/fruitiex/racefixes'

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

diff --git a/qcsrc/server/t_jumppads.qc b/qcsrc/server/t_jumppads.qc
index 606f3b3dec4ce63d70b35ffecf4b259672a0a9cc..df5788f4c3a0ff251854b2fd9d5235b23b99a073 100644 (file)
--- a/qcsrc/server/t_jumppads.qc
+++ b/qcsrc/server/t_jumppads.qc
@@ -231,25 +231,6 @@ void trigger_push_touch()
        }
 };
 
-void trigger_push_setactive(float astate)
-{
-       self.active = astate;
-               
-       if(astate == ACTIVE_NOT)
-               self.touch = SUB_Null;
-       else if (astate == ACTIVE_TOGGLE)
-       {
-               if(self.active)
-                       self.active = ACTIVE_NOT;
-               else
-                       self.active = ACTIVE_ACTIVE;
-       }
-       else
-               self.touch = trigger_push_touch;
-}
-
-
-
 .vector dest;
 void trigger_push_findtarget()
 {
@@ -310,7 +291,6 @@ void spawnfunc_trigger_push()
        EXACTTRIGGER_INIT;
        
        self.active = ACTIVE_ACTIVE;    
-       self.setactive = trigger_push_setactive;
        self.use = trigger_push_use;
        self.touch = trigger_push_touch;