X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fturrets%2Funit%2Ffusionreactor.qc;h=3b6389a96428a66be641f4012987dd652db9ef1f;hp=459c1263a75467629ee7d4f4aadbdec5437cd14d;hb=2cbe50a41fcd237cdc76136a22842c18e739cbcc;hpb=08e6497842b33529d0c1b0caa431b49ca98d79da

diff --git a/qcsrc/common/turrets/unit/fusionreactor.qc b/qcsrc/common/turrets/unit/fusionreactor.qc
index 459c1263a..3b6389a96 100644
--- a/qcsrc/common/turrets/unit/fusionreactor.qc
+++ b/qcsrc/common/turrets/unit/fusionreactor.qc
@@ -1,4 +1,4 @@
-#ifdef REGISTER_TURRET
+#ifndef IMPLEMENTATION
 REGISTER_TURRET(
 /* TUR_##id   */ FUSIONREACTOR,
 /* function   */ t_fusionreactor,
@@ -11,39 +11,39 @@ REGISTER_TURRET(
 );
 #else
 #ifdef SVQC
-float turret_fusionreactor_firecheck()
-{
+bool turret_fusionreactor_firecheck()
+{SELFPARAM();
     if (self.attack_finished_single > time)
-        return 0;
+        return false;
 
     if (self.enemy.deadflag != DEAD_NO)
-        return 0;
+        return false;
 
     if (self.enemy == world)
-        return 0;
+        return false;
 
     if (self.ammo < self.shot_dmg)
-        return 0;
+        return false;
 
     if (self.enemy.ammo >= self.enemy.ammo_max)
-        return 0;
+        return false;
 
     if (vlen(self.enemy.origin - self.origin) > self.target_range)
-        return 0;
+        return false;
 
     if(self.team != self.enemy.team)
-        return 0;
+        return false;
 
     if(!(self.enemy.ammo_flags & TFL_AMMO_ENERGY))
-        return 0;
+        return false;
 
-    return 1;
+    return true;
 }
 
-void spawnfunc_turret_fusionreactor() { if(!turret_initialize(TUR_FUSIONREACTOR)) remove(self); }
+spawnfunc(turret_fusionreactor) { if(!turret_initialize(TUR_FUSIONREACTOR.m_id)) remove(self); }
 
 float t_fusionreactor(float req)
-{
+{SELFPARAM();
     switch(req)
     {
         case TR_ATTACK:
@@ -84,8 +84,6 @@ float t_fusionreactor(float req)
         }
         case TR_PRECACHE:
         {
-            precache_model ("models/turrets/base.md3");
-            precache_model ("models/turrets/reactor.md3");
             return true;
         }
     }