From b3d50756d2d1168c5a23f8d918d2097e88b7b673 Mon Sep 17 00:00:00 2001 From: div0 Date: Tue, 28 Apr 2009 18:25:48 +0000 Subject: [PATCH] fix debris bug in func_breakable git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6614 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/func_breakable.qc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/qcsrc/server/func_breakable.qc b/data/qcsrc/server/func_breakable.qc index 7d31ffcb6..a2c9a4dc7 100644 --- a/data/qcsrc/server/func_breakable.qc +++ b/data/qcsrc/server/func_breakable.qc @@ -34,10 +34,10 @@ void LaunchDebris (string debrisname) = local entity dbr; dbr = spawn(); - dbr.origin = self.origin + self.absmin + setorigin(dbr, self.absmin + '1 0 0' * random() * (self.absmax_x - self.absmin_x) + '0 1 0' * random() * (self.absmax_y - self.absmin_y) - + '0 0 1' * random() * (self.absmax_z - self.absmin_z); + + '0 0 1' * random() * (self.absmax_z - self.absmin_z)); setmodel (dbr, debrisname ); dbr.movetype = MOVETYPE_BOUNCE; dbr.solid = SOLID_NOT; @@ -126,6 +126,11 @@ void func_breakable_destroy() { activator = self.owner; + // now throw around the debris + n = tokenize_console(self.debris); + for(i = 0; i < n; ++i) + LaunchDebris(argv(i)); + func_breakable_destroyed(); if(self.noise) @@ -134,11 +139,6 @@ void func_breakable_destroy() { if(self.dmg) RadiusDamage(self, activator, self.dmg, self.dmg_edge, self.dmg_radius, self, self.dmg_force, DEATH_HURTTRIGGER, world); - // now throw around the debris - n = tokenize_console(self.debris); - for(i = 0; i < n; ++i) - LaunchDebris(argv(i)); - if(self.cnt) pointparticles(self.cnt, self.absmin * 0.5 + self.absmax * 0.5, '0 0 0', self.count); -- 2.39.2