From 52bc13c0d85534068896433babe125f40997bdeb Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 19 Mar 2009 14:23:43 +0000 Subject: [PATCH] block movetype while dragging git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6224 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_client.qc | 8 ++++++++ data/qcsrc/server/defs.qh | 1 + 2 files changed, 9 insertions(+) diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index c61e115c3..460dd9017 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -2447,7 +2447,13 @@ void PlayerPostThink (void) { self.dragentity = self.cursor_trace_ent; if(self.dragentity.tag_entity) + { detach_sameorigin(self.dragentity); + if(self.dragentity.dragmovetype) + self.dragentity.movetype = self.dragentity.dragmovetype; + } + self.dragentity.dragmovetype = self.dragentity.movetype; + self.dragentity.movetype = MOVETYPE_NONE; self.dragentity.draggedby = self; self.dragcursor = spawn(); self.dragcursor.owner = self; @@ -2491,6 +2497,8 @@ void PlayerPostThink (void) else { self.dragentity.effects &~= EF_FLAME; + if(self.dragentity.dragmovetype) + self.dragentity.movetype = self.dragentity.dragmovetype; detach_sameorigin(self.dragentity); self.dragentity = world; remove(self.dragcursor); diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh index f7f14bfac..47ca65900 100644 --- a/data/qcsrc/server/defs.qh +++ b/data/qcsrc/server/defs.qh @@ -557,3 +557,4 @@ float servertime, serverprevtime, serverframetime; .float dragspeed; .entity dragcursor; .entity draggedby; +.float dragmovetype; -- 2.39.2