]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/sv_main.qc
Remove uses of WITHSELF
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / sv_main.qc
index 1e9d3a766c18bfc784837d09cfe85a5e3ff8f8c3..c842dac3f97de50252980274b8c5feab71d23c97 100644 (file)
@@ -1,3 +1,4 @@
+#include "sv_main.qh"
 
 #include "anticheat.qh"
 #include "g_hook.qh"
@@ -101,7 +102,7 @@ void CreatureFrame_FallDamage(entity this)
                if(!this.hook.state)
                {
                        float dm = vlen(this.oldvelocity) - velocity_len; // dm is now the velocity DECREASE. Velocity INCREASE should never cause a sound or any damage.
-                       if (this.deadflag)
+                       if (IS_DEAD(this))
                                dm = (dm - autocvar_g_balance_falldamage_deadminspeed) * autocvar_g_balance_falldamage_factor;
                        else
                                dm = min((dm - autocvar_g_balance_falldamage_minspeed) * autocvar_g_balance_falldamage_factor, autocvar_g_balance_falldamage_maxdamage);
@@ -116,17 +117,29 @@ void CreatureFrame_FallDamage(entity this)
 
 void CreatureFrame_All()
 {
-       for(entity e = world; (e = findfloat(e, damagedbycontents, true)); )
-       {
-               if (e.movetype == MOVETYPE_NOCLIP) { continue; }
-
-               CreatureFrame_Liquids(e);
-               CreatureFrame_FallDamage(e);
+       FOREACH_ENTITY_FLOAT(damagedbycontents, true, {
+               if (it.movetype == MOVETYPE_NOCLIP) continue;
+               CreatureFrame_Liquids(it);
+               CreatureFrame_FallDamage(it);
+               it.oldvelocity = it.velocity;
+       });
+}
 
-        e.oldvelocity = e.velocity;
-       }
+void Pause_TryPause(bool ispaused)
+{
+       int n = 0;
+       FOREACH_CLIENT(IS_PLAYER(it) && IS_REAL_CLIENT(it), LAMBDA(
+               if (PHYS_INPUT_BUTTON_CHAT(it) != ispaused) return;
+               ++n;
+       ));
+       if (!n) return;
+       setpause(ispaused);
 }
 
+void SV_PausedTic(float elapsedtime)
+{
+       if (!server_is_dedicated) Pause_TryPause(false);
+}
 
 /*
 =============
@@ -139,11 +152,17 @@ Called before each frame by the server
 float game_delay;
 float game_delay_last;
 
+bool autocvar_sv_autopause = true;
 float RedirectionThink();
+void PM_Main(Client this);
 void StartFrame()
 {
-       SELFPARAM();
+    // 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_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);
 
        remove = remove_unsafely; // not during spawning!
        serverprevtime = servertime;
@@ -157,14 +176,12 @@ void StartFrame()
                LOG_INFO("CEFC time: ", ftos(t * 1000), "ms; ");
                int c_seeing = 0;
                int c_seen = 0;
-               entity cl;
-               FOR_EACH_CLIENT(cl)
-               {
-                       if(IS_REAL_CLIENT(cl))
+               FOREACH_CLIENT(true, LAMBDA(
+                       if(IS_REAL_CLIENT(it))
                                ++c_seeing;
-                       if(IS_PLAYER(cl))
+                       if(IS_PLAYER(it))
                                ++c_seen;
-               }
+               ));
                LOG_INFO("CEFC calls per second: ", ftos(c_seeing * (c_seen - 1) / t), "; ");
                LOG_INFO("CEFC 100% load at: ", ftos(solve_quadratic(t, -t, -1) * '0 1 0'), "\n");
 
@@ -173,11 +190,9 @@ void StartFrame()
        }
 #endif
 
-       for(entity e = world; (e = findfloat(e, csqcprojectile_clientanimate, 1)); )
-               CSQCProjectile_Check(e);
+       FOREACH_ENTITY_FLOAT(csqcprojectile_clientanimate, true, CSQCProjectile_Check(it));
 
-       if(RedirectionThink())
-               return;
+       if (RedirectionThink()) return;
 
        UncustomizeEntitiesRun();
        InitializeEntitiesRun();
@@ -185,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
@@ -196,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;
@@ -204,12 +218,7 @@ void StartFrame()
        CreatureFrame_All();
        CheckRules_World();
 
-       // if in warmup stage and limit for warmup is hit start match
-       if(warmup_stage)
-       if(!gameover)
-       if((g_warmup_limit > 0 && time >= g_warmup_limit)
-        || (g_warmup_limit == 0 && autocvar_timelimit != 0 && time >= autocvar_timelimit * 60))
-       {
+       if (warmup_stage && !gameover && warmup_limit > 0 && time >= warmup_limit) {
                ReadyRestart();
                return;
        }
@@ -217,13 +226,9 @@ void StartFrame()
        bot_serverframe();
        anticheat_startframe();
        MUTATOR_CALLHOOK(SV_StartFrame);
-       {
-        entity e;
-        FOR_EACH_CLIENT(e)
-        {
-            GlobalStats_update(e);
-        }
-    }
+
+    FOREACH_CLIENT(true, GlobalStats_update(it));
+    FOREACH_ENTITY_CLASS(STR_PLAYER, IS_FAKE_CLIENT(it), WITHSELF(it, PlayerPostThink()));
 }
 
 .vector originjitter;
@@ -231,24 +236,26 @@ void StartFrame()
 .float anglejitter;
 .string gametypefilter;
 .string cvarfilter;
-float DoesQ3ARemoveThisEntity();
+bool DoesQ3ARemoveThisEntity(entity this);
 void SV_OnEntityPreSpawnFunction()
-{SELFPARAM();
+{ENGINE_EVENT();
+       __spawnfunc_expecting = true;
        __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);
+               __spawnfunc_expecting = false;
                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);
@@ -342,46 +349,49 @@ void SV_OnEntityPreSpawnFunction()
                        }
                }
                inv = !inv;
-:cvar_fail
+LABEL(cvar_fail)
                // now inv is 1 if we want to keep the item, and 0 if we want to get rid of it
                if (!inv)
                {
                        //print("cvarfilter fail\n");
-                       remove(self);
+                       remove(this);
+                       __spawnfunc_expecting = false;
                        return;
                }
        }
 
-       if(DoesQ3ARemoveThisEntity())
+       if(DoesQ3ARemoveThisEntity(this))
        {
-               remove(self);
+               remove(this);
+               __spawnfunc_expecting = false;
                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);
+               __spawnfunc_expecting = false;
                return;
        }
 }