Merge branch 'TimePath/modules'

[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 15dbaec4f009b0c8d87fba54e6c0269c72f41709..f2a97d4a12529e6fd576819d7509b5bd55597937 100644 (file)
--- a/qcsrc/common/turrets/targettrigger.qc
+++ b/qcsrc/common/turrets/targettrigger.qc
@@ -1,13 +1,14 @@
+#include "targettrigger.qh"
 spawnfunc(turret_targettrigger);
-void turret_targettrigger_touch(entity this);
+void turret_targettrigger_touch(entity this, entity toucher);
 
-void turret_targettrigger_touch(entity this)
+void turret_targettrigger_touch(entity this, entity toucher)
 {
     if (this.cnt > time) return;
     FOREACH_ENTITY_STRING_ORDERED(targetname, this.target, {
         if (!(it.turret_flags & TUR_FLAG_RECIEVETARGETS)) continue;
         if (!it.turret_addtarget) continue;
-        it.turret_addtarget(it, other, this);
+        it.turret_addtarget(it, toucher, this);
     });
     this.cnt = time + 0.5;
 }
@@ -16,7 +17,7 @@ void turret_targettrigger_touch(entity this)
 */
 spawnfunc(turret_targettrigger)
 {
-    if(!autocvar_g_turrets) { remove(this); return; }
+    if(!autocvar_g_turrets) { delete(this); return; }
 
     InitTrigger(this);