From: Martin Taibr <taibr.martin@gmail.com>
Date: Thu, 6 Oct 2016 23:26:39 +0000 (+0200)
Subject: reorder
X-Git-Tag: xonotic-v0.8.2~456^2~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=559796b28bb14e368847c1784901a6a7e4394b80;p=xonotic%2Fxonotic-data.pk3dir.git

reorder
---

diff --git a/qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc b/qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc
index 8eff82e98..68af78af4 100644
--- a/qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc
+++ b/qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc
@@ -88,7 +88,7 @@ MUTATOR_HOOKFUNCTION(spawn_near_teammate, PlayerSpawn)
 
 		entity best_mate = NULL;
 		vector best_pos = '0 0 0';
-		float best_dist = 0, dist = 0;
+		float best_dist = 0;
 		FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(
 			LOG_INFOF("  for client: %s %v\n", it.netname, it.origin);
 			//if (!SAME_TEAM(player, it)) continue; // TODO DEBUGING
@@ -101,7 +101,7 @@ MUTATOR_HOOKFUNCTION(spawn_near_teammate, PlayerSpawn)
 			if (it == player) continue;
 
 			vector horiz_vel = vec2(it.velocity);
-			if(vdist(horiz_vel, >, 450))
+			if (vdist(horiz_vel, >, 450))
 				fixedmakevectors(vectoangles(horiz_vel));
 			else
 				fixedmakevectors(it.angles); // .angles is the angle of the model - usually/always 0 pitch
@@ -113,16 +113,16 @@ MUTATOR_HOOKFUNCTION(spawn_near_teammate, PlayerSpawn)
 				switch(i)
 				{
 					case 0:
-						tracebox(it.origin, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), it.origin + v_right * 192 + v_up * 64, MOVE_NOMONSTERS, it);
+						tracebox(it.origin, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), it.origin - v_forward * 64 + v_right * 128 + v_up * 64, MOVE_NOMONSTERS, it);
 						break;
 					case 1:
-						tracebox(it.origin, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), it.origin - v_right * 192 + v_up * 64, MOVE_NOMONSTERS, it);
+						tracebox(it.origin, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), it.origin - v_forward * 64 - v_right * 128 + v_up * 64, MOVE_NOMONSTERS, it);
 						break;
 					case 2:
-						tracebox(it.origin, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), it.origin - v_forward * 64 + v_right * 128 + v_up * 64, MOVE_NOMONSTERS, it);
+						tracebox(it.origin, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), it.origin + v_right * 192 + v_up * 64, MOVE_NOMONSTERS, it);
 						break;
 					case 3:
-						tracebox(it.origin, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), it.origin - v_forward * 64 - v_right * 128 + v_up * 64, MOVE_NOMONSTERS, it);
+						tracebox(it.origin, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), it.origin - v_right * 192 + v_up * 64, MOVE_NOMONSTERS, it);
 						break;
 					case 4:
 						tracebox(it.origin, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), it.origin - v_forward * 128 + v_right * 64 + v_up * 64, MOVE_NOMONSTERS, it);
@@ -167,7 +167,7 @@ MUTATOR_HOOKFUNCTION(spawn_near_teammate, PlayerSpawn)
 
 				if(autocvar_g_spawn_near_teammate_ignore_spawnpoint_closetodeath)
 				{
-					dist = vlen(vectical_trace_endpos - player.msnt_deathloc);
+					float dist = vlen(vectical_trace_endpos - player.msnt_deathloc);
 					LOG_INFOF("      dist: %f, best_dist %f\n", dist, best_dist);
 					if(dist < best_dist || best_dist == 0)
 					{