Merge branch 'master' into TimePath/global_self

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

diff --git a/qcsrc/common/turrets/unit/plasma_dual.qc b/qcsrc/common/turrets/unit/plasma_dual.qc
index e2432dd0fb8ed3595c5b2ebe2bd89bf9ce7df459..47dd34ae8969e52fed7509b002f5e037d8c0a5be 100644 (file)
--- a/qcsrc/common/turrets/unit/plasma_dual.qc
+++ b/qcsrc/common/turrets/unit/plasma_dual.qc
@@ -11,100 +11,98 @@ REGISTER_TURRET(
 );
 #else
 #ifdef SVQC
-void spawnfunc_turret_plasma_dual() { if(!turret_initialize(TUR_PLASMA_DUAL)) remove(self); }
+void spawnfunc_turret_plasma_dual() { SELFPARAM(); if(!turret_initialize(TUR_PLASMA_DUAL)) remove(self); }
 
 float t_plasma_dual(float req)
-{
-       switch(req)
-       {
-               case TR_ATTACK:
-               {
-                       if(g_instagib)
-                       {
-                               float flying;
-                               flying = IsFlying(self); // do this BEFORE to make the trace values from FireRailgunBullet last
-
-                               FireRailgunBullet (self.tur_shotorg, self.tur_shotorg + self.tur_shotdir_updated * MAX_SHOT_DISTANCE, 10000000000,
-                                                                  800, 0, 0, 0, 0, DEATH_TURRET_PLASMA);
-
-
-                               pointparticles(particleeffectnum("nex_muzzleflash"), self.tur_shotorg, self.tur_shotdir_updated * 1000, 1);
-
-                               // teamcolor / hit beam effect
-                               vector v;
-                               string s;
-                               v = WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos);
-                               s = strcat("TE_TEI_G3", ((self.team) ? Static_Team_ColorName_Upper(self.team) : ""));
-                               
-                               WarpZone_TrailParticles(world, particleeffectnum(s), self.tur_shotorg, v);
-                                       
-                               self.tur_head.frame += 1;
-                       }
-                       else
-                       {
-                               entity missile = turret_projectile("weapons/hagar_fire.wav", 1, 0, DEATH_TURRET_PLASMA, PROJECTILE_ELECTRO_BEAM, TRUE, TRUE);
-                               missile.missile_flags = MIF_SPLASH;
-                               pointparticles(particleeffectnum("laser_muzzleflash"), self.tur_shotorg, self.tur_shotdir_updated * 1000, 1);
-                               self.tur_head.frame += 1;
-                       }
-
-                       return TRUE;
-               }
-               case TR_THINK:
-               {
-                       if ((self.tur_head.frame != 0) && (self.tur_head.frame != 3))
-                               self.tur_head.frame = self.tur_head.frame + 1;
-
-                       if (self.tur_head.frame > 6)
-                               self.tur_head.frame = 0;
-
-                       return TRUE;
-               }
-               case TR_DEATH:
-               {
-                       return TRUE;
-               }
-               case TR_SETUP:
-               {
-                       self.ammo_flags = TFL_AMMO_ENERGY | TFL_AMMO_RECHARGE | TFL_AMMO_RECIEVE;
-                       self.damage_flags |= TFL_DMG_HEADSHAKE;
-                       self.firecheck_flags |= TFL_FIRECHECK_AFF;
-                       self.aim_flags = TFL_AIM_LEAD | TFL_AIM_SHOTTIMECOMPENSATE | TFL_AIM_SPLASH;
-                       
-                       turret_do_updates(self);
-
-                       return TRUE;
-               }
-               case TR_PRECACHE:
-               {
-                       precache_model ("models/turrets/base.md3");
-                       precache_model ("models/turrets/plasmad.md3");
-                       return TRUE;
-               }
-       }
-
-       return TRUE;
+{SELFPARAM();
+    switch(req)
+    {
+        case TR_ATTACK:
+        {
+            if(g_instagib)
+            {
+                float flying;
+                flying = IsFlying(self); // do this BEFORE to make the trace values from FireRailgunBullet last
+
+                FireRailgunBullet (self.tur_shotorg, self.tur_shotorg + self.tur_shotdir_updated * MAX_SHOT_DISTANCE, 10000000000,
+                                   800, 0, 0, 0, 0, DEATH_TURRET_PLASMA);
+
+
+                Send_Effect(EFFECT_VORTEX_MUZZLEFLASH, self.tur_shotorg, self.tur_shotdir_updated * 1000, 1);
+
+                // teamcolor / hit beam effect
+                vector v;
+                string s;
+                v = WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos);
+                s = strcat(EFFECT_VAPORIZER_NEUTRAL.eent_eff_name, ((self.team) ? Static_Team_ColorName_Upper(self.team) : ""));
+
+                WarpZone_TrailParticles(world, _particleeffectnum(s), self.tur_shotorg, v);
+
+                self.tur_head.frame += 1;
+            }
+            else
+            {
+                entity missile = turret_projectile(W_Sound("hagar_fire"), 1, 0, DEATH_TURRET_PLASMA, PROJECTILE_ELECTRO_BEAM, TRUE, TRUE);
+                missile.missile_flags = MIF_SPLASH;
+                Send_Effect(EFFECT_BLASTER_MUZZLEFLASH, self.tur_shotorg, self.tur_shotdir_updated * 1000, 1);
+                self.tur_head.frame += 1;
+            }
+
+            return true;
+        }
+        case TR_THINK:
+        {
+            if ((self.tur_head.frame != 0) && (self.tur_head.frame != 3))
+                self.tur_head.frame = self.tur_head.frame + 1;
+
+            if (self.tur_head.frame > 6)
+                self.tur_head.frame = 0;
+
+            return true;
+        }
+        case TR_DEATH:
+        {
+            return true;
+        }
+        case TR_SETUP:
+        {
+            self.ammo_flags = TFL_AMMO_ENERGY | TFL_AMMO_RECHARGE | TFL_AMMO_RECIEVE;
+            self.damage_flags |= TFL_DMG_HEADSHAKE;
+            self.firecheck_flags |= TFL_FIRECHECK_AFF;
+            self.aim_flags = TFL_AIM_LEAD | TFL_AIM_SHOTTIMECOMPENSATE | TFL_AIM_SPLASH;
+
+            turret_do_updates(self);
+
+            return true;
+        }
+        case TR_PRECACHE:
+        {
+            precache_model ("models/turrets/base.md3");
+            precache_model ("models/turrets/plasmad.md3");
+            return true;
+        }
+    }
+
+    return true;
 }
 
 #endif // SVQC
 #ifdef CSQC
 float t_plasma_dual(float req)
 {
-       switch(req)
-       {
-               case TR_SETUP:
-               {
-                       return TRUE;
-               }
-               case TR_PRECACHE:
-               {
-                       precache_model ("models/turrets/base.md3");
-                       precache_model ("models/turrets/plasmad.md3");
-                       return TRUE;
-               }
-       }
-
-       return TRUE;
+    switch(req)
+    {
+        case TR_SETUP:
+        {
+            return true;
+        }
+        case TR_PRECACHE:
+        {
+            return true;
+        }
+    }
+
+    return true;
 }
 
 #endif // CSQC