From 2d7fb7a5b886d00039d422e631c3a76e21113e2c Mon Sep 17 00:00:00 2001 From: Samual Date: Tue, 31 May 2011 19:50:39 -0400 Subject: [PATCH] Fix some things plus add spectator to an exemption list for a check --- server.h | 2 +- sv_phys.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server.h b/server.h index af460cdb..68740334 100644 --- a/server.h +++ b/server.h @@ -316,8 +316,8 @@ typedef struct client_s #define MOVETYPE_BOUNCEMISSILE 11 ///< bounce w/o gravity #define MOVETYPE_FOLLOW 12 ///< track movement of aiment #define MOVETYPE_FAKEPUSH 13 ///< tenebrae's push that doesn't push +#define MOVETYPE_SPECTATOR 14 #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 3b9854c7..04b0e4af 100644 --- a/sv_phys.c +++ b/sv_phys.c @@ -987,7 +987,8 @@ void SV_CheckAllEnts (void) if (check->fields.server->movetype == MOVETYPE_PUSH || check->fields.server->movetype == MOVETYPE_NONE || check->fields.server->movetype == MOVETYPE_FOLLOW - || check->fields.server->movetype == MOVETYPE_NOCLIP) + || check->fields.server->movetype == MOVETYPE_NOCLIP + || check->fields.server->movetype == MOVETYPE_SPECTATOR) continue; if (SV_TestEntityPosition (check, vec3_origin)) @@ -2916,6 +2917,7 @@ static void SV_Physics_ClientEntity(prvm_edict_t *ent) if (host_client->clmovement_inputtimeout <= 0) SV_WalkMove (ent); break; + case MOVETYPE_SPECTATOR: case MOVETYPE_TOSS: case MOVETYPE_BOUNCE: case MOVETYPE_BOUNCEMISSILE: -- 2.39.2