X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=0a9d8f21014dab6571af9b9deb818ae0d7ed1702;hb=437d67dbc7631d6c49e922990d96461d3ff4b7b2;hp=48cd05361ed9b9192a4949b27117c9287b2462ab;hpb=924ba9b521119651b5667c0280868df9f95ca488;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index 48cd05361..0a9d8f210 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/sv_main.qc @@ -1,4 +1,3 @@ -#include "_all.qh" #include "anticheat.qh" #include "g_hook.qh" @@ -10,36 +9,36 @@ #include "command/common.qh" #include "mutators/mutators_include.qh" -#include "vehicles/vehicle.qh" #include "weapons/csqcprojectile.qh" #include "../common/constants.qh" -#include "../common/deathtypes.qh" +#include "../common/deathtypes/all.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 "../lib/csqcmodel/sv_model.qh" -#include "../warpzonelib/common.qh" -#include "../warpzonelib/server.qh" +#include "../lib/warpzone/common.qh" +#include "../lib/warpzone/server.qh" .float lastground; +.int state; 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) { @@ -63,7 +62,7 @@ void CreatureFrame (void) if (!self.deadflag) if (self.pain_finished < time) { - Damage (self, world, world, autocvar_g_balance_contents_playerdamage_drowning * autocvar_g_balance_contents_damagerate, DEATH_DROWN, self.origin, '0 0 0'); + Damage (self, world, world, autocvar_g_balance_contents_playerdamage_drowning * autocvar_g_balance_contents_damagerate, DEATH_DROWN.m_id, self.origin, '0 0 0'); self.pain_finished = time + 0.5; } } @@ -77,11 +76,11 @@ void CreatureFrame (void) { if (self.watertype == CONTENT_LAVA) { - Damage (self, world, world, autocvar_g_balance_contents_projectiledamage * autocvar_g_balance_contents_damagerate * self.waterlevel, DEATH_LAVA, self.origin, '0 0 0'); + Damage (self, world, world, autocvar_g_balance_contents_projectiledamage * autocvar_g_balance_contents_damagerate * self.waterlevel, DEATH_LAVA.m_id, self.origin, '0 0 0'); } else if (self.watertype == CONTENT_SLIME) { - Damage (self, world, world, autocvar_g_balance_contents_projectiledamage * autocvar_g_balance_contents_damagerate * self.waterlevel, DEATH_SLIME, self.origin, '0 0 0'); + Damage (self, world, world, autocvar_g_balance_contents_projectiledamage * autocvar_g_balance_contents_damagerate * self.waterlevel, DEATH_SLIME.m_id, self.origin, '0 0 0'); } } else @@ -91,18 +90,18 @@ void CreatureFrame (void) if (self.watersound_finished < time) { self.watersound_finished = time + 0.5; - sound (self, CH_PLAYER_SINGLE, "player/lava.wav", VOL_BASE, ATTEN_NORM); + sound (self, CH_PLAYER_SINGLE, SND_LAVA, VOL_BASE, ATTEN_NORM); } - Damage (self, world, world, autocvar_g_balance_contents_playerdamage_lava * autocvar_g_balance_contents_damagerate * self.waterlevel, DEATH_LAVA, self.origin, '0 0 0'); + Damage (self, world, world, autocvar_g_balance_contents_playerdamage_lava * autocvar_g_balance_contents_damagerate * self.waterlevel, DEATH_LAVA.m_id, self.origin, '0 0 0'); } else if (self.watertype == CONTENT_SLIME) { if (self.watersound_finished < time) { self.watersound_finished = time + 0.5; - sound (self, CH_PLAYER_SINGLE, "player/slime.wav", VOL_BASE, ATTEN_NORM); + sound (self, CH_PLAYER_SINGLE, SND_SLIME, VOL_BASE, ATTEN_NORM); } - Damage (self, world, world, autocvar_g_balance_contents_playerdamage_slime * autocvar_g_balance_contents_damagerate * self.waterlevel, DEATH_SLIME, self.origin, '0 0 0'); + Damage (self, world, world, autocvar_g_balance_contents_playerdamage_slime * autocvar_g_balance_contents_damagerate * self.waterlevel, DEATH_SLIME.m_id, self.origin, '0 0 0'); } } } @@ -131,11 +130,11 @@ void CreatureFrame (void) else dm = min((dm - autocvar_g_balance_falldamage_minspeed) * autocvar_g_balance_falldamage_factor, autocvar_g_balance_falldamage_maxdamage); if (dm > 0) - Damage (self, world, world, dm, DEATH_FALL, self.origin, '0 0 0'); + Damage (self, world, world, dm, DEATH_FALL.m_id, self.origin, '0 0 0'); } if(autocvar_g_maxspeed > 0 && velocity_len > autocvar_g_maxspeed) - Damage (self, world, world, 100000, DEATH_SHOOTING_STAR, self.origin, '0 0 0'); + Damage (self, world, world, 100000, DEATH_SHOOTING_STAR.m_id, self.origin, '0 0 0'); // play stupid sounds if (g_footsteps) if (!gameover) @@ -169,7 +168,7 @@ void CreatureFrame (void) self.oldvelocity = self.velocity; } - self = oldself; + setself(this); } @@ -186,7 +185,7 @@ float game_delay_last; float RedirectionThink(); void StartFrame (void) -{ +{SELFPARAM(); execute_next_frame(); remove = remove_unsafely; // not during spawning! @@ -200,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) @@ -210,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()) @@ -264,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(); @@ -279,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))