X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fimpulse.qc;h=cce5963990893d7a4178e8b7d5e0ddd7895b886e;hb=9215008d87f1170da32befded6baeb55f3a2cf13;hp=f528f07b4eb32c9537c798ce6afc727cc6c955c4;hpb=fb5876e8defeb6af31e62002be26bdfa2beb56a7;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/impulse.qc b/qcsrc/server/impulse.qc
index f528f07b4..cce596399 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"
@@ -97,7 +96,7 @@ X(0)
 		for(int wepslot = 0; wepslot < MAX_WEAPONSLOTS; ++wepslot) \
 		{ \
 			.entity weaponentity = weaponentities[wepslot]; \
-			W_CycleWeapon(this, this.cvar_cl_weaponpriorities[slot], dir, weaponentity); \
+			W_CycleWeapon(this, CS(this).cvar_cl_weaponpriorities[slot], dir, weaponentity); \
 			if(wepslot == 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);
-}