X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ffunc_breakable.qc;h=58e737e58c55fd72de7990f8082d6c334c2727f2;hb=f00dd29e71e236ddd2d79f44256ff589cbeac350;hp=192e5cd7fb2e69f5b20b5708f4aec9af11224e28;hpb=1b2f677417fa11aa435af65c60b3a68bf7787b5c;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/func_breakable.qc b/qcsrc/server/func_breakable.qc index 192e5cd7f..58e737e58 100644 --- a/qcsrc/server/func_breakable.qc +++ b/qcsrc/server/func_breakable.qc @@ -37,7 +37,7 @@ void func_breakable_damage(entity inflictor, entity attacker, float damage, floa // func_breakable // - basically func_assault_destructible for general gameplay use // -void LaunchDebris (string debrisname, vector force) = +void LaunchDebris (string debrisname, vector force) { local entity dbr; @@ -65,7 +65,7 @@ void LaunchDebris (string debrisname, vector force) = if(dbr.damageforcescale) dbr.takedamage = DAMAGE_YES; SUB_SetFade(dbr, time + self.debristime + crandom() * self.debristimejitter, self.debrisfadetime); -}; +} void func_breakable_colormod() { @@ -83,7 +83,7 @@ void func_breakable_colormod() void func_breakable_look_destroyed() { - local float floor_z; + float floor_z; if(self.solid == SOLID_BSP) // in case a misc_follow moved me, save the current origin first self.dropped_origin = self.origin; @@ -115,7 +115,7 @@ void func_breakable_behave_destroyed() self.health = self.max_health; self.takedamage = DAMAGE_NO; self.bot_attack = FALSE; - self.event_damage = SUB_Null; + self.event_damage = func_null; self.state = 1; func_breakable_colormod(); } @@ -240,9 +240,9 @@ void spawnfunc_func_breakable() { if(self.count == 0) self.count = 1; - if(!self.message) + if(self.message == "") self.message = "got too close to an explosion"; - if(!self.message2) + if(self.message2 == "") self.message2 = "was pushed into an explosion by"; if(!self.dmg_radius) self.dmg_radius = 150;