fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Stopped Moodles from being quite so evil.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3197 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2009-05-24 10:37:50 +00:00
parent 0afe8f9dc5
commit b7c8b33b98
3 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
engine/client/pr_csqc.c
View file

@ -21,16 +21,6 @@
#include "shader.h" #include "shader.h"
#endif #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 //#define CHEAT_PARANOID
#include "pr_common.h" #include "pr_common.h"
@ -435,6 +425,8 @@ static void CS_LinkEdict(csqcedict_t *ent, qboolean touchtriggers);
areanode_t cs_areanodes[AREA_NODES]; areanode_t cs_areanodes[AREA_NODES];
int cs_numareanodes; 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 *CS_CreateAreaNode (int depth, vec3_t mins, vec3_t maxs)
{ {
areanode_t *anode; areanode_t *anode;
@ -514,7 +506,7 @@ void CS_TouchLinks ( csqcedict_t *ent, areanode_t *node )
if (linkcount == MAX_NODELINKS) if (linkcount == MAX_NODELINKS)
break; break;
next = l->next; next = l->next;
touch = (csqcedict_t*)EDICT_FROM_AREA(l); touch = CSEDICT_FROM_AREA(l);
if (touch == ent) if (touch == ent)
continue; continue;

3
engine/common/pmove.h
View file

@ -31,6 +31,9 @@ typedef enum {
PM_FREEZE // can't move or look around (TODO) PM_FREEZE // can't move or look around (TODO)
} pmtype_t; } pmtype_t;
#define PMF_JUMP_HELD 1
#define PMF_LADDER 2 //pmove flags. seperate from flags
#define MAX_PHYSENTS 128 #define MAX_PHYSENTS 128
typedef struct typedef struct
{ {

3
engine/server/server.h
View file

@ -818,9 +818,6 @@ typedef struct
#define FL_MOVECHAIN_ANGLE 32768 // when in a move chain, will update the angle #define FL_MOVECHAIN_ANGLE 32768 // when in a move chain, will update the angle
#define FL_CLASS_DEPENDENT 2097152 #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_NORMALPVS 0x0
#define PVSF_NOTRACECHECK 0x1 #define PVSF_NOTRACECHECK 0x1
#define PVSF_USEPHS 0x2 #define PVSF_USEPHS 0x2