From 7f3721bb7d5ab3a99fd7dc58e44167c08292d765 Mon Sep 17 00:00:00 2001 From: div0 Date: Mon, 9 Feb 2009 13:06:22 +0000 Subject: [PATCH] make movetypes code a bit more flexible (allow an entity to specify its MOVE_ type) git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5808 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/client/movetypes.qc | 4 +++- data/qcsrc/client/movetypes.qh | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/data/qcsrc/client/movetypes.qc b/data/qcsrc/client/movetypes.qc index 345cfada7..1c324122a 100644 --- a/data/qcsrc/client/movetypes.qc +++ b/data/qcsrc/client/movetypes.qc @@ -182,7 +182,9 @@ void _Movetype_PushEntityTrace(vector push) end = self.move_origin + push; - if(self.move_movetype == MOVETYPE_FLYMISSILE) + if(self.move_nomonsters) + type = max(0, self.move_nomonsters); + else if(self.move_movetype == MOVETYPE_FLYMISSILE) type = MOVE_MISSILE; else if(self.solid == SOLID_TRIGGER || self.solid == SOLID_NOT) type = MOVE_NOMONSTERS; diff --git a/data/qcsrc/client/movetypes.qh b/data/qcsrc/client/movetypes.qh index 34b0a1cd5..2a83caa86 100644 --- a/data/qcsrc/client/movetypes.qh +++ b/data/qcsrc/client/movetypes.qh @@ -8,6 +8,7 @@ .void(void) move_touch; .float move_bounce_factor; .float move_bounce_stopspeed; +.float move_nomonsters; // -1 for MOVE_NORMAL, otherwise a MOVE_ constant void Movetype_Physics(float matchserver); -- 2.39.2