X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_overkill.qc;h=713866d97af123850d2a4d42956fa6a6290469b3;hp=228a1f152318eab29af124c060d2c92e4c29abb4;hb=77477d386d12b458eaa8dabb23853ef2e391a71a;hpb=31e23b505f4bc42926abc1285f266b146aae4627

diff --git a/qcsrc/server/mutators/mutator_overkill.qc b/qcsrc/server/mutators/mutator_overkill.qc
index 228a1f1523..713866d97a 100644
--- a/qcsrc/server/mutators/mutator_overkill.qc
+++ b/qcsrc/server/mutators/mutator_overkill.qc
@@ -172,95 +172,7 @@ MUTATOR_HOOKFUNCTION(ok_PlayerSpawn)
 	else
 		self.ok_use_ammocharge = 0;
 
-	if(autocvar_g_overkill_spawnsystem_delay_death)
-		self.ok_spawnsys_timer = time + autocvar_g_overkill_spawnsystem_delay_death;
-
-	if(teamplay == 0 || autocvar_g_overkill_spawnsystem == 0)
-		return FALSE;
-
-	entity team_mate, best_mate = world;
-	vector best_spot = '0 0 0';
-	float pc = 0., best_dist = 0., dist = 0.;
-	FOR_EACH_PLAYER(team_mate)
-	{
-		if((autocvar_g_overkill_spawnsystem_check_health != 0 && team_mate.health >= 100) || autocvar_g_overkill_spawnsystem_check_health == 0)
-			if(team_mate.deadflag == DEAD_NO)
-				if(team_mate.ok_spawnsys_timer < time)
-					if(team_mate.team == self.team && (g_ctf || g_tdm || g_keyhunt))
-						if(team_mate != self)
-						{
-							tracebox(team_mate.origin, PL_MIN, PL_MAX, team_mate.origin - '0 0 100', MOVE_WORLDONLY, team_mate);
-							if(trace_fraction != 1.0)
-								if not(trace_dphitq3surfaceflags & Q3SURFACEFLAG_SKY)
-								{
-									pc = pointcontents(trace_endpos + '0 0 1');
-									if(pc == CONTENT_EMPTY)
-									{
-										if(vlen(team_mate.velocity) > 5)
-											fixedmakevectors(vectoangles(team_mate.velocity));
-										else
-											fixedmakevectors(team_mate.angles);
-
-										for(pc = 0; pc != 5; ++pc) // test 5 diffrent spots close to mate
-										{
-											switch(pc)
-											{
-											case 0:
-												tracebox(team_mate.origin , PL_MIN, PL_MAX, team_mate.origin + v_right * 128, MOVE_NORMAL, team_mate);
-												break;
-											case 1:
-												tracebox(team_mate.origin , PL_MIN, PL_MAX,team_mate.origin - v_right * 128 , MOVE_NORMAL, team_mate);
-												break;
-											case 2:
-												tracebox(team_mate.origin , PL_MIN, PL_MAX, team_mate.origin + v_right * 64 - v_forward * 64, MOVE_NORMAL, team_mate);
-												break;
-											case 3:
-												tracebox(team_mate.origin , PL_MIN, PL_MAX, team_mate.origin - v_right * 64 - v_forward * 64, MOVE_NORMAL, team_mate);
-												break;
-											case 4:
-												tracebox(team_mate.origin , PL_MIN, PL_MAX, team_mate.origin - v_forward * 128, MOVE_NORMAL, team_mate);
-												break;
-											}
-
-											if(trace_fraction == 1.0)
-											{
-												traceline(trace_endpos + '0 0 4', trace_endpos - '0 0 100', MOVE_NORMAL, team_mate);
-												if(trace_fraction != 1.0)
-												{
-													if(autocvar_g_overkill_spawnsystem_close2death)
-													{
-														dist = vlen(trace_endpos - self.ok_deathloc);
-														if(dist < best_dist || best_dist == 0)
-														{
-															best_dist = dist;
-															best_spot = trace_endpos;
-															best_mate = team_mate;
-														}
-													}
-													else
-													{
-														setorigin(self, trace_endpos);
-														self.angles = team_mate.angles;
-														team_mate.ok_spawnsys_timer = time + autocvar_g_overkill_spawnsystem_delay;
-														return FALSE;
-													}
-												}
-											}
-										}
-									}
-								}
-						}
-	}
-
-	if(autocvar_g_overkill_spawnsystem_close2death)
-		if(best_dist)
-		{
-			setorigin(self, best_spot);
-			self.angles = best_mate.angles;
-			best_mate.ok_spawnsys_timer = time + autocvar_g_overkill_spawnsystem_delay;
-		}
-
-	return 0;
+	return FALSE;
 }
 
 void start_hmg()