X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=b33b96db1b2cb02cd24af7205b5e005d82ec406f;hb=74cebbb48d9481bb83eccb4438283f319352cb74;hp=792885070ebe329e9ec2a59d7ac2505fb1558285;hpb=36b51bc6eef2790a1138f70a05bc4c09cff07245;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 792885070..b33b96db1 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -117,12 +117,12 @@ void CreatureFrame_FallDamage(entity this)
 
 void CreatureFrame_All()
 {
-	FOREACH_ENTITY_FLOAT(damagedbycontents, true, LAMBDA(
-		if(it.movetype == MOVETYPE_NOCLIP) continue;
+	FOREACH_ENTITY_FLOAT(damagedbycontents, true, {
+		if (it.movetype == MOVETYPE_NOCLIP) continue;
 		CreatureFrame_Liquids(it);
 		CreatureFrame_FallDamage(it);
 		it.oldvelocity = it.velocity;
-	));
+	});
 }
 
 void Pause_TryPause(bool ispaused)
@@ -158,8 +158,8 @@ void PM_Main(Client this);
 void StartFrame()
 {
     // TODO: if move is more than 50ms, split it into two moves (this matches QWSV behavior and the client prediction)
-    FOREACH_ENTITY_CLASS(STR_PLAYER, IS_NOT_A_CLIENT(it), PM_Main(it));
-    FOREACH_ENTITY_CLASS(STR_PLAYER, IS_NOT_A_CLIENT(it), WITH(entity, self, it, PlayerPreThink()));
+    FOREACH_ENTITY_CLASS(STR_PLAYER, IS_FAKE_CLIENT(it), PM_Main(it));
+    FOREACH_ENTITY_CLASS(STR_PLAYER, IS_FAKE_CLIENT(it), WITHSELF(it, PlayerPreThink()));
 
 	execute_next_frame();
 	if (autocvar_sv_autopause && !server_is_dedicated) Pause_TryPause(true);
@@ -190,10 +190,9 @@ void StartFrame()
 	}
 #endif
 
-	FOREACH_ENTITY_FLOAT(csqcprojectile_clientanimate, true, LAMBDA(CSQCProjectile_Check(it)));
+	FOREACH_ENTITY_FLOAT(csqcprojectile_clientanimate, true, CSQCProjectile_Check(it));
 
-	if(RedirectionThink())
-		return;
+	if (RedirectionThink()) return;
 
 	UncustomizeEntitiesRun();
 	InitializeEntitiesRun();
@@ -201,8 +200,7 @@ void StartFrame()
 	WarpZone_StartFrame();
 
 	sys_frametime = autocvar_sys_ticrate * autocvar_slowmo;
-	if(sys_frametime <= 0)
-		sys_frametime = 1.0 / 60.0; // somewhat safe fallback
+	if (sys_frametime <= 0) sys_frametime = 1.0 / 60.0; // somewhat safe fallback
 
 	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
@@ -212,7 +210,7 @@ void StartFrame()
 	// detect when the pre-game countdown (if any) has ended and the game has started
 	game_delay = (time < game_starttime);
 
-	if(autocvar_sv_eventlog && game_delay_last && !game_delay)
+	if (autocvar_sv_eventlog && game_delay_last && !game_delay)
 		GameLogEcho(":startdelay_ended");
 
 	game_delay_last = game_delay;
@@ -220,8 +218,7 @@ void StartFrame()
 	CreatureFrame_All();
 	CheckRules_World();
 
-	if(warmup_stage && !gameover && warmup_limit > 0 && time >= warmup_limit)
-	{
+	if (warmup_stage && !gameover && warmup_limit > 0 && time >= warmup_limit) {
 		ReadyRestart();
 		return;
 	}
@@ -230,8 +227,8 @@ void StartFrame()
 	anticheat_startframe();
 	MUTATOR_CALLHOOK(SV_StartFrame);
 
-    FOREACH_CLIENT(true, LAMBDA(GlobalStats_update(it)));
-    FOREACH_ENTITY_CLASS(STR_PLAYER, IS_NOT_A_CLIENT(it), WITH(entity, self, it, PlayerPostThink()));
+    FOREACH_CLIENT(true, GlobalStats_update(it));
+    FOREACH_ENTITY_CLASS(STR_PLAYER, IS_FAKE_CLIENT(it), WITHSELF(it, PlayerPostThink()));
 }
 
 .vector originjitter;
@@ -239,24 +236,24 @@ void StartFrame()
 .float anglejitter;
 .string gametypefilter;
 .string cvarfilter;
-float DoesQ3ARemoveThisEntity();
+bool DoesQ3ARemoveThisEntity(entity this);
 void SV_OnEntityPreSpawnFunction()
 {SELFPARAM();
 	__spawnfunc_expect = this;
-	if (self)
-	if (self.gametypefilter != "")
-	if (!isGametypeInFilter(MapInfo_LoadedGametype, teamplay, have_team_spawns, self.gametypefilter))
+	if (this)
+	if (this.gametypefilter != "")
+	if (!isGametypeInFilter(MapInfo_LoadedGametype, teamplay, have_team_spawns, this.gametypefilter))
 	{
-		remove(self);
+		remove(this);
 		return;
 	}
-	if(self.cvarfilter != "")
+	if(this.cvarfilter != "")
 	{
 		float n, i, o, inv;
 		string s, k, v;
 		inv = 0;
 
-		s = self.cvarfilter;
+		s = this.cvarfilter;
 		if(substring(s, 0, 1) == "+")
 		{
 			s = substring(s, 1, -1);
@@ -355,41 +352,41 @@ LABEL(cvar_fail)
 		if (!inv)
 		{
 			//print("cvarfilter fail\n");
-			remove(self);
+			remove(this);
 			return;
 		}
 	}
 
-	if(DoesQ3ARemoveThisEntity())
+	if(DoesQ3ARemoveThisEntity(this))
 	{
-		remove(self);
+		remove(this);
 		return;
 	}
 
 	// support special -1 and -2 angle from radiant
-	if (self.angles == '0 -1 0')
-		self.angles = '-90 0 0';
-	else if (self.angles == '0 -2 0')
-		self.angles = '+90 0 0';
-
-	if(self.originjitter.x != 0)
-		self.origin_x = self.origin.x + (random() * 2 - 1) * self.originjitter.x;
-	if(self.originjitter.y != 0)
-		self.origin_y = self.origin.y + (random() * 2 - 1) * self.originjitter.y;
-	if(self.originjitter.z != 0)
-		self.origin_z = self.origin.z + (random() * 2 - 1) * self.originjitter.z;
-	if(self.anglesjitter.x != 0)
-		self.angles_x = self.angles.x + (random() * 2 - 1) * self.anglesjitter.x;
-	if(self.anglesjitter.y != 0)
-		self.angles_y = self.angles.y + (random() * 2 - 1) * self.anglesjitter.y;
-	if(self.anglesjitter.z != 0)
-		self.angles_z = self.angles.z + (random() * 2 - 1) * self.anglesjitter.z;
-	if(self.anglejitter != 0)
-		self.angles_y = self.angles.y + (random() * 2 - 1) * self.anglejitter;
-
-	if(MUTATOR_CALLHOOK(OnEntityPreSpawn))
+	if (this.angles == '0 -1 0')
+		this.angles = '-90 0 0';
+	else if (this.angles == '0 -2 0')
+		this.angles = '+90 0 0';
+
+	if(this.originjitter.x != 0)
+		this.origin_x = this.origin.x + (random() * 2 - 1) * this.originjitter.x;
+	if(this.originjitter.y != 0)
+		this.origin_y = this.origin.y + (random() * 2 - 1) * this.originjitter.y;
+	if(this.originjitter.z != 0)
+		this.origin_z = this.origin.z + (random() * 2 - 1) * this.originjitter.z;
+	if(this.anglesjitter.x != 0)
+		this.angles_x = this.angles.x + (random() * 2 - 1) * this.anglesjitter.x;
+	if(this.anglesjitter.y != 0)
+		this.angles_y = this.angles.y + (random() * 2 - 1) * this.anglesjitter.y;
+	if(this.anglesjitter.z != 0)
+		this.angles_z = this.angles.z + (random() * 2 - 1) * this.anglesjitter.z;
+	if(this.anglejitter != 0)
+		this.angles_y = this.angles.y + (random() * 2 - 1) * this.anglejitter;
+
+	if(MUTATOR_CALLHOOK(OnEntityPreSpawn, this))
 	{
-		remove(self);
+		remove(this);
 		return;
 	}
 }