Merge branch 'master' into Mario/turrets

[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 279b41ec401c7599daa0cc6f5f0a8505f8540720..110ae1dea7d26075ef64665e8ae69af027b7d13a 100644 (file)
--- a/qcsrc/common/turrets/unit/plasma_dual.qc
+++ b/qcsrc/common/turrets/unit/plasma_dual.qc
@@ -48,7 +48,7 @@ float t_plasma_dual(float req)
                                self.tur_head.frame += 1;
                        }
 
                                self.tur_head.frame += 1;
                        }
 

-                       return TRUE;
+                       return true;

                }
                case TR_THINK:
                {
                }
                case TR_THINK:
                {


@@ -58,11 +58,11 @@ float t_plasma_dual(float req)
                        if (self.tur_head.frame > 6)
                                self.tur_head.frame = 0;
 
                        if (self.tur_head.frame > 6)
                                self.tur_head.frame = 0;
 

-                       return TRUE;
+                       return true;

                }
                case TR_DEATH:
                {
                }
                case TR_DEATH:
                {

-                       return TRUE;
+                       return true;

                }
                case TR_SETUP:
                {
                }
                case TR_SETUP:
                {


@@ -73,17 +73,17 @@ float t_plasma_dual(float req)
                        
                        turret_do_updates(self);
 
                        
                        turret_do_updates(self);
 

-                       return TRUE;
+                       return true;

                }
                case TR_PRECACHE:
                {
                        precache_model ("models/turrets/base.md3");
                        precache_model ("models/turrets/plasmad.md3");
                }
                case TR_PRECACHE:
                {
                        precache_model ("models/turrets/base.md3");
                        precache_model ("models/turrets/plasmad.md3");

-                       return TRUE;
+                       return true;

                }
        }
 
                }
        }
 

-       return TRUE;
+       return true;

 }
 
 #endif // SVQC
 }
 
 #endif // SVQC


@@ -94,15 +94,15 @@ float t_plasma_dual(float req)
        {
                case TR_SETUP:
                {
        {
                case TR_SETUP:
                {

-                       return TRUE;
+                       return true;

                }
                case TR_PRECACHE:
                {
                }
                case TR_PRECACHE:
                {

-                       return TRUE;
+                       return true;

                }
        }
 
                }
        }
 

-       return TRUE;
+       return true;

 }
 
 #endif // CSQC
 }
 
 #endif // CSQC