X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=66579bc9c92807ef2cfc11cbf3164b47ee20c2e1;hb=bbc51e613e22eafdd915b549e0946fec7f09d1f7;hp=b71245b202f15dc897d0c41b312d58f3b36550c5;hpb=f8b86e2d48479e07daf1d1831eec8ae3f9f7c485;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index b71245b20..66579bc9c 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/sv_main.qc @@ -1,10 +1,7 @@ void CreatureFrame (void) { - local entity oldself; - local float dm; - - float damagerate; // where damagerate 5 means 5 hits per second (0.2 delay) - damagerate = (1 / bound(1, autocvar_g_balance_contents_damagerate, 100)); + entity oldself; + float dm; oldself = self; for(self = world; (self = findfloat(self, damagedbycontents, TRUE)); ) @@ -12,7 +9,7 @@ void CreatureFrame (void) if (self.movetype == MOVETYPE_NOCLIP) { continue; } float vehic = (self.vehicle_flags & VHF_ISVEHICLE); - float projectile = ((self.projectiledeathtype) || (self.classname == "grapplinghook")); + float projectile = (self.flags & FL_PROJECTILE); 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) { @@ -20,16 +17,15 @@ void CreatureFrame (void) { self.flags |= FL_INWATER; self.dmgtime = 0; - //te_customflash(self.origin, 200, 20, '50 0.1 0.1'); } if(!vehic && !projectile) // vehicles and projectiles don't drown { if (self.waterlevel != WATERLEVEL_SUBMERGED) { - if(self.air_finished < time + 9) + if(self.air_finished < time) PlayerSound(playersound_gasp, CH_PLAYER, VOICETYPE_PLAYERSOUND); - self.air_finished = time + 12; + self.air_finished = time + autocvar_g_balance_contents_drowndelay; self.dmg = 2; } else if (self.air_finished < time) @@ -37,7 +33,7 @@ void CreatureFrame (void) if (!self.deadflag) if (self.pain_finished < time) { - Damage (self, world, world, autocvar_g_balance_contents_playerdamage_drowning * 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, self.origin, '0 0 0'); self.pain_finished = time + 0.5; } } @@ -45,7 +41,7 @@ void CreatureFrame (void) if (self.dmgtime < time) { - self.dmgtime = time + damagerate; + self.dmgtime = time + autocvar_g_balance_contents_damagerate; if (!projectile) { @@ -56,7 +52,7 @@ void CreatureFrame (void) self.watersound_finished = time + 0.5; sound (self, CH_PLAYER, "player/lava.wav", VOL_BASE, ATTN_NORM); } - Damage (self, world, world, autocvar_g_balance_contents_playerdamage_lava * 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, self.origin, '0 0 0'); } else if (self.watertype == CONTENT_SLIME) { @@ -65,12 +61,12 @@ void CreatureFrame (void) self.watersound_finished = time + 0.5; sound (self, CH_PLAYER, "player/slime.wav", VOL_BASE, ATTN_NORM); } - Damage (self, world, world, autocvar_g_balance_contents_playerdamage_slime * 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, self.origin, '0 0 0'); } } else if ((self.watertype == CONTENT_LAVA) || (self.watertype == CONTENT_SLIME)) { - Damage (self, world, world, autocvar_g_balance_contents_projectiledamage * 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, self.origin, '0 0 0'); } } } @@ -81,7 +77,6 @@ void CreatureFrame (void) // play leave water sound self.flags &~= FL_INWATER; self.dmgtime = 0; - //te_customflash(self.origin, 200, 20, '0.1 0.1 50'); } self.air_finished = time + 12; self.dmg = 2; @@ -133,8 +128,8 @@ void CreatureFrame (void) } } } - - self.oldvelocity = self.velocity; + + self.oldvelocity = self.velocity; } self = oldself; } @@ -156,6 +151,8 @@ float RedirectionThink(); entity SelectSpawnPoint (float anypoint); void StartFrame (void) { + execute_next_frame(); + remove = remove_unsafely; // not during spawning! serverprevtime = servertime; servertime = time; @@ -201,7 +198,7 @@ void StartFrame (void) 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) + if (timeout_status == TIMEOUT_LEADTIME) // just before the timeout (when timeout_status will be TIMEOUT_ACTIVE) orig_slowmo = autocvar_slowmo; // slowmo will be restored after the timeout skill = autocvar_skill; @@ -236,17 +233,10 @@ void StartFrame (void) RuneMatchGivePoints(); bot_serverframe(); - if(autocvar_spawn_debugview) - { - RandomSelection_Init(); - for(self = world; (self = find(self, classname, "player")); ) - RandomSelection_Add(self, 0, string_null, 1, 0); - self = RandomSelection_chosen_ent; - SelectSpawnPoint(0); - } - FOR_EACH_PLAYER(self) self.porto_forbidden = max(0, self.porto_forbidden - 1); + + MUTATOR_CALLHOOK(SV_StartFrame); } .vector originjitter; @@ -257,8 +247,9 @@ void StartFrame (void) float DoesQ3ARemoveThisEntity(); void SV_OnEntityPreSpawnFunction() { - if(self.gametypefilter != "") - if not(isGametypeInFilter(game, teamplay, have_team_spawns, self.gametypefilter)) + if (self) + if (self.gametypefilter != "") + if not(isGametypeInFilter(MapInfo_LoadedGametype, teamplay, have_team_spawns, self.gametypefilter)) { remove(self); return; @@ -280,7 +271,7 @@ void SV_OnEntityPreSpawnFunction() s = substring(s, 1, -1); } - n = tokenize(s); + n = tokenize_console(s); for(i = 0; i < n; ++i) { s = argv(i);