Merge branch 'master' into Mario/turrets

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

diff --git a/qcsrc/common/turrets/unit/plasma.qc b/qcsrc/common/turrets/unit/plasma.qc
index 0cd18fa912e6abedef6b6d217a381874cb8d7f38..095aa9d02d749485d7b30d5e97c94bf059123432 100644 (file)
--- a/qcsrc/common/turrets/unit/plasma.qc
+++ b/qcsrc/common/turrets/unit/plasma.qc
@@ -19,7 +19,7 @@ float t_plasma(float req)
        {
                case TR_ATTACK:
                {
-                       if(g_minstagib)
+                       if(g_instagib)
                        {
                                float flying;
                                flying = IsFlying(self); // do this BEFORE to make the trace values from FireRailgunBullet last
@@ -33,7 +33,7 @@ float t_plasma(float req)
                                vector v;
                                string s;
                                v = WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos);
-                               s = strcat("TE_TEI_G3", Static_Team_ColorName_Upper(self.team));
+                               s = strcat("TE_TEI_G3", ((self.team) ? Static_Team_ColorName_Upper(self.team) : ""));
                                
                                WarpZone_TrailParticles(world, particleeffectnum(s), self.tur_shotorg, v);
                                
@@ -50,7 +50,7 @@ float t_plasma(float req)
                                        self.tur_head.frame = 1;
                        }
 
-                       return TRUE;
+                       return true;
                }
                case TR_THINK:
                {
@@ -60,11 +60,11 @@ float t_plasma(float req)
                        if (self.tur_head.frame > 5)
                                self.tur_head.frame = 0;
 
-                       return TRUE;
+                       return true;
                }
                case TR_DEATH:
                {
-                       return TRUE;
+                       return true;
                }
                case TR_SETUP:
                {
@@ -75,17 +75,17 @@ float t_plasma(float req)
                        
                        turret_do_updates(self);
 
-                       return TRUE;
+                       return true;
                }
                case TR_PRECACHE:
                {
                        precache_model ("models/turrets/base.md3");
                        precache_model ("models/turrets/plasma.md3");
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // SVQC
@@ -96,17 +96,15 @@ float t_plasma(float req)
        {
                case TR_SETUP:
                {
-                       return TRUE;
+                       return true;
                }
                case TR_PRECACHE:
                {
-                       precache_model ("models/turrets/base.md3");
-                       precache_model ("models/turrets/plasma.md3");
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // CSQC