Merge branch 'master' into Mirio/balance

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

diff --git a/qcsrc/common/triggers/func/door_rotating.qc b/qcsrc/common/triggers/func/door_rotating.qc
index 504005e362733e18de841000c848af1ef7b76c4d..2c72dc9cf07c1b249d91648683f0e3f4396017a9 100644 (file)
--- a/qcsrc/common/triggers/func/door_rotating.qc
+++ b/qcsrc/common/triggers/func/door_rotating.qc
@@ -1,3 +1,4 @@
+#include "door_rotating.qh"
 #ifdef SVQC
 /*QUAKED spawnfunc_func_door_rotating (0 .5 .8) ? START_OPEN BIDIR DOOR_DONT_LINK BIDIR_IN_DOWN x TOGGLE X_AXIS Y_AXIS
 if two doors touch, they are assumed to be connected and operate as a unit.
@@ -38,9 +39,9 @@ void door_rotating_reset(entity this)
 
 void door_rotating_init_startopen(entity this)
 {
-       self.angles = self.movedir;
-       self.pos2 = '0 0 0';
-       self.pos1 = self.movedir;
+       this.angles = this.movedir;
+       this.pos2 = '0 0 0';
+       this.pos1 = this.movedir;
 }
 
 
@@ -71,7 +72,7 @@ spawnfunc(func_door_rotating)
        //this.effects |= EF_LOWPRECISION;
        this.classname = "door_rotating";
 
-       this.blocked = door_blocked;
+       setblocked(this, door_blocked);
        this.use = door_use;
 
     if(this.spawnflags & 8)