Merge branch 'master' into sev/luma_revisions

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

diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc
index 545e309e4fecc1720b76df3e8a13b317602e563c..a6d425393aced1afb3d10595cf50bee408f25cb9 100644 (file)
--- a/qcsrc/server/vehicles/racer.qc
+++ b/qcsrc/server/vehicles/racer.qc
@@ -2,6 +2,8 @@
 #include "racer.qh"
 
 #ifdef SVQC
+#include "../../common/triggers/trigger/impulse.qh"
+
 void racer_exit(float eject);
 void racer_enter();
 
@@ -410,19 +412,26 @@ float racer_frame()
         racer.delay = time + 0.3;
 
         if(racer.misc_bulletcounter == 1)
+        {
             racer_fire_rocket("tag_rocket_r", (racer.lock_strength == 1 && racer.lock_target) ? racer.lock_target : world);
+            player.vehicle_ammo2 = 50;
+        }
         else if(racer.misc_bulletcounter == 2)
         {
             racer_fire_rocket("tag_rocket_l", (racer.lock_strength == 1 && racer.lock_target) ? racer.lock_target : world);
             racer.lock_strength  = 0;
             racer.lock_target    = world;
             racer.misc_bulletcounter = 0;
-
             racer.delay = time + autocvar_g_vehicle_racer_rocket_refire;
             racer.lip = time;
+            player.vehicle_ammo2 = 0;
         }
     }
-    player.vehicle_reload1 = bound(0, 100 * ((time - racer.lip) / (racer.delay - racer.lip)), 100);
+    else
+        if(racer.misc_bulletcounter == 0)
+            player.vehicle_ammo2 = 100;
+
+    player.vehicle_reload2 = 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);