X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fimpulse.qc;h=62acd99d8df93ac608b6d32b431529da000189c3;hb=1f79db212536f24f697c934d3e50f1870705e2a7;hp=2320eb830ef50db38913df89c96a724ce801080d;hpb=0ca59fa70f5e81336415e1661d879aa91ff03db0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/impulse.qc b/qcsrc/server/impulse.qc
index 2320eb830..62acd99d8 100644
--- a/qcsrc/server/impulse.qc
+++ b/qcsrc/server/impulse.qc
@@ -149,7 +149,7 @@ X(9, next)
 		for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) \
 		{ \
 			.entity weaponentity = weaponentities[slot]; \
-			W_SwitchWeapon_TryOthers(this, Weapons_from(WEP_FIRST + i), weaponentity); \
+			W_SwitchWeapon_TryOthers(this, REGISTRY_GET(Weapons, WEP_FIRST + i), weaponentity); \
 			if(autocvar_g_weaponswitch_debug != 1) \
 				break; \
 		} \
@@ -507,7 +507,7 @@ IMPULSE(waypoint_here_here)
 
 IMPULSE(waypoint_here_crosshair)
 {
-	WarpZone_crosshair_trace(this);
+	WarpZone_crosshair_trace_plusvisibletriggers(this);
 	entity wp = WaypointSprite_DeployFixed(WP_Here, false, this, trace_endpos, RADARICON_HERE);
 	if (wp) WaypointSprite_Ping(wp);
 	sprint(this, "HERE spawned at crosshair\n");