From 5a87803e635f56d397f2685d5261620bbaa09013 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 23 Dec 2015 17:45:32 +1000 Subject: [PATCH] Fix a couple of setorigin pains --- qcsrc/common/triggers/func/breakable.qc | 5 +++-- qcsrc/server/cheats.qc | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/qcsrc/common/triggers/func/breakable.qc b/qcsrc/common/triggers/func/breakable.qc index 6305c5340..b8b79975e 100644 --- a/qcsrc/common/triggers/func/breakable.qc +++ b/qcsrc/common/triggers/func/breakable.qc @@ -50,10 +50,11 @@ void func_breakable_damage(entity inflictor, entity attacker, float damage, int void LaunchDebris (string debrisname, vector force) {SELFPARAM(); entity dbr = spawn(); - setorigin(dbr, self.absmin + dbr.origin = 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); + setorigin(dbr, dbr.origin); _setmodel (dbr, debrisname ); dbr.skin = self.debrisskin; dbr.colormap = self.colormap; // inherit team colors diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc index 7718f96fb..cdad6d9fe 100644 --- a/qcsrc/server/cheats.qc +++ b/qcsrc/server/cheats.qc @@ -1067,7 +1067,8 @@ void DragBox_Think() self.maxs_y = fabs(self.aiment.origin.y - self.enemy.origin.y) * 0.5; self.maxs_z = fabs(self.aiment.origin.z - self.enemy.origin.z) * 0.5; self.mins = -1 * self.maxs; - setorigin(self, self.origin); setsize(self, self.mins, self.maxs); // link edict + setorigin(self, self.origin); + setsize(self, self.mins, self.maxs); // link edict } if(self.cnt == -1) // actually race_place -1 -- 2.39.2