Clean out self from most NET_HANDLEs

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / turrets / targettrigger.qc

diff --git a/qcsrc/common/turrets/targettrigger.qc b/qcsrc/common/turrets/targettrigger.qc
index 98c23c4584df4e98a4707c33f3121aee48ad55a5..d3deda07019320256a88295d3b0d3f38b388f9a7 100644 (file)
--- a/qcsrc/common/turrets/targettrigger.qc
+++ b/qcsrc/common/turrets/targettrigger.qc
@@ -1,4 +1,4 @@
-void spawnfunc_turret_targettrigger();
+spawnfunc(turret_targettrigger);
 void turret_targettrigger_touch();
 
 void turret_targettrigger_touch()
@@ -27,11 +27,11 @@ void turret_targettrigger_touch()
 
 /*QUAKED turret_targettrigger (.5 .5 .5) ?
 */
-void spawnfunc_turret_targettrigger()
-{SELFPARAM();
-    if(!autocvar_g_turrets) { remove(self); return; }
+spawnfunc(turret_targettrigger)
+{
+    if(!autocvar_g_turrets) { remove(this); return; }
 
-    InitTrigger ();
+    WITHSELF(this, InitTrigger());
 
-    self.touch = turret_targettrigger_touch;
+    this.touch = turret_targettrigger_touch;
 }