Step 6: complete

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

diff --git a/qcsrc/common/triggers/func/door.qc b/qcsrc/common/triggers/func/door.qc
index c478079f546c3102ce6f6838b3332b057e666ea9..86d7cb2974f997f9a0a9bdd9a83133b0e04847eb 100644 (file)
--- a/qcsrc/common/triggers/func/door.qc
+++ b/qcsrc/common/triggers/func/door.qc
@@ -25,8 +25,8 @@ void door_go_up(entity this);
 void door_rotating_go_down(entity this);
 void door_rotating_go_up(entity this);
 
-void door_blocked()
-{SELFPARAM();
+void door_blocked(entity this)
+{
        if((this.spawnflags & 8)
 #ifdef SVQC
                && (other.takedamage != DAMAGE_NO)
@@ -209,7 +209,7 @@ bool door_check_keys(entity door, entity player)
 void door_fire(entity this, entity actor, entity trigger)
 {
        if (this.owner != this)
-               objerror ("door_fire: this.owner != this");
+               objerror (this, "door_fire: this.owner != this");
 
        if (this.spawnflags & DOOR_TOGGLE)
        {
@@ -722,7 +722,7 @@ spawnfunc(func_door)
        precache_sound(this.noise);
        precache_sound(this.noise3);
 
-       this.blocked = door_blocked;
+       setblocked(this, door_blocked);
        this.use = door_use;
 
        if(this.dmg && (this.message == ""))