Merge branch 'terencehill/quickmenu_file_example' into 'master'

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

diff --git a/qcsrc/server/cl_impulse.qc b/qcsrc/server/cl_impulse.qc
index 1789023750c61b942637eb8652e1432fe320434d..58f1a9bd37022a67ed9ff399788706bde4c94a60 100644 (file)
--- a/qcsrc/server/cl_impulse.qc
+++ b/qcsrc/server/cl_impulse.qc
@@ -1,9 +1,11 @@
-#include "_all.qh"
 #include "round_handler.qh"
 
+#include "bot/waypoints.qh"
+
 #include "weapons/throwing.qh"
 #include "command/common.qh"
 #include "cheats.qh"
+#include "bot/navigation.qh"
 #include "weapons/selection.qh"
 #include "weapons/tracing.qh"
 #include "weapons/weaponsystem.qh"
@@ -11,8 +13,13 @@
 #include "../common/minigames/sv_minigames.qh"
 
 #include "../common/weapons/all.qh"
+#include "../common/vehicles/sv_vehicles.qh"
+
+#include "../common/mutators/mutator/waypoints/waypointsprites.qh"
+
+.entity vehicle;
 
-/*
+/**
  * Impulse map:
  *
  * 0 reserved (no input)
@@ -47,7 +54,7 @@
  * 230 to 253: individual weapons (up to 24)
  */
 
-void ImpulseCommands (void)
+void ImpulseCommands ()
 {SELFPARAM();
        int imp;
        vector org;
@@ -138,8 +145,8 @@ void ImpulseCommands (void)
                                        break;
                        }
                }
-               else
-                       self.impulse = imp; // retry in next frame
+               //else
+                       //self.impulse = imp; // retry in next frame
        }
        else if(imp == 21)
        {
@@ -155,16 +162,16 @@ void ImpulseCommands (void)
                        m = (imp - (210 + i)); // <0 for prev, =0 for best, >0 for next
                        W_CycleWeapon(self.(cvar_cl_weaponpriorities[i]), m);
                }
-               else
-                       self.impulse = imp; // retry in next frame
+               //else
+                       //self.impulse = imp; // retry in next frame
        }
        else if(imp >= WEP_IMPULSE_BEGIN && imp <= WEP_IMPULSE_END)
        {
                if(!self.vehicle)
                if(self.deadflag == DEAD_NO)
                        W_SwitchWeapon (imp - WEP_IMPULSE_BEGIN + WEP_FIRST);
-               else
-                       self.impulse = imp; // retry in next frame
+               //else
+                       //self.impulse = imp; // retry in next frame
        }
        // deploy waypoints
        else if (imp >= 30 && imp <= 49)