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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-10-21 12:28:27 -0400 (Wed, 21 Oct 2009)
New Revision: 8165

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/extensions.qh
   trunk/data/qcsrc/server/g_triggers.qc
Log:
preliminary declaration of jointtype, and make misc_follow behave as a joint if jointtype is set


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2009-10-21 16:27:12 UTC (rev 8164)
+++ trunk/data/qcsrc/server/cl_client.qc	2009-10-21 16:28:27 UTC (rev 8165)
@@ -2675,6 +2675,7 @@
 		case MOVETYPE_FLYMISSILE:
 		case MOVETYPE_BOUNCE:
 		case MOVETYPE_BOUNCEMISSILE:
+		case MOVETYPE_PHYSICS:
 			break;
 		default:
 			draggee.velocity = '0 0 0';

Modified: trunk/data/qcsrc/server/extensions.qh
===================================================================
--- trunk/data/qcsrc/server/extensions.qh	2009-10-21 16:27:12 UTC (rev 8164)
+++ trunk/data/qcsrc/server/extensions.qh	2009-10-21 16:28:27 UTC (rev 8165)
@@ -2159,3 +2159,4 @@
 float SOLID_PHYSICS_CAPSULE = 34;
 float MOVETYPE_PHYSICS = 32;
 .float mass;
+.float jointtype; // TO BE DOCUMENTED

Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc	2009-10-21 16:27:12 UTC (rev 8164)
+++ trunk/data/qcsrc/server/g_triggers.qc	2009-10-21 16:28:27 UTC (rev 8165)
@@ -1419,8 +1419,12 @@
 		return;
 	}
 
-	if(self.spawnflags & 1)
+	if(self.jointtype)
 	{
+		// already done :P entity must stay
+	}
+	else if(self.spawnflags & 1)
+	{
 		// attach
 		if(self.spawnflags & 2)
 		{
@@ -1430,6 +1434,8 @@
 		{
 			attach_sameorigin(dst, src, self.message);
 		}
+
+		remove(self);
 	}
 	else
 	{
@@ -1445,9 +1451,9 @@
 		{
 			follow_sameorigin(dst, src);
 		}
+
+		remove(self);
 	}
-
-	remove(self);
 }
 
 void spawnfunc_misc_follow()