]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
Declare new movetype
authorSamual <samual@xonotic.org>
Tue, 31 May 2011 19:17:06 +0000 (15:17 -0400)
committerSamual <samual@xonotic.org>
Tue, 31 May 2011 19:17:06 +0000 (15:17 -0400)
dpdefs/progsdefs.qc
server.h
sv_phys.c

index 2904f7db82277257d4ec07833b22a6826d06afc4..1b4cd960e8c730495f86eb9d7ef59b4c70bb1b3e 100644 (file)
@@ -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
index ccadc9e2e80a4dab9b2d038fa91785938c39b868..af460cdbc5164000a3aa5b983b690fa82b79bab8 100644 (file)
--- 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
index 1ba87baa2847636227254b33a914a9cffc4f128a..3b9854c720ce2ccccebe81b6ba728cd17c8ddd0b 100644 (file)
--- 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: