Merged master.

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

diff --git a/qcsrc/common/triggers/platforms.qc b/qcsrc/common/triggers/platforms.qc
index 9d2b3f2bc371911fe65a3120db65064c49fa1339..09e733000f21dc4582627f670a766af704545de8 100644 (file)
--- a/qcsrc/common/triggers/platforms.qc
+++ b/qcsrc/common/triggers/platforms.qc
@@ -1,18 +1,18 @@
-void generic_plat_blocked()
+#include "platforms.qh"
+void generic_plat_blocked(entity this, entity blocker)
 {
 #ifdef SVQC
-    SELFPARAM();
-       if(this.dmg && other.takedamage != DAMAGE_NO)
+       if(this.dmg && blocker.takedamage != DAMAGE_NO)
        {
                if(this.dmgtime2 < time)
                {
-                       Damage (other, this, this, this.dmg, DEATH_HURTTRIGGER.m_id, other.origin, '0 0 0');
+                       Damage (blocker, this, this, this.dmg, DEATH_HURTTRIGGER.m_id, blocker.origin, '0 0 0');
                        this.dmgtime2 = time + this.dmgtime;
                }
 
                // Gib dead/dying stuff
-               if(IS_DEAD(other))
-                       Damage (other, this, this, 10000, DEATH_HURTTRIGGER.m_id, other.origin, '0 0 0');
+               if(IS_DEAD(blocker))
+                       Damage (blocker, this, this, 10000, DEATH_HURTTRIGGER.m_id, blocker.origin, '0 0 0');
        }
 #endif
 }
@@ -24,7 +24,7 @@ void plat_spawn_inside_trigger(entity this)
 
        trigger = spawn();
        settouch(trigger, plat_center_touch);
-       trigger.movetype = MOVETYPE_NONE;
+       set_movetype(trigger, MOVETYPE_NONE);
        trigger.solid = SOLID_TRIGGER;
        trigger.enemy = this;
 
@@ -54,8 +54,8 @@ void plat_spawn_inside_trigger(entity this)
                        }
 
        // otherwise, something is fishy...
-       remove(trigger);
-       objerror("plat_spawn_inside_trigger: platform has odd size or lip, can't spawn");
+       delete(trigger);
+       objerror(this, "plat_spawn_inside_trigger: platform has odd size or lip, can't spawn");
 }
 
 void plat_hit_top(entity this)
@@ -63,8 +63,8 @@ void plat_hit_top(entity this)
        _sound (this, CH_TRIGGER_SINGLE, this.noise1, VOL_BASE, ATTEN_NORM);
        this.state = 1;
 
-       SUB_THINK(this, plat_go_down);
-       this.SUB_NEXTTHINK = this.SUB_LTIME + 3;
+       setthink(this, plat_go_down);
+       this.nextthink = this.ltime + 3;
 }
 
 void plat_hit_bottom(entity this)
@@ -87,37 +87,37 @@ void plat_go_up(entity this)
        SUB_CalcMove (this, this.pos1, TSPEED_LINEAR, this.speed, plat_hit_top);
 }
 
-void plat_center_touch(entity this)
+void plat_center_touch(entity this, entity toucher)
 {
 #ifdef SVQC
-       if (!other.iscreature)
+       if (!toucher.iscreature)
                return;
 
-       if (other.health <= 0)
+       if (toucher.health <= 0)
                return;
 #elif defined(CSQC)
-       if (!IS_PLAYER(other))
+       if (!IS_PLAYER(toucher))
                return;
-       if(IS_DEAD(other))
+       if(IS_DEAD(toucher))
                return;
 #endif
 
        if (this.enemy.state == 2) {
                plat_go_up(this.enemy);
        } else if (this.enemy.state == 1)
-               this.enemy.SUB_NEXTTHINK = this.enemy.SUB_LTIME + 1;
+               this.enemy.nextthink = this.enemy.ltime + 1;
 }
 
-void plat_outside_touch(entity this)
+void plat_outside_touch(entity this, entity toucher)
 {
 #ifdef SVQC
-       if (!other.iscreature)
+       if (!toucher.iscreature)
                return;
 
-       if (other.health <= 0)
+       if (toucher.health <= 0)
                return;
 #elif defined(CSQC)
-       if (!IS_PLAYER(other))
+       if (!IS_PLAYER(toucher))
                return;
 #endif
 
@@ -129,34 +129,29 @@ void plat_outside_touch(entity this)
 
 void plat_trigger_use(entity this, entity actor, entity trigger)
 {
-#ifdef SVQC
        if (getthink(this))
                return;         // already activated
-#elif defined(CSQC)
-       if(this.move_think)
-               return;
-#endif
        plat_go_down(this);
 }
 
 
-void plat_crush()
-{SELFPARAM();
-       if((this.spawnflags & 4) && (other.takedamage != DAMAGE_NO))
+void plat_crush(entity this, entity blocker)
+{
+       if((this.spawnflags & 4) && (blocker.takedamage != DAMAGE_NO))
        { // KIll Kill Kill!!
 #ifdef SVQC
-               Damage (other, this, this, 10000, DEATH_HURTTRIGGER.m_id, other.origin, '0 0 0');
+               Damage (blocker, this, this, 10000, DEATH_HURTTRIGGER.m_id, blocker.origin, '0 0 0');
 #endif
        }
        else
        {
 #ifdef SVQC
-               if((this.dmg) && (other.takedamage != DAMAGE_NO))
+               if((this.dmg) && (blocker.takedamage != DAMAGE_NO))
                {   // Shall we bite?
-                       Damage (other, this, this, this.dmg, DEATH_HURTTRIGGER.m_id, other.origin, '0 0 0');
+                       Damage (blocker, this, this, this.dmg, DEATH_HURTTRIGGER.m_id, blocker.origin, '0 0 0');
                        // Gib dead/dying stuff
-                       if(IS_DEAD(other))
-                               Damage (other, this, this, 10000, DEATH_HURTTRIGGER.m_id, other.origin, '0 0 0');
+                       if(IS_DEAD(blocker))
+                               Damage (blocker, this, this, 10000, DEATH_HURTTRIGGER.m_id, blocker.origin, '0 0 0');
                }
 #endif
 
@@ -174,7 +169,7 @@ void plat_use(entity this, entity actor, entity trigger)
 {
        this.use = func_null;
        if (this.state != 4)
-               objerror ("plat_use: not in up state");
+               objerror (this, "plat_use: not in up state");
        plat_go_down(this);
 }
 
@@ -184,13 +179,13 @@ void plat_reset(entity this)
 {
        IFTARGETED
        {
-               setorigin (this, this.pos1);
+               setorigin(this, this.pos1);
                this.state = 4;
                this.use = plat_use;
        }
        else
        {
-               setorigin (this, this.pos2);
+               setorigin(this, this.pos2);
                this.state = 2;
                this.use = plat_trigger_use;
        }
@@ -222,7 +217,7 @@ bool set_platmovetype(entity e, string s)
 
        if(!cubic_speedfunc_is_sane(e.platmovetype_start, e.platmovetype_end))
        {
-               objerror("Invalid platform move type; platform would go in reverse, which is not allowed.");
+               objerror(e, "Invalid platform move type; platform would go in reverse, which is not allowed.");
                return false;
        }