From 234a26410e3cb78c7a40f8389340796ab6485230 Mon Sep 17 00:00:00 2001 From: div0 Date: Wed, 21 Oct 2009 16:28:27 +0000 Subject: [PATCH] preliminary declaration of jointtype, and make misc_follow behave as a joint if jointtype is set git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8165 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_client.qc | 1 + data/qcsrc/server/extensions.qh | 1 + data/qcsrc/server/g_triggers.qc | 12 +++++++++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index 3c3fbd47c..0e26be852 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -2675,6 +2675,7 @@ void Drag_Finish(entity dragger) case MOVETYPE_FLYMISSILE: case MOVETYPE_BOUNCE: case MOVETYPE_BOUNCEMISSILE: + case MOVETYPE_PHYSICS: break; default: draggee.velocity = '0 0 0'; diff --git a/data/qcsrc/server/extensions.qh b/data/qcsrc/server/extensions.qh index edd0bdfea..8e136a71b 100644 --- a/data/qcsrc/server/extensions.qh +++ b/data/qcsrc/server/extensions.qh @@ -2159,3 +2159,4 @@ float SOLID_PHYSICS_SPHERE = 33; float SOLID_PHYSICS_CAPSULE = 34; float MOVETYPE_PHYSICS = 32; .float mass; +.float jointtype; // TO BE DOCUMENTED diff --git a/data/qcsrc/server/g_triggers.qc b/data/qcsrc/server/g_triggers.qc index 2543c9bab..645fe35ba 100644 --- a/data/qcsrc/server/g_triggers.qc +++ b/data/qcsrc/server/g_triggers.qc @@ -1419,7 +1419,11 @@ void follow_init() 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 @@ void follow_init() { attach_sameorigin(dst, src, self.message); } + + remove(self); } else { @@ -1445,9 +1451,9 @@ void follow_init() { follow_sameorigin(dst, src); } - } - remove(self); + remove(self); + } } void spawnfunc_misc_follow() -- 2.39.2