Merge branch 'master' into Mario/turrets

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

diff --git a/qcsrc/common/turrets/unit/ewheel.qc b/qcsrc/common/turrets/unit/ewheel.qc
index 1c2dc556459431ef247f67951618fe198ee68fe9..414ec4e822b6d3b0d17d6b909f2a7a6302c039ee 100644 (file)
--- a/qcsrc/common/turrets/unit/ewheel.qc
+++ b/qcsrc/common/turrets/unit/ewheel.qc
@@ -105,7 +105,7 @@ void ewheel_move_enemy()
                movelib_beak_simple((autocvar_g_turrets_unit_ewheel_speed_stop));
        }
 
-       turrets_setframe(newframe, FALSE);
+       turrets_setframe(newframe, false);
 }
 
 void ewheel_move_idle()
@@ -147,7 +147,7 @@ float t_ewheel(float req)
                                        self.tur_head.frame = 0;
                        }
                        
-                       return TRUE;
+                       return true;
                }
                case TR_THINK:
                {
@@ -182,7 +182,7 @@ float t_ewheel(float req)
                        if(vlen(self.velocity))
                                self.SendFlags |= TNSF_MOVE;
                
-                       return TRUE;
+                       return true;
                }
                case TR_DEATH:
                {
@@ -194,7 +194,7 @@ float t_ewheel(float req)
 #endif
                        self.pathcurrent = world;
        
-                       return TRUE;
+                       return true;
                }
                case TR_SETUP:
                {
@@ -231,9 +231,9 @@ float t_ewheel(float req)
                                }
                        }
                        
-                       self.iscreature                         = TRUE;
+                       self.iscreature                         = true;
                        self.teleportable                       = TELEPORT_NORMAL;
-                       self.damagedbycontents          = TRUE;
+                       self.damagedbycontents          = true;
                        self.movetype                           = MOVETYPE_WALK;
                        self.solid                                      = SOLID_SLIDEBOX;
                        self.takedamage                         = DAMAGE_AIM;
@@ -248,17 +248,17 @@ float t_ewheel(float req)
                        self.tur_head.aim_speed = (autocvar_g_turrets_unit_ewheel_turnrate);
                        self.tur_head.aim_speed = self.tur_head.aim_speed / (1 / self.ticrate);
                
-                       return TRUE;
+                       return true;
                }
                case TR_PRECACHE:
                {
                        precache_model ("models/turrets/ewheel-base2.md3");
                        precache_model ("models/turrets/ewheel-gun1.md3");
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // SVQC
@@ -296,15 +296,15 @@ float t_ewheel(float req)
                        self.move_time          = time;
                        self.draw                       = ewheel_draw;
                        
-                       return TRUE;
+                       return true;
                }
                case TR_PRECACHE:
                {
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // CSQC