X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=5779a511dbb4a230af53322461c125a917c43bf5;hp=043cb7713d24cc61c91b162efba963ec0dd73065;hb=6f37a8f8076a572097afb13de2c367a72717c927;hpb=e0ac5f9f14e169a1e19d0e36b85cab061a74ed93 diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index 043cb7713..5779a511d 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/sv_main.qc @@ -1,15 +1,45 @@ +#include "_.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 "vehicles/vehicles_def.qh" +#include "weapons/csqcprojectile.qh" + +#include "../common/constants.qh" +#include "../common/deathtypes.qh" +#include "../common/mapinfo.qh" +#include "../common/util.qh" + +#include "../common/weapons/weapons.qh" + +#include "../csqcmodellib/sv_model.qh" + +#include "../warpzonelib/common.qh" +#include "../warpzonelib/server.qh" + +.float lastground; + void CreatureFrame (void) { entity oldself; float dm; oldself = self; - for(self = world; (self = findfloat(self, damagedbycontents, TRUE)); ) + for(self = world; (self = findfloat(self, damagedbycontents, true)); ) { if (self.movetype == MOVETYPE_NOCLIP) { continue; } float vehic = (self.vehicle_flags & VHF_ISVEHICLE); float projectile = (self.flags & FL_PROJECTILE); + float monster = (self.flags & FL_MONSTER); 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) { @@ -19,7 +49,7 @@ void CreatureFrame (void) self.dmgtime = 0; } - if(!vehic && !projectile) // vehicles and projectiles don't drown + if(!vehic && !projectile && !monster) // vehicles, monsters and projectiles don't drown { if (self.waterlevel != WATERLEVEL_SUBMERGED) { @@ -61,7 +91,7 @@ void CreatureFrame (void) if (self.watersound_finished < time) { self.watersound_finished = time + 0.5; - sound (self, CH_PLAYER, "player/lava.wav", VOL_BASE, ATTEN_NORM); + sound (self, CH_PLAYER_SINGLE, "player/lava.wav", 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'); } @@ -70,7 +100,7 @@ void CreatureFrame (void) if (self.watersound_finished < time) { self.watersound_finished = time + 0.5; - sound (self, CH_PLAYER, "player/slime.wav", VOL_BASE, ATTEN_NORM); + sound (self, CH_PLAYER_SINGLE, "player/slime.wav", 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'); } @@ -93,7 +123,7 @@ void CreatureFrame (void) { // check for falling damage float velocity_len = vlen(self.velocity); - if(!self.hook.state && !(g_cts && !autocvar_g_cts_selfdamage)) + if(!self.hook.state) { dm = vlen(self.oldvelocity) - velocity_len; // dm is now the velocity DECREASE. Velocity INCREASE should never cause a sound or any damage. if (self.deadflag) @@ -154,7 +184,6 @@ float game_delay; float game_delay_last; float RedirectionThink(); -entity SelectSpawnPoint (float anypoint); void StartFrame (void) { execute_next_frame(); @@ -210,32 +239,35 @@ 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"); game_delay_last = game_delay; + CreatureFrame (); + CheckRules_World (); + // if in warmup stage and limit for warmup is hit start match - if (warmup_stage) - if ((g_warmup_limit > 0 && time >= g_warmup_limit) + 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)) { ReadyRestart(); return; } - CreatureFrame (); - CheckRules_World (); - bot_serverframe(); FOR_EACH_PLAYER(self) self.porto_forbidden = max(0, self.porto_forbidden - 1); + anticheat_startframe(); + MUTATOR_CALLHOOK(SV_StartFrame); } @@ -376,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)) {