Merge branch 'master' into Mario/vehicles

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / vehicles / unit / racer.qc

diff --git a/qcsrc/common/vehicles/unit/racer.qc b/qcsrc/common/vehicles/unit/racer.qc
index 445f37fb4e43705d4ea341bc4212c54e7aee7855..b70121c7ce35f6f2366f6bd38d8dd6c52de70ee4 100644 (file)
--- a/qcsrc/common/vehicles/unit/racer.qc
+++ b/qcsrc/common/vehicles/unit/racer.qc
@@ -33,6 +33,8 @@ 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_hovertype;
 float autocvar_g_vehicle_racer_hoverpower;
 
@@ -287,6 +289,7 @@ float racer_frame()
        if(intermission_running)
        {
                self.vehicle.velocity = '0 0 0';
+               self.vehicle.avelocity = '0 0 0';
                return 1;
        }
 
@@ -297,7 +300,7 @@ float racer_frame()
        vehicles_painframe();
 
        if(pointcontents(racer.origin) != CONTENT_WATER)
-               racer.air_finished = time + 5;
+               racer.air_finished = time + autocvar_g_vehicle_racer_water_time;
 
        if(racer.deadflag != DEAD_NO)
        {
@@ -895,9 +898,6 @@ float v_racer(float req)
                }
                case VR_PRECACHE:
                {
-                       precache_model ("models/vhshield.md3");
-                       precache_model ("models/vehicles/wakizashi.dpm");
-                       precache_model ("models/vehicles/wakizashi_cockpit.dpm");
                        return TRUE;
                }
        }