From b7c8b33b981d6802304a4a5f4376027d6359c0b8 Mon Sep 17 00:00:00 2001 From: Spoike Date: Sun, 24 May 2009 10:37:50 +0000 Subject: [PATCH] Stopped Moodles from being quite so evil. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3197 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/pr_csqc.c | 14 +++----------- engine/common/pmove.h | 3 +++ engine/server/server.h | 3 --- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/engine/client/pr_csqc.c b/engine/client/pr_csqc.c index 33584bd24..0d74a16b5 100644 --- a/engine/client/pr_csqc.c +++ b/engine/client/pr_csqc.c @@ -21,16 +21,6 @@ #include "shader.h" #endif -#ifdef MINGW -/* Moodles being evil, need these from server.h -PMF_JUMP_HELD undeclared (first use in this function) -PMF_LADDER undeclared (first use in this function)*/ -#define PMF_JUMP_HELD 1 -#define PMF_LADDER 2 //pmove flags. seperate from flags -// and this from server "progs.h" -#define EDICT_FROM_AREA(l) STRUCT_FROM_LINK(l,edict_t,area) -#endif - //#define CHEAT_PARANOID #include "pr_common.h" @@ -435,6 +425,8 @@ static void CS_LinkEdict(csqcedict_t *ent, qboolean touchtriggers); areanode_t cs_areanodes[AREA_NODES]; int cs_numareanodes; +#define CSEDICT_FROM_AREA(l) STRUCT_FROM_LINK(l,csqcedict_t,area) + areanode_t *CS_CreateAreaNode (int depth, vec3_t mins, vec3_t maxs) { areanode_t *anode; @@ -514,7 +506,7 @@ void CS_TouchLinks ( csqcedict_t *ent, areanode_t *node ) if (linkcount == MAX_NODELINKS) break; next = l->next; - touch = (csqcedict_t*)EDICT_FROM_AREA(l); + touch = CSEDICT_FROM_AREA(l); if (touch == ent) continue; diff --git a/engine/common/pmove.h b/engine/common/pmove.h index f1fbb5a1b..021d9b453 100644 --- a/engine/common/pmove.h +++ b/engine/common/pmove.h @@ -31,6 +31,9 @@ typedef enum { PM_FREEZE // can't move or look around (TODO) } pmtype_t; +#define PMF_JUMP_HELD 1 +#define PMF_LADDER 2 //pmove flags. seperate from flags + #define MAX_PHYSENTS 128 typedef struct { diff --git a/engine/server/server.h b/engine/server/server.h index da6b902a5..4642ec144 100644 --- a/engine/server/server.h +++ b/engine/server/server.h @@ -818,9 +818,6 @@ typedef struct #define FL_MOVECHAIN_ANGLE 32768 // when in a move chain, will update the angle #define FL_CLASS_DEPENDENT 2097152 -#define PMF_JUMP_HELD 1 -#define PMF_LADDER 2 //pmove flags. seperate from flags - #define PVSF_NORMALPVS 0x0 #define PVSF_NOTRACECHECK 0x1 #define PVSF_USEPHS 0x2