X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=73c444afec7b8637e0481ecb18ba133d01f471a1;hb=7b71d7d90d28e0365ce11f94c3460f5b71211312;hp=ce5828affc0194d1c051cf26b3412b6ff2688c61;hpb=22042893e4c8ce0f178043ace460c7831c3df4d2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index ce5828aff..73c444afe 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -128,8 +128,8 @@ void CreatureFrame (void)
 				}
 			}
 		}
-
-		self.oldvelocity = self.velocity;
+		
+        self.oldvelocity = self.velocity;
 	}
 	self = oldself;
 }
@@ -196,7 +196,7 @@ 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;
@@ -231,17 +231,10 @@ void StartFrame (void)
 	RuneMatchGivePoints();
 	bot_serverframe();
 
-	if(autocvar_spawn_debugview)
-	{
-		RandomSelection_Init();
-		for(self = world; (self = find(self, classname, "player")); )
-			RandomSelection_Add(self, 0, string_null, 1, 0);
-		self = RandomSelection_chosen_ent;
-		SelectSpawnPoint(0);
-	}
-
 	FOR_EACH_PLAYER(self)
 		self.porto_forbidden = max(0, self.porto_forbidden - 1);
+
+	MUTATOR_CALLHOOK(SV_StartFrame);
 }
 
 .vector originjitter;
@@ -252,8 +245,9 @@ void StartFrame (void)
 float DoesQ3ARemoveThisEntity();
 void SV_OnEntityPreSpawnFunction()
 {
-	if(self.gametypefilter != "")
-	if not(isGametypeInFilter(game, teamplay, have_team_spawns, self.gametypefilter))
+	if (self)
+	if (self.gametypefilter != "")
+	if not(isGametypeInFilter(MapInfo_LoadedGametype, teamplay, have_team_spawns, self.gametypefilter))
 	{
 		remove(self);
 		return;
@@ -275,7 +269,7 @@ void SV_OnEntityPreSpawnFunction()
 			s = substring(s, 1, -1);
 		}
 
-		n = tokenize(s);
+		n = tokenize_console(s);
 		for(i = 0; i < n; ++i)
 		{
 			s = argv(i);