From: tzork Date: Sun, 28 Nov 2010 08:24:03 +0000 (+0100) Subject: Fix issue 192 X-Git-Tag: xonotic-v0.1.0preview~96^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=42e7e4376bcfe7fab8f23f73fd3c120588b00e55;p=xonotic%2Fxonotic-data.pk3dir.git Fix issue 192 --- diff --git a/qcsrc/server/tturrets/units/unit_ewheel.qc b/qcsrc/server/tturrets/units/unit_ewheel.qc index aff4c0aec..fa150df0a 100644 --- a/qcsrc/server/tturrets/units/unit_ewheel.qc +++ b/qcsrc/server/tturrets/units/unit_ewheel.qc @@ -216,6 +216,10 @@ void ewheel_respawnhook() { entity e; + // Respawn is called & first spawn to, to set team. need to make sure we do not move the initial spawn. + if(self.movetype != MOVETYPE_WALK) + return; + self.velocity = '0 0 0'; self.enemy = world; diff --git a/qcsrc/server/tturrets/units/unit_walker.qc b/qcsrc/server/tturrets/units/unit_walker.qc index 59aaf653d..3952dc16a 100644 --- a/qcsrc/server/tturrets/units/unit_walker.qc +++ b/qcsrc/server/tturrets/units/unit_walker.qc @@ -637,7 +637,11 @@ void walker_respawnhook() vector vtmp; entity e; - setorigin(self,self.wkr_spawn.origin); + // Respawn is called & first spawn to, to set team. need to make sure we do not move the initial spawn. + if(self.movetype != MOVETYPE_WALK) + return; + + setorigin(self, self.wkr_spawn.origin); self.angles = self.wkr_spawn.angles; vtmp = self.wkr_spawn.origin;