X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ffunc%2Fconveyor.qc;h=b8c1310d8ca70dc148977d113d3eb4983d8d814d;hp=4f5a7d6ea591f50b5ffbbf9bca9a3cb6874874a1;hb=9ae63d858415772fdb60bd549758825103c0ba17;hpb=c89dfaa4d0342b98c320621557973a65114fbdf4

diff --git a/qcsrc/common/triggers/func/conveyor.qc b/qcsrc/common/triggers/func/conveyor.qc
index 4f5a7d6ea5..b8c1310d8c 100644
--- a/qcsrc/common/triggers/func/conveyor.qc
+++ b/qcsrc/common/triggers/func/conveyor.qc
@@ -70,8 +70,8 @@ void conveyor_reset()
 	self.SendFlags |= 2;
 }
 
-bool conveyor_send(entity to, int sf)
-{SELFPARAM();
+bool conveyor_send(entity this, entity to, int sf)
+{
 	WriteByte(MSG_ENTITY, ENT_CLIENT_CONVEYOR);
 	WriteByte(MSG_ENTITY, sf);
 
@@ -129,15 +129,15 @@ void conveyor_init()
 	self.SendFlags |= 1;
 }
 
-void spawnfunc_trigger_conveyor()
+spawnfunc(trigger_conveyor)
 {
 	SetMovedir();
 	EXACTTRIGGER_INIT;
 	conveyor_init();
 }
 
-void spawnfunc_func_conveyor()
-{SELFPARAM();
+spawnfunc(func_conveyor)
+{
 	SetMovedir();
 	InitMovingBrushTrigger();
 	self.movetype = MOVETYPE_NONE;
@@ -146,9 +146,11 @@ void spawnfunc_func_conveyor()
 
 #elif defined(CSQC)
 
+void conveyor_draw(entity this) { WITH(entity, self, this, conveyor_think()); }
+
 void conveyor_init()
 {SELFPARAM();
-	self.draw = conveyor_think;
+	self.draw = conveyor_draw;
 	self.drawmask = MASK_NORMAL;
 
 	self.movetype = MOVETYPE_NONE;