X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=68a86e9c479e7f68a9908fc12230831f2bb50803;hb=bc79763325f92e7688f6e61d24b42d35eb08d989;hp=3b7d77d58be6ef819dfcd4ae68266588e1ed36fc;hpb=1e0e52abdb109c9923e6f79438e50d1fc7656fe2;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index 3b7d77d58..68a86e9c4 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/sv_main.qc @@ -2,7 +2,7 @@ void CreatureFrame (void) { local entity oldself; - local float dm, maxspeed; + local float dm; oldself = self; self = findfloat(world, iscreature, TRUE); while (self) @@ -34,7 +34,7 @@ void CreatureFrame (void) } if (self.dmgtime < time) { - self.dmgtime = time + 0.1; + self.dmgtime = time + 0.2; if (self.watertype == CONTENT_LAVA) { if (self.watersound_finished < time) @@ -67,32 +67,26 @@ void CreatureFrame (void) self.dmg = 2; } // check for falling damage - if(!self.hook.state && !g_ca && !(g_cts && !cvar("g_cts_selfdamage"))) + float velocity_len = vlen(self.velocity); + if(!self.hook.state && !g_ca && !(g_cts && !autocvar_g_cts_selfdamage)) { - dm = vlen(self.oldvelocity) - vlen(self.velocity); // dm is now the velocity DECREASE. Velocity INCREASE should never cause a sound or any damage. + 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) - dm = (dm - cvar("g_balance_falldamage_deadminspeed")) * cvar("g_balance_falldamage_factor"); + dm = (dm - autocvar_g_balance_falldamage_deadminspeed) * autocvar_g_balance_falldamage_factor; else - dm = min((dm - cvar("g_balance_falldamage_minspeed")) * cvar("g_balance_falldamage_factor"), cvar("g_balance_falldamage_maxdamage")); + 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'); - // this must be allowed to cut the normal pain sounds (played after them and on the same channel) - // there's no way to detect falling damage and prevent the pain sounds for this to be played instead - if(self.health > 0) - PlayerSound(playersound_fall, CHAN_PAIN, VOICETYPE_PLAYERSOUND); - } } - maxspeed = cvar("g_maxspeed"); - if(maxspeed > 0 && vlen(self.velocity) > maxspeed) + if(autocvar_g_maxspeed > 0 && velocity_len > autocvar_g_maxspeed) Damage (self, world, world, 100000, DEATH_SHOOTING_STAR, self.origin, '0 0 0'); // play stupid sounds if (g_footsteps) if (!gameover) if (self.flags & FL_ONGROUND) - if (vlen(self.velocity) > sv_maxspeed * 0.6) + if (velocity_len > autocvar_sv_maxspeed * 0.6) if (!self.deadflag) if (time < self.lastground + 0.2) { @@ -181,41 +175,14 @@ void StartFrame (void) WarpZone_StartFrame(); - sv_gravity = cvar("sv_gravity"); - sv_maxairspeed = cvar("sv_maxairspeed"); - sv_maxspeed = cvar ("sv_maxspeed"); - sv_friction = cvar ("sv_friction"); - sv_accelerate = cvar ("sv_accelerate"); - sv_airaccelerate = cvar("sv_airaccelerate"); - sv_airaccel_sideways_friction = cvar("sv_airaccel_sideways_friction"); - sv_airaccel_qw = cvar("sv_airaccel_qw"); - sv_stopspeed = cvar ("sv_stopspeed"); - sv_airstopaccelerate = cvar("sv_airstopaccelerate"); - sv_airstrafeaccelerate = cvar("sv_airstrafeaccelerate"); - sv_maxairstrafespeed = cvar("sv_maxairstrafespeed"); - sv_airstrafeaccel_qw = cvar("sv_airstrafeaccel_qw"); - sv_aircontrol = cvar("sv_aircontrol"); - sv_aircontrol_penalty = cvar("sv_aircontrol_penalty"); - sv_aircontrol_power = cvar("sv_aircontrol_power"); - sv_warsowbunny_airforwardaccel = cvar("sv_warsowbunny_airforwardaccel"); - sv_warsowbunny_accel = cvar("sv_warsowbunny_accel"); - sv_warsowbunny_topspeed = cvar("sv_warsowbunny_topspeed"); - sv_warsowbunny_turnaccel = cvar("sv_warsowbunny_turnaccel"); - sv_warsowbunny_backtosideratio = cvar("sv_warsowbunny_backtosideratio"); - sv_airspeedlimit_nonqw = cvar("sv_airspeedlimit_nonqw"); - teamplay = cvar ("teamplay"); - sys_frametime = cvar("sys_ticrate") * cvar("slowmo"); - sv_doublejump = cvar("sv_doublejump"); + sys_frametime = autocvar_sys_ticrate * autocvar_slowmo; + if(sys_frametime <= 0) + sys_frametime = 1.0 / 60.0; // somewhat safe fallback if (timeoutStatus == 1) // just before the timeout (when timeoutStatus will be 2) - orig_slowmo = cvar("slowmo"); // slowmo will be restored after the timeout + orig_slowmo = autocvar_slowmo; // slowmo will be restored after the timeout - if(teams_matter && !teamplay) - teamplay = 3; - if(!teams_matter && teamplay) - teamplay = 0; - - skill = cvar("skill"); + skill = autocvar_skill; Spawnqueue_Check(); @@ -225,7 +192,7 @@ void StartFrame (void) if(game_delay_last == TRUE) if(game_delay == FALSE) - if(cvar("sv_eventlog")) + if(autocvar_sv_eventlog) GameLogEcho(":startdelay_ended"); game_delay_last = game_delay; @@ -233,7 +200,7 @@ void StartFrame (void) // if in warmup stage and limit for warmup is hit start match if (inWarmupStage) if ((g_warmup_limit > 0 && time >= g_warmup_limit) - || (g_warmup_limit == 0 && cvar("timelimit") != 0 && time >= cvar("timelimit") * 60)) + || (g_warmup_limit == 0 && autocvar_timelimit != 0 && time >= autocvar_timelimit * 60)) { ReadyRestart(); return; @@ -247,7 +214,7 @@ void StartFrame (void) RuneMatchGivePoints(); bot_serverframe(); - if(cvar("spawn_debugview")) + if(autocvar_spawn_debugview) { RandomSelection_Init(); for(self = world; (self = find(self, classname, "player")); ) @@ -265,10 +232,11 @@ void StartFrame (void) .float anglejitter; .string gametypefilter; .string cvarfilter; +float DoesQ3ARemoveThisEntity(); void SV_OnEntityPreSpawnFunction() { if(self.gametypefilter != "") - if not(isGametypeInFilter(game, teams_matter, self.gametypefilter)) + if not(isGametypeInFilter(game, teams_matter, have_team_spawns, self.gametypefilter)) { remove(self); return; @@ -383,6 +351,12 @@ void SV_OnEntityPreSpawnFunction() } } + if(DoesQ3ARemoveThisEntity()) + { + remove(self); + return; + } + // support special -1 and -2 angle from radiant if (self.angles == '0 -1 0') self.angles = '-90 0 0';