]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix TRUE/FALSE usage
authorMario <zacjardine@y7mail.com>
Thu, 26 Feb 2015 12:25:27 +0000 (23:25 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 26 Feb 2015 12:25:27 +0000 (23:25 +1100)
qcsrc/common/vehicles/unit/racer.qc
qcsrc/common/vehicles/unit/raptor.qc
qcsrc/common/vehicles/unit/spiderbot.qc

index 89d5f30275dcd4c4db46ac1421dd82c7f01bc9e0..ca3c76a9f7a0a6a4b3138cfedd6568e566dad021 100644 (file)
@@ -13,7 +13,7 @@ REGISTER_VEHICLE(
 );
 #else
 #ifdef SVQC
-float autocvar_g_vehicle_racer;
+bool autocvar_g_vehicle_racer;
 
 float autocvar_g_vehicle_racer_speed_afterburn;
 float autocvar_g_vehicle_racer_afterburn_cost;
@@ -33,7 +33,7 @@ float autocvar_g_vehicle_racer_springlength;
 float autocvar_g_vehicle_racer_upforcedamper;
 float autocvar_g_vehicle_racer_friction;
 
-var float autocvar_g_vehicle_racer_water_time = 5;
+float autocvar_g_vehicle_racer_water_time = 5;
 
 float autocvar_g_vehicle_racer_hovertype;
 float autocvar_g_vehicle_racer_hoverpower;
@@ -149,7 +149,7 @@ void racer_fire_cannon(string tagname)
        bolt = vehicles_projectile("wakizashi_gun_muzzleflash", "weapons/lasergun_fire.wav",
                                                   v, normalize(v_forward + randomvec() * autocvar_g_vehicle_racer_cannon_spread) * autocvar_g_vehicle_racer_cannon_speed,
                                                   autocvar_g_vehicle_racer_cannon_damage, autocvar_g_vehicle_racer_cannon_radius, autocvar_g_vehicle_racer_cannon_force,  0,
-                                                  DEATH_VH_WAKI_GUN, PROJECTILE_WAKICANNON, 0, TRUE, TRUE, self.owner);
+                                                  DEATH_VH_WAKI_GUN, PROJECTILE_WAKICANNON, 0, true, true, self.owner);
 
        // Fix z-aim (for chase mode)
        v = normalize(trace_endpos - bolt.origin);
@@ -266,7 +266,7 @@ void racer_fire_rocket(string tagname, entity trg)
        entity rocket = rocket = vehicles_projectile("wakizashi_rocket_launch", "weapons/rocket_fire.wav",
                                                   v, v_forward * autocvar_g_vehicle_racer_rocket_speed,
                                                   autocvar_g_vehicle_racer_rocket_damage, autocvar_g_vehicle_racer_rocket_radius, autocvar_g_vehicle_racer_rocket_force, 3,
-                                                  DEATH_VH_WAKI_ROCKET, PROJECTILE_WAKIROCKET, 20, FALSE, FALSE, self.owner);
+                                                  DEATH_VH_WAKI_ROCKET, PROJECTILE_WAKIROCKET, 20, false, false, self.owner);
 
        rocket.lip                        = autocvar_g_vehicle_racer_rocket_accel * sys_frametime;
        rocket.wait                      = autocvar_g_vehicle_racer_rocket_turnrate;
@@ -472,13 +472,13 @@ float racer_frame()
        player.vehicle_reload1 = bound(0, 100 * ((time - racer.lip) / (racer.delay - racer.lip)), 100);
 
        if(racer.vehicle_flags  & VHF_SHIELDREGEN)
-               vehicles_regen(racer.dmg_time, vehicle_shield, autocvar_g_vehicle_racer_shield, autocvar_g_vehicle_racer_shield_regen_pause, autocvar_g_vehicle_racer_shield_regen, frametime, TRUE);
+               vehicles_regen(racer.dmg_time, vehicle_shield, autocvar_g_vehicle_racer_shield, autocvar_g_vehicle_racer_shield_regen_pause, autocvar_g_vehicle_racer_shield_regen, frametime, true);
 
        if(racer.vehicle_flags  & VHF_HEALTHREGEN)
-               vehicles_regen(racer.dmg_time, vehicle_health, autocvar_g_vehicle_racer_health, autocvar_g_vehicle_racer_health_regen_pause, autocvar_g_vehicle_racer_health_regen, frametime, FALSE);
+               vehicles_regen(racer.dmg_time, vehicle_health, autocvar_g_vehicle_racer_health, autocvar_g_vehicle_racer_health_regen_pause, autocvar_g_vehicle_racer_health_regen, frametime, false);
 
        if(racer.vehicle_flags  & VHF_ENERGYREGEN)
-               vehicles_regen(racer.wait, vehicle_energy, autocvar_g_vehicle_racer_energy, autocvar_g_vehicle_racer_energy_regen_pause, autocvar_g_vehicle_racer_energy_regen, frametime, FALSE);
+               vehicles_regen(racer.wait, vehicle_energy, autocvar_g_vehicle_racer_energy, autocvar_g_vehicle_racer_energy_regen_pause, autocvar_g_vehicle_racer_energy_regen, frametime, false);
 
 
        VEHICLE_UPDATE_PLAYER(player, health, racer);
@@ -610,7 +610,7 @@ void racer_deadtouch()
 void spawnfunc_vehicle_racer()
 {
        if(!autocvar_g_vehicle_racer) { remove(self); return; }
-       if(!vehicle_initialize(VEH_RACER, FALSE)) { remove(self); return; }
+       if(!vehicle_initialize(VEH_RACER, false)) { remove(self); return; }
 }
 
 float v_racer(float req)
@@ -621,7 +621,7 @@ float v_racer(float req)
                {
                        if(autocvar_g_vehicle_racer_bouncepain)
                                vehicles_impact(autocvar_g_vehicle_racer_bouncepain_x, autocvar_g_vehicle_racer_bouncepain_y, autocvar_g_vehicle_racer_bouncepain_z);
-                       return TRUE;
+                       return true;
                }
                case VR_ENTER:
                {
@@ -632,11 +632,11 @@ float v_racer(float req)
                        if(self.owner.flagcarried)
                           setorigin(self.owner.flagcarried, '-190 0 96');
                           
-                       return TRUE;
+                       return true;
                }
                case VR_THINK:
                {
-                       return TRUE;
+                       return true;
                }
                case VR_DEATH:
                {
@@ -665,7 +665,7 @@ float v_racer(float req)
                        self.think = racer_blowup_think;
                        self.nextthink = time;
        
-                       return TRUE;
+                       return true;
                }
                case VR_SPAWN:
                {
@@ -702,7 +702,7 @@ float v_racer(float req)
                        self.vehicle_health = autocvar_g_vehicle_racer_health;
                        self.vehicle_shield = autocvar_g_vehicle_racer_shield;
                        
-                       return TRUE;
+                       return true;
                }
                case VR_SETUP:
                {
@@ -725,7 +725,7 @@ float v_racer(float req)
                        self.vehicle_shield = autocvar_g_vehicle_racer_shield;
                        self.max_health = self.vehicle_health;
                                
-                       return TRUE;
+                       return true;
                }
                case VR_PRECACHE:
                {
@@ -739,11 +739,11 @@ float v_racer(float req)
                        precache_model ("models/vhshield.md3");
                        precache_model ("models/vehicles/wakizashi.dpm");
                        precache_model ("models/vehicles/wakizashi_cockpit.dpm");
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // SVQC
@@ -762,7 +762,7 @@ float v_racer(float req)
                case VR_HUD:
                {
                        if(autocvar_r_letterbox)
-                               return TRUE;
+                               return true;
 
                        vector picsize, hudloc = '0 0 0', pic2size, picloc;
 
@@ -888,21 +888,21 @@ float v_racer(float req)
 
                                drawpic('0.5 0 0' * (vid_conwidth - picsize_x) + '0 0.5 0' * (vid_conheight - picsize_y), waki_xhair, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
                        }
-                       return TRUE;
+                       return true;
                }
                case VR_SETUP:
                {
                        AuxiliaryXhair[0].axh_image = "gfx/vehicles/axh-bracket.tga";
                        AuxiliaryXhair[0].axh_scale = 0.25;
-                       return TRUE;
+                       return true;
                }
                case VR_PRECACHE:
                {
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // CSQC
index fde519fe74bacb1fbe096589e55088cd13b76775..d78456db117221235f7f5d7c7be62c0e1973e125 100644 (file)
@@ -13,13 +13,13 @@ REGISTER_VEHICLE(
 );
 #else
 
-const float RSM_FIRST = 1;
-const float RSM_BOMB = 1;
-const float RSM_FLARE = 2;
-const float RSM_LAST = 2;
+const int RSM_FIRST = 1;
+const int RSM_BOMB = 1;
+const int RSM_FLARE = 2;
+const int RSM_LAST = 2;
 
 #ifdef SVQC
-float autocvar_g_vehicle_raptor;
+bool autocvar_g_vehicle_raptor;
 
 float autocvar_g_vehicle_raptor_respawntime;
 float autocvar_g_vehicle_raptor_takeofftime;
@@ -147,7 +147,7 @@ void raptor_bomb_burst()
                bomblet.velocity        = normalize(normalize(self.velocity) + (randomvec() * autocvar_g_vehicle_raptor_bomblet_spread)) * vlen(self.velocity);
 
                PROJECTILE_MAKETRIGGER(bomblet);
-               CSQCProjectile(bomblet, TRUE, PROJECTILE_RAPTORBOMBLET, TRUE);
+               CSQCProjectile(bomblet, true, PROJECTILE_RAPTORBOMBLET, true);
        }
 
        remove(self);
@@ -182,8 +182,8 @@ void raptor_bombdrop()
        PROJECTILE_MAKETRIGGER(bomb_1);
        PROJECTILE_MAKETRIGGER(bomb_2);
 
-       CSQCProjectile(bomb_1, TRUE, PROJECTILE_RAPTORBOMB, TRUE);
-       CSQCProjectile(bomb_2, TRUE, PROJECTILE_RAPTORBOMB, TRUE);
+       CSQCProjectile(bomb_1, true, PROJECTILE_RAPTORBOMB, true);
+       CSQCProjectile(bomb_2, true, PROJECTILE_RAPTORBOMB, true);
 }
 
 
@@ -192,7 +192,7 @@ void raptor_fire_cannon(entity gun, string tagname)
        vehicles_projectile("raptor_cannon_muzzleflash", "weapons/lasergun_fire.wav",
                                                   gettaginfo(gun, gettagindex(gun, tagname)), normalize(v_forward + randomvec() * autocvar_g_vehicle_raptor_cannon_spread) * autocvar_g_vehicle_raptor_cannon_speed,
                                                   autocvar_g_vehicle_raptor_cannon_damage, autocvar_g_vehicle_raptor_cannon_radius, autocvar_g_vehicle_raptor_cannon_force,  0,
-                                                  DEATH_VH_RAPT_CANNON, PROJECTILE_RAPTORCANNON, 0, TRUE, TRUE, self.owner);
+                                                  DEATH_VH_RAPT_CANNON, PROJECTILE_RAPTORCANNON, 0, true, true, self.owner);
 }
 
 void raptor_land()
@@ -540,13 +540,13 @@ float raptor_frame()
        }
 
        if(self.vehicle_flags  & VHF_SHIELDREGEN)
-               vehicles_regen(raptor.dmg_time, vehicle_shield, autocvar_g_vehicle_raptor_shield, autocvar_g_vehicle_raptor_shield_regen_pause, autocvar_g_vehicle_raptor_shield_regen, frametime, TRUE);
+               vehicles_regen(raptor.dmg_time, vehicle_shield, autocvar_g_vehicle_raptor_shield, autocvar_g_vehicle_raptor_shield_regen_pause, autocvar_g_vehicle_raptor_shield_regen, frametime, true);
 
        if(self.vehicle_flags  & VHF_HEALTHREGEN)
-               vehicles_regen(raptor.dmg_time, vehicle_health, autocvar_g_vehicle_raptor_health, autocvar_g_vehicle_raptor_health_regen_pause, autocvar_g_vehicle_raptor_health_regen, frametime, FALSE);
+               vehicles_regen(raptor.dmg_time, vehicle_health, autocvar_g_vehicle_raptor_health, autocvar_g_vehicle_raptor_health_regen_pause, autocvar_g_vehicle_raptor_health_regen, frametime, false);
 
        if(self.vehicle_flags  & VHF_ENERGYREGEN)
-               vehicles_regen(raptor.cnt, vehicle_energy, autocvar_g_vehicle_raptor_energy, autocvar_g_vehicle_raptor_energy_regen_pause, autocvar_g_vehicle_raptor_energy_regen, frametime, FALSE);
+               vehicles_regen(raptor.cnt, vehicle_energy, autocvar_g_vehicle_raptor_energy, autocvar_g_vehicle_raptor_energy_regen_pause, autocvar_g_vehicle_raptor_energy_regen, frametime, false);
 
        if(!forbidWeaponUse(player))
        if(raptor.vehicle_weapon2mode == RSM_BOMB)
@@ -660,13 +660,13 @@ float raptor_takeoff()
                player.PlayerPhysplug = raptor_frame;
 
        if(self.vehicle_flags  & VHF_SHIELDREGEN)
-               vehicles_regen(raptor.dmg_time, vehicle_shield, autocvar_g_vehicle_raptor_shield, autocvar_g_vehicle_raptor_shield_regen_pause, autocvar_g_vehicle_raptor_shield_regen, frametime, TRUE);
+               vehicles_regen(raptor.dmg_time, vehicle_shield, autocvar_g_vehicle_raptor_shield, autocvar_g_vehicle_raptor_shield_regen_pause, autocvar_g_vehicle_raptor_shield_regen, frametime, true);
 
        if(self.vehicle_flags  & VHF_HEALTHREGEN)
-               vehicles_regen(raptor.dmg_time, vehicle_health, autocvar_g_vehicle_raptor_health, autocvar_g_vehicle_raptor_health_regen_pause, autocvar_g_vehicle_raptor_health_regen, frametime, FALSE);
+               vehicles_regen(raptor.dmg_time, vehicle_health, autocvar_g_vehicle_raptor_health, autocvar_g_vehicle_raptor_health_regen_pause, autocvar_g_vehicle_raptor_health_regen, frametime, false);
 
        if(self.vehicle_flags  & VHF_ENERGYREGEN)
-               vehicles_regen(raptor.cnt, vehicle_energy, autocvar_g_vehicle_raptor_energy, autocvar_g_vehicle_raptor_energy_regen_pause, autocvar_g_vehicle_raptor_energy_regen, frametime, FALSE);
+               vehicles_regen(raptor.cnt, vehicle_energy, autocvar_g_vehicle_raptor_energy, autocvar_g_vehicle_raptor_energy_regen_pause, autocvar_g_vehicle_raptor_energy_regen, frametime, false);
 
 
        raptor.bomb1.alpha = raptor.bomb2.alpha = (time - raptor.lip) / (raptor.delay - raptor.lip);
@@ -736,7 +736,7 @@ float raptor_impulse(float _imp)
                                self.vehicle.vehicle_weapon2mode = RSM_FIRST;
 
                        CSQCVehicleSetup(self, 0);
-                       return TRUE;
+                       return true;
                case 12:
                case 16:
                case 19:
@@ -745,7 +745,7 @@ float raptor_impulse(float _imp)
                                self.vehicle.vehicle_weapon2mode = RSM_LAST;
 
                        CSQCVehicleSetup(self, 0);
-                       return TRUE;
+                       return true;
 
                /*
                case 17: // toss gun, could be used to exit?
@@ -754,13 +754,13 @@ float raptor_impulse(float _imp)
                        break;
                */
        }
-       return FALSE;
+       return false;
 }
 
 void spawnfunc_vehicle_raptor()
 {
        if(!autocvar_g_vehicle_raptor) { remove(self); return; }
-       if(!vehicle_initialize(VEH_RAPTOR, FALSE)) { remove(self); return; }
+       if(!vehicle_initialize(VEH_RAPTOR, false)) { remove(self); return; }
 }
 
 float v_raptor(float req)
@@ -772,7 +772,7 @@ float v_raptor(float req)
                        if(autocvar_g_vehicle_raptor_bouncepain)
                                vehicles_impact(autocvar_g_vehicle_raptor_bouncepain_x, autocvar_g_vehicle_raptor_bouncepain_y, autocvar_g_vehicle_raptor_bouncepain_z);
                                
-                       return TRUE;
+                       return true;
                }
                case VR_ENTER:
                {
@@ -792,11 +792,11 @@ float v_raptor(float req)
                           setorigin(self.owner.flagcarried, '-20 0 96');
 
                        CSQCVehicleSetup(self.owner, 0);
-                       return TRUE;
+                       return true;
                }
                case VR_THINK:
                {
-                       return TRUE;
+                       return true;
                }
                case VR_DEATH:
                {
@@ -819,7 +819,7 @@ float v_raptor(float req)
 
                        self.colormod = '-0.5 -0.5 -0.5';
                        self.touch = raptor_blowup;
-                       return TRUE;
+                       return true;
                }
                case VR_SPAWN:
                {
@@ -911,7 +911,7 @@ float v_raptor(float req)
                        self.damageforcescale = 0.25;
                        self.vehicle_health = autocvar_g_vehicle_raptor_health;
                        self.vehicle_shield = autocvar_g_vehicle_raptor_shield;
-                       return TRUE;
+                       return true;
                }
                case VR_SETUP:
                {
@@ -933,7 +933,7 @@ float v_raptor(float req)
                        self.vehicle_shield = autocvar_g_vehicle_raptor_shield;
                        self.max_health = self.vehicle_health;
                                
-                       return TRUE;
+                       return true;
                }
                case VR_PRECACHE:
                {
@@ -948,11 +948,11 @@ float v_raptor(float req)
                        precache_sound ("vehicles/raptor_speed.wav");
                        precache_sound ("vehicles/missile_alarm.wav");
                
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // SVQC
@@ -1013,7 +1013,7 @@ float v_raptor(float req)
                case VR_HUD:
                {
                        if(autocvar_r_letterbox)
-                               return TRUE;
+                               return true;
 
                        vector picsize, hudloc = '0 0 0', pic2size, picloc;
                        string raptor_xhair;
@@ -1198,7 +1198,7 @@ float v_raptor(float req)
                                drawpic('0.5 0 0' * (vid_conwidth - picsize_x) + '0 0.5 0' * (vid_conheight - picsize_y), raptor_xhair, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
                        }
                        
-                       return TRUE;
+                       return true;
                }
                case VR_SETUP:
                {
@@ -1207,15 +1207,15 @@ float v_raptor(float req)
                        
                        AuxiliaryXhair[1].axh_image = "gfx/vehicles/axh-bracket.tga";
                        AuxiliaryXhair[1].axh_scale = 0.25;
-                       return TRUE;
+                       return true;
                }
                case VR_PRECACHE:
                {
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // CSQC
index b3aa75ecd2af45430e3b58bdadc393824701262e..01c0caeacf898a8aafe6bb3e28a68da4ef110557 100644 (file)
@@ -261,7 +261,7 @@ void spiderbot_rocket_do()
                        rocket = vehicles_projectile("spiderbot_rocket_launch", "weapons/rocket_fire.wav",
                                                                   v, normalize(randomvec() * autocvar_g_vehicle_spiderbot_rocket_spread + v_forward) * autocvar_g_vehicle_spiderbot_rocket_speed,
                                                                   autocvar_g_vehicle_spiderbot_rocket_damage, autocvar_g_vehicle_spiderbot_rocket_radius, autocvar_g_vehicle_spiderbot_rocket_force, 1,
-                                                                  DEATH_VH_SPID_ROCKET, PROJECTILE_SPIDERROCKET, autocvar_g_vehicle_spiderbot_rocket_health, FALSE, TRUE, self.owner);
+                                                                  DEATH_VH_SPID_ROCKET, PROJECTILE_SPIDERROCKET, autocvar_g_vehicle_spiderbot_rocket_health, false, true, self.owner);
                        crosshair_trace(self.owner);
                        float _dist = (random() * autocvar_g_vehicle_spiderbot_rocket_radius) + vlen(v - trace_endpos);
                        _dist -= (random() * autocvar_g_vehicle_spiderbot_rocket_radius) ;
@@ -275,7 +275,7 @@ void spiderbot_rocket_do()
                        rocket = vehicles_projectile("spiderbot_rocket_launch", "weapons/rocket_fire.wav",
                                                                   v, normalize(v_forward) * autocvar_g_vehicle_spiderbot_rocket_speed,
                                                                   autocvar_g_vehicle_spiderbot_rocket_damage, autocvar_g_vehicle_spiderbot_rocket_radius, autocvar_g_vehicle_spiderbot_rocket_force, 1,
-                                                                  DEATH_VH_SPID_ROCKET, PROJECTILE_SPIDERROCKET, autocvar_g_vehicle_spiderbot_rocket_health, FALSE, FALSE, self.owner);
+                                                                  DEATH_VH_SPID_ROCKET, PROJECTILE_SPIDERROCKET, autocvar_g_vehicle_spiderbot_rocket_health, false, false, self.owner);
                        crosshair_trace(self.owner);
                        rocket.pos1        = trace_endpos;
                        rocket.nextthink  = time;
@@ -287,7 +287,7 @@ void spiderbot_rocket_do()
                        rocket = vehicles_projectile("spiderbot_rocket_launch", "weapons/rocket_fire.wav",
                                                                   v, normalize(v_forward) * autocvar_g_vehicle_spiderbot_rocket_speed,
                                                                   autocvar_g_vehicle_spiderbot_rocket_damage, autocvar_g_vehicle_spiderbot_rocket_radius, autocvar_g_vehicle_spiderbot_rocket_force, 1,
-                                                                  DEATH_VH_SPID_ROCKET, PROJECTILE_SPIDERROCKET, autocvar_g_vehicle_spiderbot_rocket_health, FALSE, TRUE, self.owner);
+                                                                  DEATH_VH_SPID_ROCKET, PROJECTILE_SPIDERROCKET, autocvar_g_vehicle_spiderbot_rocket_health, false, true, self.owner);
 
                        crosshair_trace(self.owner);
 
@@ -369,7 +369,7 @@ float spiderbot_frame()
        crosshair_trace(player);
        ad = vectoangles(normalize(trace_endpos - ad));
        ad = AnglesTransform_ToAngles(AnglesTransform_LeftDivide(AnglesTransform_FromAngles(spider.angles), AnglesTransform_FromAngles(ad))) - spider.tur_head.angles;
-       ad = AnglesTransform_Normalize(ad, TRUE);
+       ad = AnglesTransform_Normalize(ad, true);
        //UpdateAuxiliaryXhair(player, trace_endpos, ('1 0 0' * player.vehicle_reload2) + ('0 1 0' * (1 - player.vehicle_reload2)), 2);
 
        // Rotate head
@@ -525,16 +525,16 @@ float spiderbot_frame()
        else
                vehicles_regen(spider.cnt, vehicle_ammo1, autocvar_g_vehicle_spiderbot_minigun_ammo_max,
                                                                                   autocvar_g_vehicle_spiderbot_minigun_ammo_regen_pause,
-                                                                                  autocvar_g_vehicle_spiderbot_minigun_ammo_regen, frametime, FALSE);
+                                                                                  autocvar_g_vehicle_spiderbot_minigun_ammo_regen, frametime, false);
 
 
        spiderbot_rocket_do();
 
        if(self.vehicle_flags  & VHF_SHIELDREGEN)
-               vehicles_regen(spider.dmg_time, vehicle_shield, autocvar_g_vehicle_spiderbot_shield, autocvar_g_vehicle_spiderbot_shield_regen_pause, autocvar_g_vehicle_spiderbot_shield_regen, frametime, TRUE);
+               vehicles_regen(spider.dmg_time, vehicle_shield, autocvar_g_vehicle_spiderbot_shield, autocvar_g_vehicle_spiderbot_shield_regen_pause, autocvar_g_vehicle_spiderbot_shield_regen, frametime, true);
 
        if(self.vehicle_flags  & VHF_HEALTHREGEN)
-               vehicles_regen(spider.dmg_time, vehicle_health, autocvar_g_vehicle_spiderbot_health, autocvar_g_vehicle_spiderbot_health_regen_pause, autocvar_g_vehicle_spiderbot_health_regen, frametime, FALSE);
+               vehicles_regen(spider.dmg_time, vehicle_health, autocvar_g_vehicle_spiderbot_health, autocvar_g_vehicle_spiderbot_health_regen_pause, autocvar_g_vehicle_spiderbot_health_regen, frametime, false);
 
        player.BUTTON_ATCK = player.BUTTON_ATCK2 = 0;
        player.vehicle_ammo2 = spider.tur_head.frame;
@@ -716,7 +716,7 @@ float spiderbot_impulse(float _imp)
 
                        //centerprint(self, strcat("Rocket mode is ", ftos(self.vehicle.vehicle_weapon2mode)));
                        CSQCVehicleSetup(self, 0);
-                       return TRUE;
+                       return true;
                case 12:
                case 16:
                case 19:
@@ -726,7 +726,7 @@ float spiderbot_impulse(float _imp)
 
                        //centerprint(self, strcat("Rocket mode is ", ftos(self.vehicle.vehicle_weapon2mode)));
                        CSQCVehicleSetup(self, 0);
-                       return TRUE;
+                       return true;
 
                /*
                case 17: // toss gun, could be used to exit?
@@ -735,13 +735,13 @@ float spiderbot_impulse(float _imp)
                        break;
                */
        }
-       return FALSE;
+       return false;
 }
 
 void spawnfunc_vehicle_spiderbot()
 {
        if(!autocvar_g_vehicle_spiderbot) { remove(self); return; }
-       if(!vehicle_initialize(VEH_SPIDERBOT, FALSE)) { remove(self); return; }
+       if(!vehicle_initialize(VEH_SPIDERBOT, false)) { remove(self); return; }
 }
 
 float v_spiderbot(float req)
@@ -753,7 +753,7 @@ float v_spiderbot(float req)
                        if(autocvar_g_vehicle_spiderbot_bouncepain)
                                vehicles_impact(autocvar_g_vehicle_spiderbot_bouncepain_x, autocvar_g_vehicle_spiderbot_bouncepain_y, autocvar_g_vehicle_spiderbot_bouncepain_z);
                
-                       return TRUE;
+                       return true;
                }
                case VR_ENTER:
                {
@@ -769,14 +769,14 @@ float v_spiderbot(float req)
                                setorigin(self.owner.flagcarried, '-20 0 120');
                        }
                
-                       return TRUE;
+                       return true;
                }
                case VR_THINK:
                {
                        if(self.flags & FL_ONGROUND)
                                movelib_beak_simple(autocvar_g_vehicle_spiderbot_speed_stop);
                        
-                       return TRUE;
+                       return true;
                }
                case VR_DEATH:
                {
@@ -796,7 +796,7 @@ float v_spiderbot(float req)
                        
                        CSQCModel_UnlinkEntity(); // networking the death scene would be a nightmare
 
-                       return TRUE;
+                       return true;
                }
                case VR_SPAWN:
                {
@@ -829,7 +829,7 @@ float v_spiderbot(float req)
                        
                        self.PlayerPhysplug = spiderbot_frame;
 
-                       return TRUE;
+                       return true;
                }
                case VR_SETUP:
                {
@@ -846,9 +846,9 @@ float v_spiderbot(float req)
                        self.vehicle_health = autocvar_g_vehicle_spiderbot_health;
                        self.vehicle_shield = autocvar_g_vehicle_spiderbot_shield;
                        self.max_health = self.vehicle_health;
-                       self.pushable = TRUE; // spiderbot can use jumppads
+                       self.pushable = true; // spiderbot can use jumppads
 
-                       return TRUE;
+                       return true;
                }
                case VR_PRECACHE:
                {
@@ -868,11 +868,11 @@ float v_spiderbot(float req)
                        precache_sound ("vehicles/spiderbot_strafe.wav");
                        precache_sound ("vehicles/spiderbot_walk.wav");
                        precache_sound ("vehicles/spiderbot_land.wav");
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // SVQC
@@ -892,7 +892,7 @@ float v_spiderbot(float req)
                case VR_HUD:
                {
                        if(autocvar_r_letterbox)
-                               return TRUE;
+                               return true;
 
                        vector picsize, hudloc = '0 0 0', pic2size, picloc;
                        float i;
@@ -1051,7 +1051,7 @@ float v_spiderbot(float req)
                                drawpic('0.5 0 0' * (vid_conwidth - picsize_x) + '0 0.5 0' * (vid_conheight - picsize_y), spider_xhair, picsize, '1 1 1', autocvar_cl_vehicle_spiderbot_cross_alpha, DRAWFLAG_ADDITIVE);
                        }
                        
-                       return TRUE;
+                       return true;
                }
                case VR_SETUP:
                {
@@ -1065,15 +1065,15 @@ float v_spiderbot(float req)
                        AuxiliaryXhair[2].axh_image   = "gfx/vehicles/axh-special1.tga";
                        AuxiliaryXhair[2].axh_scale   = 0.5;
                
-                       return TRUE;
+                       return true;
                }
                case VR_PRECACHE:
                {
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // CSQC