Merge branch 'sev/luma_update' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / trigger / jumppads.qc

diff --git a/qcsrc/common/triggers/trigger/jumppads.qc b/qcsrc/common/triggers/trigger/jumppads.qc
index e90f0bfc30bcb07a54c69a6ae61ef69be83f4329..44413a9c4b9171f8182c0cf8a04f9de0b08e8e24 100644 (file)
--- a/qcsrc/common/triggers/trigger/jumppads.qc
+++ b/qcsrc/common/triggers/trigger/jumppads.qc
@@ -271,10 +271,10 @@ void trigger_push_touch()
 
 #ifdef SVQC
 void trigger_push_link();
-void trigger_push_updatelink();
+void trigger_push_updatelink(entity this);
 #endif
-void trigger_push_findtarget()
-{SELFPARAM();
+void trigger_push_findtarget(entity this)
+{
        entity t;
        vector org;
 
@@ -351,8 +351,8 @@ float trigger_push_send(entity this, entity to, float sf)
        return true;
 }
 
-void trigger_push_updatelink()
-{SELFPARAM();
+void trigger_push_updatelink(entity this)
+{
        this.SendFlags |= 1;
 }
 
@@ -381,7 +381,7 @@ spawnfunc(trigger_push)
        trigger_init(this);
 
        this.active = ACTIVE_ACTIVE;
-       this.use1 = trigger_push_use;
+       this.use = trigger_push_use;
        this.touch = trigger_push_touch;
 
        // normal push setup
@@ -437,8 +437,6 @@ spawnfunc(target_position) { target_push_init(this); }
 
 NET_HANDLE(ENT_CLIENT_TRIGGER_PUSH, bool isnew)
 {
-       make_pure(this);
-
        this.classname = "jumppad";
        int mytm = ReadByte(); if(mytm) { this.team = mytm - 1; }
        this.spawnflags = ReadInt24_t();