[nexuiz-commits] r6224 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-19 10:23:43 -0400 (Thu, 19 Mar 2009)
New Revision: 6224

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/defs.qh
Log:
block movetype while dragging


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2009-03-19 14:20:03 UTC (rev 6223)
+++ trunk/data/qcsrc/server/cl_client.qc	2009-03-19 14:23:43 UTC (rev 6224)
@@ -2447,7 +2447,13 @@
 					{
 						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 @@
 		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);

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2009-03-19 14:20:03 UTC (rev 6223)
+++ trunk/data/qcsrc/server/defs.qh	2009-03-19 14:23:43 UTC (rev 6224)
@@ -557,3 +557,4 @@
 .float dragspeed;
 .entity dragcursor;
 .entity draggedby;
+.float dragmovetype;