Merge branch 'master' into Mirio/balance

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

diff --git a/qcsrc/common/triggers/func/conveyor.qc b/qcsrc/common/triggers/func/conveyor.qc
index fb50a6613c14ce5dab6c3ea43d54978fd6e4822b..5cd17e7bfc3e1544cdeca427a884d09b5b542828 100644 (file)
--- a/qcsrc/common/triggers/func/conveyor.qc
+++ b/qcsrc/common/triggers/func/conveyor.qc
@@ -58,11 +58,11 @@ void conveyor_think()
 
 #ifdef SVQC
 
-void conveyor_use()
-{SELFPARAM();
-       self.state = !self.state;
+void conveyor_use(entity this, entity actor, entity trigger)
+{
+       this.state = !this.state;
 
-       self.SendFlags |= 2;
+       this.SendFlags |= 2;
 }
 
 void conveyor_reset(entity this)
@@ -147,7 +147,7 @@ spawnfunc(func_conveyor)
 
 #elif defined(CSQC)
 
-void conveyor_draw(entity this) { WITH(entity, self, this, conveyor_think()); }
+void conveyor_draw(entity this) { WITHSELF(this, conveyor_think()); }
 
 void conveyor_init()
 {SELFPARAM();