mirror of
https://git.code.sf.net/p/quake/newtree
synced 2025-05-30 16:50:48 +00:00
added uniform #ifdef _xxx_H encapsulation and appropriate includes to avoid header dependencies and circular conflicts
(work in progress, need to clean .c files as well)
This commit is contained in:
parent
4a5ffaed66
commit
440b2aec18
41 changed files with 315 additions and 171 deletions
|
@ -19,6 +19,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
*/
|
||||
// world.h
|
||||
|
||||
#ifndef _WORLD_H
|
||||
#define _WORLD_H
|
||||
|
||||
#include "common.h"
|
||||
#include "mathlib.h"
|
||||
#include "model.h"
|
||||
#include "progs.h"
|
||||
|
||||
typedef struct
|
||||
{
|
||||
vec3_t normal;
|
||||
|
@ -27,16 +35,15 @@ typedef struct
|
|||
|
||||
typedef struct
|
||||
{
|
||||
qboolean allsolid; // if true, plane is not valid
|
||||
qboolean startsolid; // if true, the initial point was in a solid area
|
||||
qboolean allsolid; // if true, plane is not valid
|
||||
qboolean startsolid; // if true, the initial point was in a solid area
|
||||
qboolean inopen, inwater;
|
||||
float fraction; // time completed, 1.0 = didn't hit anything
|
||||
vec3_t endpos; // final position
|
||||
plane_t plane; // surface normal at impact
|
||||
edict_t *ent; // entity the surface is on
|
||||
float fraction; // time completed, 1.0 = didn't hit anything
|
||||
vec3_t endpos; // final position
|
||||
plane_t plane; // surface normal at impact
|
||||
edict_t *ent; // entity the surface is on
|
||||
} trace_t;
|
||||
|
||||
|
||||
#define MOVE_NORMAL 0
|
||||
#define MOVE_NOMONSTERS 1
|
||||
#define MOVE_MISSILE 2
|
||||
|
@ -55,7 +62,6 @@ typedef struct areanode_s
|
|||
|
||||
extern areanode_t sv_areanodes[AREA_NODES];
|
||||
|
||||
|
||||
void SV_ClearWorld (void);
|
||||
// called after the world model has been loaded, before linking any entities
|
||||
|
||||
|
@ -89,5 +95,6 @@ trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, e
|
|||
|
||||
// passedict is explicitly excluded from clipping checks (normally NULL)
|
||||
|
||||
|
||||
edict_t *SV_TestPlayerPosition (edict_t *ent, vec3_t origin);
|
||||
|
||||
#endif // _WORLD_H
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue