X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_onslaught.qc;h=8137cc3047d35ed2822d17a9841415e83c991ff5;hp=6508163764cec58af87dc6cac09a97b1f8b6c67d;hb=44657432578ed559d0c426da18d7678419caf424;hpb=81d670441b9c2bc8cb1ec3edd71f575be7999b32 diff --git a/qcsrc/server/mutators/gamemode_onslaught.qc b/qcsrc/server/mutators/gamemode_onslaught.qc index 6508163764..8137cc3047 100644 --- a/qcsrc/server/mutators/gamemode_onslaught.qc +++ b/qcsrc/server/mutators/gamemode_onslaught.qc @@ -630,7 +630,7 @@ void onslaught_generator_damage(entity inflictor, entity attacker, float damage, self.islinked = FALSE; self.isshielded = FALSE; self.takedamage = DAMAGE_NO; // can't be hurt anymore - self.event_damage = SUB_Null; // won't do anything if hurt + self.event_damage = func_null; // won't do anything if hurt self.count = 0; // reset counter self.think = onslaught_generator_deaththink; // explosion sequence self.nextthink = time; // start exploding immediately @@ -1315,8 +1315,8 @@ void onslaught_controlpoint_reset() self.isshielded = TRUE; self.enemy.solid = SOLID_NOT; self.enemy.colormap = self.colormap; - self.think = self.enemy.think = SUB_Null; - self.nextthink = 0; // don't like SUB_Null :P + self.think = self.enemy.think = func_null; + self.nextthink = 0; // don't like func_null :P setmodel(self, "models/onslaught/controlpoint_pad.md3"); //setsize(self, '-32 -32 0', '32 32 8');