From: Samual Date: Tue, 31 May 2011 19:17:06 +0000 (-0400) Subject: Declare new movetype X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=23064e12939a9614c157ae070f4f84cde1066443;p=xonotic%2Fdarkplaces.git Declare new movetype --- diff --git a/dpdefs/progsdefs.qc b/dpdefs/progsdefs.qc index 2904f7db..1b4cd960 100644 --- a/dpdefs/progsdefs.qc +++ b/dpdefs/progsdefs.qc @@ -255,6 +255,7 @@ float MOVETYPE_NOCLIP = 8; float MOVETYPE_FLYMISSILE = 9; // fly with extra size against monsters float MOVETYPE_BOUNCE = 10; float MOVETYPE_BOUNCEMISSILE = 11; // bounce with extra size +float MOVETYPE_SPECTATOR = 14; // fly but only collide with map // edict.solid values float SOLID_NOT = 0; // no interaction with other objects diff --git a/server.h b/server.h index ccadc9e2..af460cdb 100644 --- a/server.h +++ b/server.h @@ -317,6 +317,7 @@ typedef struct client_s #define MOVETYPE_FOLLOW 12 ///< track movement of aiment #define MOVETYPE_FAKEPUSH 13 ///< tenebrae's push that doesn't push #define MOVETYPE_PHYSICS 32 ///< indicates this object is physics controlled +#define MOVETYPE_SPECTATOR 64 // edict->solid values #define SOLID_NOT 0 ///< no interaction with other objects diff --git a/sv_phys.c b/sv_phys.c index 1ba87baa..3b9854c7 100644 --- a/sv_phys.c +++ b/sv_phys.c @@ -2747,6 +2747,7 @@ static void SV_Physics_Entity (prvm_edict_t *ent) if (SV_RunThink (ent)) SV_WalkMove (ent); break; + case MOVETYPE_SPECTATOR: case MOVETYPE_TOSS: case MOVETYPE_BOUNCE: case MOVETYPE_BOUNCEMISSILE: