X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=043cb7713d24cc61c91b162efba963ec0dd73065;hb=1649a77da3e957dbc722f2eb3af636725bb00a81;hp=5510be0e1165065e72edafcebd0636f3d3117385;hpb=786db02b0c9aa618c581b7c3fe7392ad114797d8;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index 5510be0e1..043cb7713 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/sv_main.qc @@ -2,15 +2,15 @@ void CreatureFrame (void) { entity oldself; float dm; - + oldself = self; 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); - + 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) { if (!(self.flags & FL_INWATER)) @@ -38,11 +38,11 @@ void CreatureFrame (void) } } } - + if (self.dmgtime < time) { - self.dmgtime = time + autocvar_g_balance_contents_damagerate; - + self.dmgtime = time + autocvar_g_balance_contents_damagerate; + if (projectile) { if (self.watertype == CONTENT_LAVA) @@ -135,7 +135,7 @@ void CreatureFrame (void) } } } - + self.oldvelocity = self.velocity; } self = oldself;