From 9e262a0e14dd3f4389f4c6398c5e584950801082 Mon Sep 17 00:00:00 2001 From: Night Owl Date: Wed, 3 Aug 2016 00:54:19 +0500 Subject: [PATCH] Include missing header. Remove duplicate structs definitions. --- pm_shared/pm_defs.h | 4 ++-- pm_shared/pm_shared.c | 33 --------------------------------- 2 files changed, 2 insertions(+), 35 deletions(-) diff --git a/pm_shared/pm_defs.h b/pm_shared/pm_defs.h index 7c04d22d..70b8369d 100644 --- a/pm_shared/pm_defs.h +++ b/pm_shared/pm_defs.h @@ -36,7 +36,7 @@ // PM_PlayerTrace results. #include "pmtrace.h" - +#include "com_model.h" #include "usercmd.h" // physent_t @@ -218,4 +218,4 @@ typedef struct playermove_s struct pmtrace_s *(*PM_TraceLineEx)( float *start, float *end, int flags, int usehulll, int (*pfnIgnore)( physent_t *pe )); struct msurface_s *(*PM_TraceSurface)( int ground, float *vstart, float *vend ); } playermove_t; -#endif//PM_DEFS_H \ No newline at end of file +#endif//PM_DEFS_H diff --git a/pm_shared/pm_shared.c b/pm_shared/pm_shared.c index 92377197..a9ac380f 100644 --- a/pm_shared/pm_shared.c +++ b/pm_shared/pm_shared.c @@ -38,41 +38,8 @@ static int pm_shared_initialized = 0; #pragma warning( disable : 4305 ) -typedef enum -{ - mod_brush, - mod_sprite, - mod_alias, - mod_studio -}modtype_t; - playermove_t *pmove = NULL; -typedef struct -{ - int planenum; - short children[2]; // negative numbers are contents -}dclipnode_t; - -typedef struct mplane_s -{ - vec3_t normal; // surface normal - float dist; // closest appoach to origin - byte type; // for texture axis selection and fast side tests - byte signbits; // signx + signy<<1 + signz<<1 - byte pad[2]; -}mplane_t; - -typedef struct hull_s -{ - dclipnode_t *clipnodes; - mplane_t *planes; - int firstclipnode; - int lastclipnode; - vec3_t clip_mins; - vec3_t clip_maxs; -} hull_t; - // Ducking time #define TIME_TO_DUCK 0.4 #define VEC_DUCK_HULL_MIN -18