X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=986dbce155213d5d2fa3403aa02d7b8d4d7a5432;hb=2f3c32bb6372a436aad4a7e23fea91378d2ce740;hp=1448218796b17c7c6b3bef14bcd88f27ec04387e;hpb=b834eab77489d98d5d722d67c8a96cf6c3549436;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 144821879..986dbce15 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -160,8 +160,7 @@ Called before each frame by the server
 =============
 */
 
-float game_delay;
-float game_delay_last;
+bool game_delay_last;
 
 bool autocvar_sv_autopause = false;
 float RedirectionThink();
@@ -217,14 +216,10 @@ 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
-	game_delay = (time < game_starttime);
-
+	bool game_delay = (time < game_starttime);
 	if (autocvar_sv_eventlog && game_delay_last && !game_delay)
 		GameLogEcho(":startdelay_ended");
-
 	game_delay_last = game_delay;
 
 	CreatureFrame_All();
@@ -381,6 +376,9 @@ LABEL(cvar_fail)
 
 	set_movetype(this, this.movetype);
 
+	if(this.monster_attack)
+		IL_PUSH(g_monster_targets, this);
+
 	// support special -1 and -2 angle from radiant
 	if (this.angles == '0 -1 0')
 		this.angles = '-90 0 0';
@@ -413,6 +411,9 @@ LABEL(cvar_fail)
 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")); )
 	{
@@ -423,6 +424,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, tracetest_ent);
 	}
+	delete(tracetest_ent);
 }