Merge branch 'master' into Mario/turrets

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

diff --git a/qcsrc/common/turrets/unit/hellion.qc b/qcsrc/common/turrets/unit/hellion.qc
index c611e6d0ec300c3d1a9aebdbfe6f29b5d6f12286..d090ef7ce52135f62458bb3232246cd24298e1f5 100644 (file)
--- a/qcsrc/common/turrets/unit/hellion.qc
+++ b/qcsrc/common/turrets/unit/hellion.qc
@@ -101,7 +101,7 @@ float t_hellion(float req)
                        missile.missile_flags = MIF_SPLASH | MIF_PROXY | MIF_GUIDED_HEAT;
                        self.tur_head.frame += 1;
                        
                        missile.missile_flags = MIF_SPLASH | MIF_PROXY | MIF_GUIDED_HEAT;
                        self.tur_head.frame += 1;
                        

-                       return TRUE;
+                       return true;

                }
                case TR_THINK:
                {
                }
                case TR_THINK:
                {


@@ -111,11 +111,11 @@ float t_hellion(float req)
                        if (self.tur_head.frame >= 7)
                                self.tur_head.frame = 0;
                
                        if (self.tur_head.frame >= 7)
                                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:
                {


@@ -124,17 +124,17 @@ float t_hellion(float req)
                        self.firecheck_flags = TFL_FIRECHECK_DEAD | TFL_FIRECHECK_DISTANCES | TFL_FIRECHECK_TEAMCHECK | TFL_FIRECHECK_REFIRE | TFL_FIRECHECK_AFF | TFL_FIRECHECK_AMMO_OWN;
                        self.ammo_flags = TFL_AMMO_ROCKETS | TFL_AMMO_RECHARGE;
                
                        self.firecheck_flags = TFL_FIRECHECK_DEAD | TFL_FIRECHECK_DISTANCES | TFL_FIRECHECK_TEAMCHECK | TFL_FIRECHECK_REFIRE | TFL_FIRECHECK_AFF | TFL_FIRECHECK_AMMO_OWN;
                        self.ammo_flags = TFL_AMMO_ROCKETS | TFL_AMMO_RECHARGE;
                

-                       return TRUE;
+                       return true;

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

-                       return TRUE;
+                       return true;

                }
        }
 
                }
        }
 

-       return TRUE;
+       return true;

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


@@ -145,17 +145,15 @@ float t_hellion(float req)
        {
                case TR_SETUP:
                {
        {
                case TR_SETUP:
                {

-                       return TRUE;
+                       return true;

                }
                case TR_PRECACHE:
                {
                }
                case TR_PRECACHE:
                {

-                       precache_model ("models/turrets/base.md3");
-                       precache_model ("models/turrets/hellion.md3");
-                       return TRUE;
+                       return true;

                }
        }
 
                }
        }
 

-       return TRUE;
+       return true;

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