X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;fp=qcsrc%2Fserver%2Fsv_main.qc;h=34f3cdc21b63e6d405b5a9306fe432c8c78bb0ba;hp=68e7b375b507a09051f3607114f60d14cd9da0f2;hb=678127044857fb9b89f06faf7a3313bdeb43205c;hpb=7c19cc7613de325a0e43236ee4e202fd6c9f7a7a

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 68e7b375b5..34f3cdc21b 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -217,8 +217,6 @@ void StartFrame()
 	if (timeout_status == TIMEOUT_LEADTIME) // just before the timeout (when timeout_status will be TIMEOUT_ACTIVE)
 		orig_slowmo = autocvar_slowmo; // slowmo will be restored after the timeout
 
-	skill = autocvar_skill;
-
 	// detect when the pre-game countdown (if any) has ended and the game has started
 	bool game_delay = (time < game_starttime);
 	if (autocvar_sv_eventlog && game_delay_last && !game_delay)
@@ -369,6 +367,9 @@ LABEL(cleanup)
 void WarpZone_PostInitialize_Callback()
 {
 	// create waypoint links for warpzones
+	entity tracetest_ent = spawn();
+	setsize(tracetest_ent, PL_MIN_CONST, PL_MAX_CONST);
+	tracetest_ent.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_PLAYERCLIP | DPCONTENTS_BOTCLIP;
 	//for(entity e = warpzone_first; e; e = e.warpzone_next)
 	for(entity e = NULL; (e = find(e, classname, "trigger_warpzone")); )
 	{
@@ -379,6 +380,7 @@ void WarpZone_PostInitialize_Callback()
 		dst = (e.enemy.absmin + e.enemy.absmax) * 0.5;
 		makevectors(e.enemy.warpzone_angles);
 		dst = dst + ((e.enemy.warpzone_origin - dst) * v_forward) * v_forward - 16 * v_right;
-		waypoint_spawnforteleporter_v(e, src, dst, 0);
+		waypoint_spawnforteleporter_wz(e, src, dst, 0, -v_up, tracetest_ent);
 	}
+	delete(tracetest_ent);
 }