X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=63d91f6070ca3ecee2ecb56527f7a0c6710c9a98;hb=19a4a52c42e00347a51b62ff1e5adcadecda31e0;hp=2497b9d502854f663d65f3fd6779c54d723a46f5;hpb=a2c8a091d0de7fb28edc65c2dab3a0836dc52bdd;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 2497b9d50..63d91f607 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -151,6 +151,8 @@ float RedirectionThink();
 entity SelectSpawnPoint (float anypoint);
 void StartFrame (void)
 {
+	execute_next_frame();
+
 	remove = remove_unsafely; // not during spawning!
 	serverprevtime = servertime;
 	servertime = time;
@@ -196,11 +198,14 @@ void StartFrame (void)
 	if(sys_frametime <= 0)
 		sys_frametime = 1.0 / 60.0; // somewhat safe fallback
 
-	if (timeoutStatus == 1) // just before the timeout (when timeoutStatus will be 2)
+	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;
 
+	count_players();
+	if(g_ca || g_freezetag)
+		count_alive_players();
 	Arena_Warmup();
 	Spawnqueue_Check();
 
@@ -226,8 +231,6 @@ void StartFrame (void)
 	CreatureFrame ();
 	CheckRules_World ();
 
-	AuditTeams();
-
 	RuneMatchGivePoints();
 	bot_serverframe();