Merge branch 'master' into terencehill/translate_colors_2

[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 bdf05a00936b48e2fe3c12d8b5c8f54c29c25094..4c97fe6a8aa7c1d7584c4fb63d7c024a247c968e 100644 (file)
--- a/qcsrc/common/triggers/func/door_rotating.qc
+++ b/qcsrc/common/triggers/func/door_rotating.qc
@@ -27,16 +27,16 @@ START_OPEN causes the door to move to its destination when spawned, and operate
 FIXME: only one sound set available at the time being
 */
 
-void door_rotating_reset()
+void door_rotating_reset(entity this)
 {
-       self.angles = self.pos1;
-       self.avelocity = '0 0 0';
-       self.state = STATE_BOTTOM;
-       self.think = func_null;
-       self.nextthink = 0;
+       this.angles = this.pos1;
+       this.avelocity = '0 0 0';
+       this.state = STATE_BOTTOM;
+       this.think = func_null;
+       this.nextthink = 0;
 }
 
-void door_rotating_init_startopen()
+void door_rotating_init_startopen(entity this)
 {
        self.angles = self.movedir;
        self.pos2 = '0 0 0';
@@ -44,7 +44,7 @@ void door_rotating_init_startopen()
 }
 
 
-void spawnfunc_func_door_rotating()
+spawnfunc(func_door_rotating)
 {
 
        //if (!self.deathtype) // map makers can override this