X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=a7dfb96775d8d272b13a1acf6e4f104b75a3f936;hb=bda4e58210275f23266f9a1231de949b6bc64893;hp=138051827bcad56fac48d9ed1f993596a8f405cc;hpb=9a3b01ba5da2726001a5ed74645a15ce764a3675;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index 138051827..a7dfb9677 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" @@ -9,25 +8,27 @@ #include "command/common.qh" -#include "mutators/mutators_include.qh" +#include "mutators/all.qh" #include "weapons/csqcprojectile.qh" #include "../common/constants.qh" -#include "../common/deathtypes.qh" +#include "../common/deathtypes/all.qh" +#include "../common/debug.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) +void CreatureFrame () {SELFPARAM(); float dm; @@ -62,7 +63,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; } } @@ -76,11 +77,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 @@ -92,7 +93,9 @@ void CreatureFrame (void) self.watersound_finished = time + 0.5; 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'); + if(autocvar_g_balance_contents_playerdamage_lava_burn) + Fire_AddDamage(self, world, autocvar_g_balance_contents_playerdamage_lava_burn * self.waterlevel, autocvar_g_balance_contents_playerdamage_lava_burn_time * self.waterlevel, DEATH_LAVA.m_id); } else if (self.watertype == CONTENT_SLIME) { @@ -101,7 +104,7 @@ void CreatureFrame (void) self.watersound_finished = time + 0.5; 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'); } } } @@ -130,11 +133,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) @@ -158,9 +161,9 @@ void CreatureFrame (void) if (!(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOSTEPS)) { if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_METALSTEPS) - GlobalSound(globalsound_metalstep, CH_PLAYER, VOICETYPE_PLAYERSOUND); + GlobalSound(GS_STEP_METAL, CH_PLAYER, VOICETYPE_PLAYERSOUND); else - GlobalSound(globalsound_step, CH_PLAYER, VOICETYPE_PLAYERSOUND); + GlobalSound(GS_STEP, CH_PLAYER, VOICETYPE_PLAYERSOUND); } } } @@ -184,8 +187,9 @@ float game_delay; float game_delay_last; float RedirectionThink(); -void StartFrame (void) -{SELFPARAM(); +void StartFrame() +{ + SELFPARAM(); execute_next_frame(); remove = remove_unsafely; // not during spawning! @@ -196,12 +200,11 @@ void StartFrame (void) #ifdef PROFILING if(time > client_cefc_accumulatortime + 1) { - float t, pp, c_seeing, c_seen; - entity cl; - t = client_cefc_accumulator / (time - client_cefc_accumulatortime); + float t = client_cefc_accumulator / (time - client_cefc_accumulatortime); LOG_INFO("CEFC time: ", ftos(t * 1000), "ms; "); - c_seeing = 0; - c_seen = 0; + int c_seeing = 0; + int c_seen = 0; + entity cl; FOR_EACH_CLIENT(cl) { if(IS_REAL_CLIENT(cl)) @@ -238,17 +241,15 @@ 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); - if(game_delay_last == true) - if(game_delay == false) - if(autocvar_sv_eventlog) + if(autocvar_sv_eventlog && game_delay_last && !game_delay) GameLogEcho(":startdelay_ended"); game_delay_last = game_delay; - CreatureFrame (); - CheckRules_World (); + CreatureFrame(); + CheckRules_World(); // if in warmup stage and limit for warmup is hit start match if(warmup_stage) @@ -261,14 +262,15 @@ void StartFrame (void) } bot_serverframe(); - - entity e; - FOR_EACH_PLAYER(e) - e.porto_forbidden = max(0, e.porto_forbidden - 1); - anticheat_startframe(); - MUTATOR_CALLHOOK(SV_StartFrame); + { + entity e; + FOR_EACH_CLIENT(e) + { + GlobalStats_update(e); + } + } } .vector originjitter; @@ -430,7 +432,7 @@ void SV_OnEntityPreSpawnFunction() } } -void WarpZone_PostInitialize_Callback(void) +void WarpZone_PostInitialize_Callback() { // create waypoint links for warpzones entity e;