X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fimpulse.qc;h=8a17ef6a1dd44abfca2b064b20434285a5df1054;hb=76dd66af43f0f01131d019c3a8dacfe35a6f6a18;hp=588b794c812c35a22a45fc7ed88f0fcaf0010309;hpb=678127044857fb9b89f06faf7a3313bdeb43205c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/impulse.qc b/qcsrc/server/impulse.qc
index 588b794c8..8a17ef6a1 100644
--- a/qcsrc/server/impulse.qc
+++ b/qcsrc/server/impulse.qc
@@ -1,11 +1,10 @@
 #include "impulse.qh"
 #include "round_handler.qh"
 
-#include "bot/api.qh"
-
 #include "weapons/throwing.qh"
 #include "command/common.qh"
 #include "cheats.qh"
+#include "clientkill.qh"
 #include "weapons/selection.qh"
 #include "weapons/tracing.qh"
 #include "weapons/weaponsystem.qh"
@@ -150,7 +149,7 @@ X(9, next)
 		for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) \
 		{ \
 			.entity weaponentity = weaponentities[slot]; \
-			W_SwitchWeapon(this, Weapons_from(WEP_FIRST + i), weaponentity); \
+			W_SwitchWeapon_TryOthers(this, Weapons_from(WEP_FIRST + i), weaponentity); \
 			if(slot == 0 && autocvar_g_weaponswitch_debug != 1) \
 				break; \
 		} \
@@ -343,8 +342,9 @@ IMPULSE(weapon_reload)
 		Weapon w = this.(weaponentity).m_weapon;
 		w.wr_reload(w, actor, weaponentity);
 
-		if(slot == 0 && autocvar_g_weaponswitch_debug != 1)
-			break;
+		// allow reloading all active slots?
+		//if(slot == 0 && autocvar_g_weaponswitch_debug != 1)
+			//break;
 	}
 }
 
@@ -570,33 +570,3 @@ IMPULSE(waypoint_clear)
 	}
 	sprint(this, "all waypoints cleared\n");
 }
-
-IMPULSE(navwaypoint_spawn)
-{
-	if (!autocvar_g_waypointeditor) return;
-	waypoint_spawn_fromeditor(this);
-}
-
-IMPULSE(navwaypoint_remove)
-{
-	if (!autocvar_g_waypointeditor) return;
-	waypoint_remove_fromeditor(this);
-}
-
-IMPULSE(navwaypoint_relink)
-{
-	if (!autocvar_g_waypointeditor) return;
-	waypoint_schedulerelinkall();
-}
-
-IMPULSE(navwaypoint_save)
-{
-	if (!autocvar_g_waypointeditor) return;
-	waypoint_saveall();
-}
-
-IMPULSE(navwaypoint_unreachable)
-{
-	if (!autocvar_g_waypointeditor) return;
-	waypoint_unreachable(this);
-}