Tweak verbosity

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / sv_main.qc

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index b25528e1645ccf1f635a20e5ae2866dc05eaf045..948e2d37435cdc392bce62b4bb52045fdb2f4054 100644 (file)
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -1,16 +1,44 @@
+#include "_all.qh"
+
+#include "anticheat.qh"
+#include "g_hook.qh"
+#include "g_world.qh"
+
+#include "bot/bot.qh"
+#include "bot/waypoints.qh"
+
+#include "command/common.qh"
+
+#include "mutators/mutators_include.qh"
+#include "weapons/csqcprojectile.qh"
+
+#include "../common/constants.qh"
+#include "../common/deathtypes.qh"
+#include "../common/mapinfo.qh"
+#include "../common/util.qh"
+
+#include "../common/vehicles/all.qh"
+#include "../common/weapons/all.qh"
+
+#include "../csqcmodellib/sv_model.qh"
+
+#include "../warpzonelib/common.qh"
+#include "../warpzonelib/server.qh"
+
+.float lastground;
+
 void CreatureFrame (void)
-{
-       entity oldself;
+{SELFPARAM();
        float dm;
 
-       oldself = self;
-       for(self = world; (self = findfloat(self, damagedbycontents, TRUE)); )
+       for(entity e = world; (e = findfloat(e, damagedbycontents, true)); )
        {
+               setself(e);
                if (self.movetype == MOVETYPE_NOCLIP) { continue; }
 
-               float vehic = (self.vehicle_flags & VHF_ISVEHICLE);
+               float vehic = IS_VEHICLE(self);
                float projectile = (self.flags & FL_PROJECTILE);
-               float monster = (self.flags & FL_MONSTER);
+               float monster = IS_MONSTER(self);
 
                if (self.watertype <= CONTENT_WATER && self.waterlevel > 0) // workaround a retarded bug made by id software :P (yes, it's that old of a bug)
                {
@@ -111,6 +139,7 @@ void CreatureFrame (void)
                        if (g_footsteps)
                        if (!gameover)
                        if (self.flags & FL_ONGROUND)
+                       if (!self.crouch)
                        if (velocity_len > autocvar_sv_maxspeed * 0.6)
                        if (!self.deadflag)
                        if (time < self.lastground + 0.2)
@@ -139,7 +168,7 @@ void CreatureFrame (void)
 
         self.oldvelocity = self.velocity;
        }
-       self = oldself;
+       setself(this);
 }
 
 
@@ -156,7 +185,7 @@ float game_delay_last;
 
 float RedirectionThink();
 void StartFrame (void)
-{
+{SELFPARAM();
        execute_next_frame();
 
        remove = remove_unsafely; // not during spawning!
@@ -170,7 +199,7 @@ void StartFrame (void)
                float t, pp, c_seeing, c_seen;
                entity cl;
                t = client_cefc_accumulator / (time - client_cefc_accumulatortime);
-               print("CEFC time: ", ftos(t * 1000), "ms; ");
+               LOG_INFO("CEFC time: ", ftos(t * 1000), "ms; ");
                c_seeing = 0;
                c_seen = 0;
                FOR_EACH_CLIENT(cl)
@@ -180,16 +209,15 @@ void StartFrame (void)
                        if(IS_PLAYER(cl))
                                ++c_seen;
                }
-               print("CEFC calls per second: ", ftos(c_seeing * (c_seen - 1) / t), "; ");
-               print("CEFC 100% load at: ", ftos(solve_quadratic(t, -t, -1) * '0 1 0'), "\n");
+               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");
 
                client_cefc_accumulatortime = time;
                client_cefc_accumulator = 0;
        }
 #endif
 
-       entity e;
-       for(e = world; (e = findfloat(e, csqcprojectile_clientanimate, 1)); )
+       for(entity e = world; (e = findfloat(e, csqcprojectile_clientanimate, 1)); )
                CSQCProjectile_Check(e);
 
        if(RedirectionThink())
@@ -210,10 +238,10 @@ void StartFrame (void)
        skill = autocvar_skill;
 
        // detect when the pre-game countdown (if any) has ended and the game has started
-       game_delay = (time < game_starttime) ? TRUE : FALSE;
+       game_delay = (time < game_starttime) ? true : false;
 
-       if(game_delay_last == TRUE)
-       if(game_delay == FALSE)
+       if(game_delay_last == true)
+       if(game_delay == false)
        if(autocvar_sv_eventlog)
                GameLogEcho(":startdelay_ended");
 
@@ -234,8 +262,9 @@ void StartFrame (void)
 
        bot_serverframe();
 
-       FOR_EACH_PLAYER(self)
-               self.porto_forbidden = max(0, self.porto_forbidden - 1);
+       entity e;
+       FOR_EACH_PLAYER(e)
+               e.porto_forbidden = max(0, e.porto_forbidden - 1);
 
        anticheat_startframe();
 
@@ -249,7 +278,7 @@ void StartFrame (void)
 .string cvarfilter;
 float DoesQ3ARemoveThisEntity();
 void SV_OnEntityPreSpawnFunction()
-{
+{SELFPARAM();
        if (self)
        if (self.gametypefilter != "")
        if (!isGametypeInFilter(MapInfo_LoadedGametype, teamplay, have_team_spawns, self.gametypefilter))
@@ -379,20 +408,20 @@ void SV_OnEntityPreSpawnFunction()
        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.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;
+               self.angles_y = self.angles.y + (random() * 2 - 1) * self.anglejitter;
 
        if(MUTATOR_CALLHOOK(OnEntityPreSpawn))
        {