X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fimpulse.qc;h=5010d283711ff0e795ed3f146bb097b56cfbcd10;hb=6e4c0c69ce16c05cdc8ce97c5287c848acfc3b1f;hp=0741756767c4d2648c6b53fe881d138b79e8228f;hpb=a897ab142f0bd55cd3940041b995ad8c67df7443;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/impulse.qc b/qcsrc/server/impulse.qc
index 074175676..5010d2837 100644
--- a/qcsrc/server/impulse.qc
+++ b/qcsrc/server/impulse.qc
@@ -97,7 +97,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 +343,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;
 	}
 }
 
@@ -352,9 +353,9 @@ void ImpulseCommands(entity this)
 {
 	if (game_stopped) return;
 
-	int imp = this.impulse;
+	int imp = CS(this).impulse;
 	if (!imp) return;
-	this.impulse = 0;
+	CS(this).impulse = 0;
 
 	if (MinigameImpulse(this, imp)) return;
 
@@ -574,65 +575,13 @@ IMPULSE(waypoint_clear)
 IMPULSE(navwaypoint_spawn)
 {
 	if (!autocvar_g_waypointeditor) return;
-	vector org = this.origin;
-	bool sym = boolean(autocvar_g_waypointeditor_symmetrical);
-
-	LABEL(add_wp);
-	waypoint_schedulerelink(waypoint_spawn(org, org, 0));
-	bprint(strcat("Waypoint spawned at ", vtos(org), "\n"));
-	if(sym)
-	{
-		vector map_center = autocvar_g_waypointeditor_symmetrical_center;
-		org = this.origin;
-		org.x = map_center.x - (org.x - map_center.x);
-		org.y = map_center.y - (org.y - map_center.y);
-		if (vdist(org - this.origin, >, 10))
-		{
-			sym = false;
-			goto add_wp;
-		}
-	}
+	waypoint_spawn_fromeditor(this);
 }
 
 IMPULSE(navwaypoint_remove)
 {
 	if (!autocvar_g_waypointeditor) return;
-	entity e = navigation_findnearestwaypoint(this, false);
-	bool sym = boolean(autocvar_g_waypointeditor_symmetrical);
-
-	LABEL(remove_wp);
-	if (!e) return;
-	if (e.wpflags & WAYPOINTFLAG_GENERATED) return;
-
-	if (e.wphardwired)
-	{
-		LOG_INFO("^1Warning: ^7Removal of hardwired waypoints is not allowed in the editor. Please remove links from/to this waypoint (", vtos(e.origin), ") by hand from maps/", mapname, ".waypoints.hardwired\n");
-		return;
-	}
-
-	entity wp_sym = NULL;
-	if (sym)
-	{
-		vector map_center = autocvar_g_waypointeditor_symmetrical_center;
-		vector org = this.origin;
-		org.x = map_center.x - (org.x - map_center.x);
-		org.y = map_center.y - (org.y - map_center.y);
-		FOREACH_ENTITY_CLASS("waypoint", !(it.wpflags & WAYPOINTFLAG_GENERATED), {
-			if(vdist(org - it.origin, <, 3))
-			{
-				wp_sym = it;
-				break;
-			}
-		});
-	}
-	bprint(strcat("Waypoint removed at ", vtos(e.origin), "\n"));
-	waypoint_remove(e);
-	if (sym && wp_sym)
-	{
-		e = wp_sym;
-		sym = false;
-		goto remove_wp;
-	}
+	waypoint_remove_fromeditor(this);
 }
 
 IMPULSE(navwaypoint_relink)
@@ -650,93 +599,5 @@ IMPULSE(navwaypoint_save)
 IMPULSE(navwaypoint_unreachable)
 {
 	if (!autocvar_g_waypointeditor) return;
-	IL_EACH(g_waypoints, true,
-	{
-		it.colormod = '0.5 0.5 0.5';
-		it.effects &= ~(EF_NODEPTHTEST | EF_RED | EF_BLUE);
-	});
-	entity e2 = navigation_findnearestwaypoint(this, false);
-	navigation_markroutes(this, e2);
-
-	int j, m;
-
-	j = 0;
-	m = 0;
-	IL_EACH(g_waypoints, it.wpcost >= 10000000,
-	{
-		LOG_INFO("unreachable: ", etos(it), " ", vtos(it.origin), "\n");
-		it.colormod_z = 8;
-		it.effects |= EF_NODEPTHTEST | EF_BLUE;
-		++j;
-		++m;
-	});
-	if (j) LOG_INFOF("%d waypoints cannot be reached from here in any way (marked with blue light)\n", j);
-	navigation_markroutes_inverted(e2);
-
-	j = 0;
-	IL_EACH(g_waypoints, it.wpcost >= 10000000,
-	{
-		LOG_INFO("cannot reach me: ", etos(it), " ", vtos(it.origin), "\n");
-		it.colormod_x = 8;
-		if (!(it.effects & EF_NODEPTHTEST))  // not already reported before
-			++m;
-		it.effects |= EF_NODEPTHTEST | EF_RED;
-		++j;
-	});
-	if (j) LOG_INFOF("%d waypoints cannot walk to here in any way (marked with red light)\n", j);
-	if (m) LOG_INFOF("%d waypoints have been marked total\n", m);
-
-	j = 0;
-	IL_EACH(g_spawnpoints, true,
-	{
-		vector org = it.origin;
-		tracebox(it.origin, PL_MIN_CONST, PL_MAX_CONST, it.origin - '0 0 512', MOVE_NOMONSTERS, NULL);
-		setorigin(it, trace_endpos);
-		if (navigation_findnearestwaypoint(it, false))
-		{
-			setorigin(it, org);
-			it.effects &= ~EF_NODEPTHTEST;
-			it.model = "";
-		}
-		else
-		{
-			setorigin(it, org);
-			LOG_INFO("spawn without waypoint: ", etos(it), " ", vtos(it.origin), "\n");
-			it.effects |= EF_NODEPTHTEST;
-			_setmodel(it, this.model);
-			it.frame = this.frame;
-			it.skin = this.skin;
-			it.colormod = '8 0.5 8';
-			setsize(it, '0 0 0', '0 0 0');
-			++j;
-		}
-	});
-	if (j) LOG_INFOF("%d spawnpoints have no nearest waypoint (marked by player model)\n", j);
-
-	j = 0;
-	IL_EACH(g_items, true,
-	{
-		it.effects &= ~(EF_NODEPTHTEST | EF_RED | EF_BLUE);
-		it.colormod = '0.5 0.5 0.5';
-	});
-	IL_EACH(g_items, true,
-	{
-		if (navigation_findnearestwaypoint(it, false)) continue;
-		LOG_INFO("item without waypoint: ", etos(it), " ", vtos(it.origin), "\n");
-		it.effects |= EF_NODEPTHTEST | EF_RED;
-		it.colormod_x = 8;
-		++j;
-	});
-	if (j) LOG_INFOF("%d items have no nearest waypoint and cannot be walked away from (marked with red light)\n", j);
-
-	j = 0;
-	IL_EACH(g_items, true,
-	{
-		if (navigation_findnearestwaypoint(it, true)) continue;
-		LOG_INFO("item without waypoint: ", etos(it), " ", vtos(it.origin), "\n");
-		it.effects |= EF_NODEPTHTEST | EF_BLUE;
-		it.colormod_z = 8;
-		++j;
-	});
-	if (j) LOG_INFOF("%d items have no nearest waypoint and cannot be walked to (marked with blue light)\n", j);
+	waypoint_unreachable(this);
 }