Merge branch 'master' into Mario/vehicles

[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 ce2fbc3b3c0be25ae7a27f85e2871021b926bfe5..f0e4d1173838558a80a78050d33a9e4e97b88478 100644 (file)
--- a/qcsrc/server/cl_impulse.qc
+++ b/qcsrc/server/cl_impulse.qc
@@ -1,3 +1,11 @@
+#include "round_handler.qh"
+
+#include "bot/waypoints.qh"
+
+#include "weapons/throwing.qh"
+
+#include "../common/weapons/weapons.qh"
+
 /*
  * Impulse map:
  *
@@ -35,7 +43,7 @@
 
 void ImpulseCommands (void)
 {
-       float imp;
+       int imp;
        vector org;
        float i;
        float m;
@@ -100,7 +108,7 @@ void ImpulseCommands (void)
                                        W_PreviousWeapon(2);
                                        break;
                                case 17:
-                                       W_ThrowWeapon(W_CalculateProjectileVelocity(self.velocity, v_forward * 750, FALSE), '0 0 0', TRUE);
+                                       W_ThrowWeapon(W_CalculateProjectileVelocity(self.velocity, v_forward * 750, false), '0 0 0', true);
                                        break;
                                case 18:
                                        W_NextWeapon(1);
@@ -174,7 +182,7 @@ void ImpulseCommands (void)
                                {
                                        if (!MUTATOR_CALLHOOK(HelpMePing))
                                        {
-                                               wp = WaypointSprite_Attach("helpme", TRUE, RADARICON_HELPME, '1 0.5 0');
+                                               wp = WaypointSprite_Attach("helpme", true, RADARICON_HELPME, '1 0.5 0');
                                                if(!wp)
                                                        WaypointSprite_HelpMePing(self.waypointsprite_attachedforcarrier);
                                                else
@@ -184,14 +192,14 @@ void ImpulseCommands (void)
                                }
                                break;
                        case 34:
-                               wp = WaypointSprite_DeployFixed("here", FALSE, self.origin, RADARICON_HERE, '0 1 0');
+                               wp = WaypointSprite_DeployFixed("here", false, self.origin, RADARICON_HERE, '0 1 0');
                                if(wp)
                                        WaypointSprite_Ping(wp);
                                sprint(self, "HERE spawned at location\n");
                                break;
                        case 35:
                                WarpZone_crosshair_trace(self);
-                               wp = WaypointSprite_DeployFixed("here", FALSE, trace_endpos, RADARICON_HERE, '0 1 0');
+                               wp = WaypointSprite_DeployFixed("here", false, trace_endpos, RADARICON_HERE, '0 1 0');
                                if(wp)
                                        WaypointSprite_Ping(wp);
                                sprint(self, "HERE spawned at crosshair\n");
@@ -199,21 +207,21 @@ void ImpulseCommands (void)
                        case 36:
                                if(vlen(self.death_origin))
                                {
-                                       wp = WaypointSprite_DeployFixed("here", FALSE, self.death_origin, RADARICON_HERE, '0 1 0');
+                                       wp = WaypointSprite_DeployFixed("here", false, self.death_origin, RADARICON_HERE, '0 1 0');
                                        if(wp)
                                                WaypointSprite_Ping(wp);
                                        sprint(self, "HERE spawned at death location\n");
                                }
                                break;
                        case 37:
-                               wp = WaypointSprite_DeployFixed("danger", FALSE, self.origin, RADARICON_DANGER, '1 0.5 0');
+                               wp = WaypointSprite_DeployFixed("danger", false, self.origin, RADARICON_DANGER, '1 0.5 0');
                                if(wp)
                                        WaypointSprite_Ping(wp);
                                sprint(self, "DANGER spawned at location\n");
                                break;
                        case 38:
                                WarpZone_crosshair_trace(self);
-                               wp = WaypointSprite_DeployFixed("danger", FALSE, trace_endpos, RADARICON_DANGER, '1 0.5 0');
+                               wp = WaypointSprite_DeployFixed("danger", false, trace_endpos, RADARICON_DANGER, '1 0.5 0');
                                if(wp)
                                        WaypointSprite_Ping(wp);
                                sprint(self, "DANGER spawned at crosshair\n");
@@ -221,7 +229,7 @@ void ImpulseCommands (void)
                        case 39:
                                if(vlen(self.death_origin))
                                {
-                                       wp = WaypointSprite_DeployFixed("danger", FALSE, self.death_origin, RADARICON_DANGER, '1 0.5 0');
+                                       wp = WaypointSprite_DeployFixed("danger", false, self.death_origin, RADARICON_DANGER, '1 0.5 0');
                                        if(wp)
                                                WaypointSprite_Ping(wp);
                                        sprint(self, "DANGER spawned at death location\n");
@@ -258,7 +266,7 @@ void ImpulseCommands (void)
                                        bprint(strcat("Waypoint spawned at ",vtos(self.origin),"\n"));
                                        break;
                                case 104:
-                                       e = navigation_findnearestwaypoint(self, FALSE);
+                                       e = navigation_findnearestwaypoint(self, false);
                                        if (e)
                                        if (!(e.wpflags & WAYPOINTFLAG_GENERATED))
                                        {
@@ -278,7 +286,7 @@ void ImpulseCommands (void)
                                                e.colormod = '0.5 0.5 0.5';
                                                e.effects &= ~(EF_NODEPTHTEST | EF_RED | EF_BLUE);
                                        }
-                                       e2 = navigation_findnearestwaypoint(self, FALSE);
+                                       e2 = navigation_findnearestwaypoint(self, false);
                                        navigation_markroutes(e2);
                                        i = 0;
                                        m = 0;
@@ -319,7 +327,7 @@ void ImpulseCommands (void)
                                                org = e.origin;
                                                tracebox(e.origin, PL_MIN, PL_MAX, e.origin - '0 0 512', MOVE_NOMONSTERS, world);
                                                setorigin(e, trace_endpos);
-                                               if(navigation_findnearestwaypoint(e, FALSE))
+                                               if(navigation_findnearestwaypoint(e, false))
                                                {
                                                        setorigin(e, org);
                                                        e.effects &= ~EF_NODEPTHTEST;
@@ -350,7 +358,7 @@ void ImpulseCommands (void)
                                        }
                                        for(e = start; e; e = e.chain)
                                        {
-                                               if(navigation_findnearestwaypoint(e, FALSE))
+                                               if(navigation_findnearestwaypoint(e, false))
                                                {
                                                }
                                                else
@@ -367,7 +375,7 @@ void ImpulseCommands (void)
                                        for(e = start; e; e = e.chain)
                                        {
                                                org = e.origin;
-                                               if(navigation_findnearestwaypoint(e, TRUE))
+                                               if(navigation_findnearestwaypoint(e, true))
                                                {
                                                }
                                                else