whitespace.
This commit is contained in:
Ragnvald Maartmann-Moe IV
parent
a07d05e054
commit
3f816c0aa3
|
|
@ -1,8 +1,7 @@
|
|||
|
||||
/*
|
||||
world.c
|
||||
|
||||
@description@
|
||||
world query functions
|
||||
|
||||
Copyright (C) 1996-1997 Id Software, Inc.
|
||||
|
||||
|
|
@ -31,12 +30,13 @@
|
|||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include "world.h"
|
||||
#include "QF/model.h"
|
||||
#include "server.h"
|
||||
#include "QF/sys.h"
|
||||
#include "QF/console.h"
|
||||
#include "QF/model.h"
|
||||
#include "QF/sys.h"
|
||||
|
||||
#include "server.h"
|
||||
#include "sv_progs.h"
|
||||
#include "world.h"
|
||||
|
||||
/*
|
||||
|
||||
|
|
@ -51,8 +51,7 @@ typedef struct {
|
|||
vec3_t boxmins, boxmaxs; // enclose the test object along
|
||||
// entire move
|
||||
float *mins, *maxs; // size of the moving object
|
||||
vec3_t mins2, maxs2; // size when clipping against
|
||||
// mosnters
|
||||
vec3_t mins2, maxs2; // size when clipping against monsters
|
||||
float *start, *end;
|
||||
trace_t trace;
|
||||
int type;
|
||||
|
|
@ -63,25 +62,19 @@ typedef struct {
|
|||
int SV_HullPointContents (hull_t *hull, int num, vec3_t p);
|
||||
|
||||
/*
|
||||
===============================================================================
|
||||
|
||||
HULL BOXES
|
||||
|
||||
===============================================================================
|
||||
*/
|
||||
|
||||
|
||||
static hull_t box_hull;
|
||||
static dclipnode_t box_clipnodes[6];
|
||||
static mplane_t box_planes[6];
|
||||
|
||||
|
||||
/*
|
||||
===================
|
||||
SV_InitBoxHull
|
||||
|
||||
Set up the planes and clipnodes so that the six floats of a bounding box
|
||||
can just be stored out and get a proper hull_t structure.
|
||||
===================
|
||||
*/
|
||||
void
|
||||
SV_InitBoxHull (void)
|
||||
|
|
@ -113,12 +106,10 @@ SV_InitBoxHull (void)
|
|||
|
||||
|
||||
/*
|
||||
===================
|
||||
SV_HullForBox
|
||||
|
||||
To keep everything totally uniform, bounding boxes are turned into small
|
||||
BSP trees instead of being compared directly.
|
||||
===================
|
||||
*/
|
||||
hull_t *
|
||||
SV_HullForBox (vec3_t mins, vec3_t maxs)
|
||||
|
|
@ -134,16 +125,13 @@ SV_HullForBox (vec3_t mins, vec3_t maxs)
|
|||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
================
|
||||
SV_HullForEntity
|
||||
|
||||
Returns a hull that can be used for testing or clipping an object of mins/maxs
|
||||
size.
|
||||
Offset is filled in to contain the adjustment that must be added to the
|
||||
testing object's origin to get a point to use with the returned hull.
|
||||
================
|
||||
Returns a hull that can be used for testing or clipping an object of
|
||||
mins/maxs size. Offset is filled in to contain the adjustment that must
|
||||
be added to the testing object's origin to get a point to use with the
|
||||
returned hull.
|
||||
*/
|
||||
hull_t *
|
||||
SV_HullForEntity (edict_t *ent, vec3_t mins, vec3_t maxs, vec3_t offset)
|
||||
|
|
@ -154,7 +142,8 @@ SV_HullForEntity (edict_t *ent, vec3_t mins, vec3_t maxs, vec3_t offset)
|
|||
hull_t *hull;
|
||||
|
||||
// decide which clipping hull to use, based on the size
|
||||
if (SVFIELD (ent, solid, float) == SOLID_BSP) { // explicit hulls in the BSP model
|
||||
if (SVFIELD (ent, solid, float) == SOLID_BSP) { // explicit hulls in the
|
||||
// BSP model
|
||||
if (SVFIELD (ent, movetype, float) != MOVETYPE_PUSH)
|
||||
Sys_Error ("SOLID_BSP without MOVETYPE_PUSH");
|
||||
|
||||
|
|
@ -176,7 +165,6 @@ SV_HullForEntity (edict_t *ent, vec3_t mins, vec3_t maxs, vec3_t offset)
|
|||
VectorAdd (offset, SVFIELD (ent, origin, vector), offset);
|
||||
} else { // create a temp hull from bounding
|
||||
// box sizes
|
||||
|
||||
VectorSubtract (SVFIELD (ent, mins, vector), maxs, hullmins);
|
||||
VectorSubtract (SVFIELD (ent, maxs, vector), mins, hullmaxs);
|
||||
hull = SV_HullForBox (hullmins, hullmaxs);
|
||||
|
|
@ -184,16 +172,11 @@ SV_HullForEntity (edict_t *ent, vec3_t mins, vec3_t maxs, vec3_t offset)
|
|||
VectorCopy (SVFIELD (ent, origin, vector), offset);
|
||||
}
|
||||
|
||||
|
||||
return hull;
|
||||
}
|
||||
|
||||
/*
|
||||
===============================================================================
|
||||
|
||||
ENTITY AREA CHECKING
|
||||
|
||||
===============================================================================
|
||||
ENTITY AREA CHECKING ========================================================
|
||||
*/
|
||||
|
||||
typedef struct areanode_s {
|
||||
|
|
@ -210,12 +193,7 @@ typedef struct areanode_s {
|
|||
static areanode_t sv_areanodes[AREA_NODES];
|
||||
static int sv_numareanodes;
|
||||
|
||||
/*
|
||||
===============
|
||||
SV_CreateAreaNode
|
||||
|
||||
===============
|
||||
*/
|
||||
areanode_t *
|
||||
SV_CreateAreaNode (int depth, vec3_t mins, vec3_t maxs)
|
||||
{
|
||||
|
|
@ -255,12 +233,7 @@ SV_CreateAreaNode (int depth, vec3_t mins, vec3_t maxs)
|
|||
return anode;
|
||||
}
|
||||
|
||||
/*
|
||||
===============
|
||||
SV_ClearWorld
|
||||
|
||||
===============
|
||||
*/
|
||||
void
|
||||
SV_ClearWorld (void)
|
||||
{
|
||||
|
|
@ -272,12 +245,6 @@ SV_ClearWorld (void)
|
|||
}
|
||||
|
||||
|
||||
/*
|
||||
===============
|
||||
SV_UnlinkEdict
|
||||
|
||||
===============
|
||||
*/
|
||||
void
|
||||
SV_UnlinkEdict (edict_t *ent)
|
||||
{
|
||||
|
|
@ -288,11 +255,6 @@ SV_UnlinkEdict (edict_t *ent)
|
|||
}
|
||||
|
||||
|
||||
/*
|
||||
====================
|
||||
SV_TouchLinks
|
||||
====================
|
||||
*/
|
||||
void
|
||||
SV_TouchLinks (edict_t *ent, areanode_t *node)
|
||||
{
|
||||
|
|
@ -339,12 +301,6 @@ SV_TouchLinks (edict_t *ent, areanode_t *node)
|
|||
}
|
||||
|
||||
|
||||
/*
|
||||
===============
|
||||
SV_FindTouchedLeafs
|
||||
|
||||
===============
|
||||
*/
|
||||
void
|
||||
SV_FindTouchedLeafs (edict_t *ent, mnode_t *node)
|
||||
{
|
||||
|
|
@ -357,7 +313,6 @@ SV_FindTouchedLeafs (edict_t *ent, mnode_t *node)
|
|||
return;
|
||||
|
||||
// add an efrag if the node is a leaf
|
||||
|
||||
if (node->contents < 0) {
|
||||
if (ent->num_leafs == MAX_ENT_LEAFS)
|
||||
return;
|
||||
|
|
@ -382,12 +337,7 @@ SV_FindTouchedLeafs (edict_t *ent, mnode_t *node)
|
|||
SV_FindTouchedLeafs (ent, node->children[1]);
|
||||
}
|
||||
|
||||
/*
|
||||
===============
|
||||
SV_LinkEdict
|
||||
|
||||
===============
|
||||
*/
|
||||
void
|
||||
SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
|
||||
{
|
||||
|
|
@ -406,10 +356,8 @@ SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
|
|||
|
||||
#ifdef QUAKE2
|
||||
if (SVFIELD (ent, solid, float) == SOLID_BSP &&
|
||||
(SVFIELD (ent, angles, float)[0] || SVFIELD (ent, angles, float)[1] || SVFIELD (ent, angles, float)[2])) { // expand
|
||||
//
|
||||
// for
|
||||
// rotation
|
||||
(SVFIELD (ent, angles, float)[0] || SVFIELD (ent, angles, float)[1]
|
||||
|| SVFIELD (ent, angles, float)[2])) { // expand for rotation
|
||||
float max, v;
|
||||
int i;
|
||||
|
||||
|
|
@ -433,18 +381,15 @@ SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
|
|||
VectorAdd (SVFIELD (ent, origin, vector), SVFIELD (ent, maxs, vector), SVFIELD (ent, absmax, vector));
|
||||
}
|
||||
|
||||
//
|
||||
// to make items easier to pick up and allow them to be grabbed off
|
||||
// of shelves, the abs sizes are expanded
|
||||
//
|
||||
if ((int) SVFIELD (ent, flags, float) & FL_ITEM) {
|
||||
SVFIELD (ent, absmin, vector)[0] -= 15;
|
||||
SVFIELD (ent, absmin, vector)[1] -= 15;
|
||||
SVFIELD (ent, absmax, vector)[0] += 15;
|
||||
SVFIELD (ent, absmax, vector)[1] += 15;
|
||||
} else { // because movement is clipped an
|
||||
// epsilon away from an actual edge,
|
||||
// we must fully check even when bounding boxes don't quite touch
|
||||
} else { // movement is clipped an epsilon away from actual edge, so we
|
||||
// must fully check even when bounding boxes don't quite touch
|
||||
SVFIELD (ent, absmin, vector)[0] -= 1;
|
||||
SVFIELD (ent, absmin, vector)[1] -= 1;
|
||||
SVFIELD (ent, absmin, vector)[2] -= 1;
|
||||
|
|
@ -475,7 +420,6 @@ SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
|
|||
}
|
||||
|
||||
// link it in
|
||||
|
||||
if (SVFIELD (ent, solid, float) == SOLID_TRIGGER)
|
||||
InsertLinkBefore (&ent->area, &node->trigger_edicts);
|
||||
else
|
||||
|
|
@ -489,21 +433,10 @@ SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
|
|||
|
||||
|
||||
/*
|
||||
===============================================================================
|
||||
|
||||
POINT TESTING IN HULLS
|
||||
|
||||
===============================================================================
|
||||
POINT TESTING IN HULLS ======================================================
|
||||
*/
|
||||
|
||||
#ifndef USE_INTEL_ASM
|
||||
|
||||
/*
|
||||
==================
|
||||
SV_HullPointContents
|
||||
|
||||
==================
|
||||
*/
|
||||
int
|
||||
SV_HullPointContents (hull_t *hull, int num, vec3_t p)
|
||||
{
|
||||
|
|
@ -530,16 +463,9 @@ SV_HullPointContents (hull_t *hull, int num, vec3_t p)
|
|||
|
||||
return num;
|
||||
}
|
||||
|
||||
#endif // USE_INTEL_ASM
|
||||
|
||||
|
||||
/*
|
||||
==================
|
||||
SV_PointContents
|
||||
|
||||
==================
|
||||
*/
|
||||
int
|
||||
SV_PointContents (vec3_t p)
|
||||
{
|
||||
|
|
@ -551,29 +477,28 @@ SV_PointContents (vec3_t p)
|
|||
return cont;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
SV_TruePointContents (vec3_t p)
|
||||
{
|
||||
return SV_HullPointContents (&sv.worldmodel->hulls[0], 0, p);
|
||||
}
|
||||
|
||||
//===========================================================================
|
||||
|
||||
/*
|
||||
============
|
||||
SV_TestEntityPosition
|
||||
|
||||
This could be a lot more efficient...
|
||||
============
|
||||
*/
|
||||
edict_t *
|
||||
SV_TestEntityPosition (edict_t *ent)
|
||||
{
|
||||
trace_t trace;
|
||||
|
||||
trace =
|
||||
SV_Move (SVFIELD (ent, origin, vector), SVFIELD (ent, mins, vector), SVFIELD (ent, maxs, vector), SVFIELD (ent, origin, vector),
|
||||
0, ent);
|
||||
trace = SV_Move (SVFIELD (ent, origin, vector),
|
||||
SVFIELD (ent, mins, vector),
|
||||
SVFIELD (ent, maxs, vector),
|
||||
SVFIELD (ent, origin, vector), 0, ent);
|
||||
|
||||
if (trace.startsolid)
|
||||
return sv.edicts;
|
||||
|
|
@ -583,22 +508,13 @@ SV_TestEntityPosition (edict_t *ent)
|
|||
|
||||
|
||||
/*
|
||||
===============================================================================
|
||||
|
||||
LINE TESTING IN HULLS
|
||||
|
||||
===============================================================================
|
||||
LINE TESTING IN HULLS =======================================================
|
||||
*/
|
||||
|
||||
// 1/32 epsilon to keep floating point happy
|
||||
#define DIST_EPSILON (0.03125)
|
||||
|
||||
/*
|
||||
==================
|
||||
SV_RecursiveHullCheck
|
||||
|
||||
==================
|
||||
*/
|
||||
qboolean
|
||||
SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1,
|
||||
vec3_t p2, trace_t *trace)
|
||||
|
|
@ -628,9 +544,7 @@ SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1,
|
|||
if (num < hull->firstclipnode || num > hull->lastclipnode)
|
||||
Sys_Error ("SV_RecursiveHullCheck: bad node number");
|
||||
|
||||
//
|
||||
// find the point distances
|
||||
//
|
||||
node = hull->clipnodes + num;
|
||||
plane = hull->planes + node->planenum;
|
||||
|
||||
|
|
@ -644,18 +558,18 @@ SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1,
|
|||
|
||||
#if 1
|
||||
if (t1 >= 0 && t2 >= 0)
|
||||
return SV_RecursiveHullCheck (hull, node->children[0], p1f, p2f, p1, p2,
|
||||
trace);
|
||||
return SV_RecursiveHullCheck (hull, node->children[0], p1f, p2f, p1,
|
||||
p2, trace);
|
||||
if (t1 < 0 && t2 < 0)
|
||||
return SV_RecursiveHullCheck (hull, node->children[1], p1f, p2f, p1, p2,
|
||||
trace);
|
||||
return SV_RecursiveHullCheck (hull, node->children[1], p1f, p2f, p1,
|
||||
p2, trace);
|
||||
#else
|
||||
if ((t1 >= DIST_EPSILON && t2 >= DIST_EPSILON) || (t2 > t1 && t1 >= 0))
|
||||
return SV_RecursiveHullCheck (hull, node->children[0], p1f, p2f, p1, p2,
|
||||
trace);
|
||||
return SV_RecursiveHullCheck (hull, node->children[0], p1f, p2f, p1,
|
||||
p2, trace);
|
||||
if ((t1 <= -DIST_EPSILON && t2 <= -DIST_EPSILON) || (t2 < t1 && t1 <= 0))
|
||||
return SV_RecursiveHullCheck (hull, node->children[1], p1f, p2f, p1, p2,
|
||||
trace);
|
||||
return SV_RecursiveHullCheck (hull, node->children[1], p1f, p2f, p1,
|
||||
p2, trace);
|
||||
#endif
|
||||
|
||||
// put the crosspoint DIST_EPSILON pixels on the near side
|
||||
|
|
@ -689,15 +603,13 @@ SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1,
|
|||
if (SV_HullPointContents (hull, node->children[side ^ 1], mid)
|
||||
!= CONTENTS_SOLID)
|
||||
// go past the node
|
||||
return SV_RecursiveHullCheck (hull, node->children[side ^ 1], midf, p2f,
|
||||
mid, p2, trace);
|
||||
return SV_RecursiveHullCheck (hull, node->children[side ^ 1], midf,
|
||||
p2f, mid, p2, trace);
|
||||
|
||||
if (trace->allsolid)
|
||||
return false; // never got out of the solid area
|
||||
|
||||
//==================
|
||||
// the other side of the node is solid, this is the impact point
|
||||
//==================
|
||||
if (!side) {
|
||||
VectorCopy (plane->normal, trace->plane.normal);
|
||||
trace->plane.dist = plane->dist;
|
||||
|
|
@ -729,12 +641,10 @@ SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1,
|
|||
|
||||
|
||||
/*
|
||||
==================
|
||||
SV_ClipMoveToEntity
|
||||
|
||||
Handles selection or creation of a clipping hull, and offseting (and
|
||||
eventually rotation) of the end points
|
||||
==================
|
||||
*/
|
||||
trace_t
|
||||
SV_ClipMoveToEntity (edict_t *ent, vec3_t start, vec3_t mins, vec3_t maxs,
|
||||
|
|
@ -761,7 +671,8 @@ SV_ClipMoveToEntity (edict_t *ent, vec3_t start, vec3_t mins, vec3_t maxs,
|
|||
#ifdef QUAKE2
|
||||
// rotate start and end into the models frame of reference
|
||||
if (SVFIELD (ent, solid, float) == SOLID_BSP &&
|
||||
(SVFIELD (ent, angles, float)[0] || SVFIELD (ent, angles, float)[1] || SVFIELD (ent, angles, float)[2])) {
|
||||
(SVFIELD (ent, angles, float)[0] || SVFIELD (ent, angles, float)[1]
|
||||
|| SVFIELD (ent, angles, float)[2])) {
|
||||
vec3_t a;
|
||||
vec3_t forward, right, up;
|
||||
vec3_t temp;
|
||||
|
|
@ -820,14 +731,11 @@ SV_ClipMoveToEntity (edict_t *ent, vec3_t start, vec3_t mins, vec3_t maxs,
|
|||
return trace;
|
||||
}
|
||||
|
||||
//===========================================================================
|
||||
|
||||
/*
|
||||
====================
|
||||
SV_ClipToLinks
|
||||
|
||||
Mins and maxs enclose the entire area swept by the move
|
||||
====================
|
||||
*/
|
||||
void
|
||||
SV_ClipToLinks (areanode_t *node, moveclip_t * clip)
|
||||
|
|
@ -867,20 +775,18 @@ SV_ClipToLinks (areanode_t *node, moveclip_t * clip)
|
|||
return;
|
||||
if (clip->passedict) {
|
||||
if (PROG_TO_EDICT (&sv_pr_state, SVFIELD (touch, owner, entity)) ==
|
||||
clip->passedict) continue; // don't clip against own
|
||||
// missiles
|
||||
if (PROG_TO_EDICT (&sv_pr_state, SVFIELD (clip->passedict, owner, entity)) ==
|
||||
touch) continue; // don't clip against owner
|
||||
clip->passedict) continue; // don't clip against own missiles
|
||||
if (PROG_TO_EDICT (&sv_pr_state,
|
||||
SVFIELD (clip->passedict, owner, entity))
|
||||
== touch) continue; // don't clip against owner
|
||||
}
|
||||
|
||||
if ((int) SVFIELD (touch, flags, float) & FL_MONSTER)
|
||||
trace =
|
||||
SV_ClipMoveToEntity (touch, clip->start, clip->mins2,
|
||||
trace = SV_ClipMoveToEntity (touch, clip->start, clip->mins2,
|
||||
clip->maxs2, clip->end);
|
||||
else
|
||||
trace =
|
||||
SV_ClipMoveToEntity (touch, clip->start, clip->mins, clip->maxs,
|
||||
clip->end);
|
||||
trace = SV_ClipMoveToEntity (touch, clip->start, clip->mins,
|
||||
clip->maxs, clip->end);
|
||||
if (trace.allsolid || trace.startsolid
|
||||
|| trace.fraction < clip->trace.fraction) {
|
||||
trace.ent = touch;
|
||||
|
|
@ -904,11 +810,6 @@ SV_ClipToLinks (areanode_t *node, moveclip_t * clip)
|
|||
}
|
||||
|
||||
|
||||
/*
|
||||
==================
|
||||
SV_MoveBounds
|
||||
==================
|
||||
*/
|
||||
void
|
||||
SV_MoveBounds (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end,
|
||||
vec3_t boxmins, vec3_t boxmaxs)
|
||||
|
|
@ -932,11 +833,7 @@ SV_MoveBounds (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end,
|
|||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
==================
|
||||
SV_Move
|
||||
==================
|
||||
*/
|
||||
|
||||
trace_t
|
||||
SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type,
|
||||
edict_t *passedict)
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@
|
|||
|
||||
#include "QF/console.h"
|
||||
#include "QF/crc.h"
|
||||
|
||||
#include "server.h"
|
||||
#include "sv_progs.h"
|
||||
#include "world.h"
|
||||
|
|
@ -72,11 +73,11 @@ int SV_HullPointContents (hull_t *hull, int num, vec3_t p);
|
|||
HULL BOXES
|
||||
*/
|
||||
|
||||
|
||||
static hull_t box_hull;
|
||||
static dclipnode_t box_clipnodes[6];
|
||||
static mplane_t box_planes[6];
|
||||
|
||||
|
||||
/*
|
||||
SV_InitBoxHull
|
||||
|
||||
|
|
@ -132,7 +133,6 @@ SV_HullForBox (vec3_t mins, vec3_t maxs)
|
|||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
SV_HullForEntity
|
||||
|
||||
|
|
@ -171,9 +171,7 @@ SV_HullForEntity (edict_t *ent, vec3_t mins, vec3_t maxs, vec3_t offset)
|
|||
// calculate an offset value to center the origin
|
||||
VectorSubtract (hull->clip_mins, mins, offset);
|
||||
VectorAdd (offset, SVFIELD (ent, origin, vector), offset);
|
||||
} else { // create a temp hull from bounding
|
||||
// box sizes
|
||||
|
||||
} else { // create a temp hull from bounding box sizes
|
||||
VectorSubtract (SVFIELD (ent, mins, vector), maxs, hullmins);
|
||||
VectorSubtract (SVFIELD (ent, maxs, vector), mins, hullmaxs);
|
||||
hull = SV_HullForBox (hullmins, hullmaxs);
|
||||
|
|
@ -181,21 +179,18 @@ SV_HullForEntity (edict_t *ent, vec3_t mins, vec3_t maxs, vec3_t offset)
|
|||
VectorCopy (SVFIELD (ent, origin, vector), offset);
|
||||
}
|
||||
|
||||
|
||||
return hull;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
ENTITY AREA CHECKING
|
||||
*/
|
||||
|
||||
|
||||
areanode_t sv_areanodes[AREA_NODES];
|
||||
int sv_numareanodes;
|
||||
|
||||
/*
|
||||
SV_CreateAreaNode
|
||||
*/
|
||||
|
||||
areanode_t *
|
||||
SV_CreateAreaNode (int depth, vec3_t mins, vec3_t maxs)
|
||||
{
|
||||
|
|
@ -235,9 +230,7 @@ SV_CreateAreaNode (int depth, vec3_t mins, vec3_t maxs)
|
|||
return anode;
|
||||
}
|
||||
|
||||
/*
|
||||
SV_ClearWorld
|
||||
*/
|
||||
|
||||
void
|
||||
SV_ClearWorld (void)
|
||||
{
|
||||
|
|
@ -249,9 +242,6 @@ SV_ClearWorld (void)
|
|||
}
|
||||
|
||||
|
||||
/*
|
||||
SV_UnlinkEdict
|
||||
*/
|
||||
void
|
||||
SV_UnlinkEdict (edict_t *ent)
|
||||
{
|
||||
|
|
@ -262,9 +252,6 @@ SV_UnlinkEdict (edict_t *ent)
|
|||
}
|
||||
|
||||
|
||||
/*
|
||||
SV_TouchLinks
|
||||
*/
|
||||
void
|
||||
SV_TouchLinks (edict_t *ent, areanode_t *node)
|
||||
{
|
||||
|
|
@ -278,7 +265,8 @@ SV_TouchLinks (edict_t *ent, areanode_t *node)
|
|||
touch = EDICT_FROM_AREA (l);
|
||||
if (touch == ent)
|
||||
continue;
|
||||
if (!SVFIELD (touch, touch, func) || SVFIELD (touch, solid, float) != SOLID_TRIGGER)
|
||||
if (!SVFIELD (touch, touch, func)
|
||||
|| SVFIELD (touch, solid, float) != SOLID_TRIGGER)
|
||||
continue;
|
||||
if (SVFIELD (ent, absmin, vector)[0] > SVFIELD (touch, absmax, vector)[0]
|
||||
|| SVFIELD (ent, absmin, vector)[1] > SVFIELD (touch, absmax, vector)[1]
|
||||
|
|
@ -311,9 +299,6 @@ SV_TouchLinks (edict_t *ent, areanode_t *node)
|
|||
}
|
||||
|
||||
|
||||
/*
|
||||
SV_FindTouchedLeafs
|
||||
*/
|
||||
void
|
||||
SV_FindTouchedLeafs (edict_t *ent, mnode_t *node)
|
||||
{
|
||||
|
|
@ -326,7 +311,6 @@ SV_FindTouchedLeafs (edict_t *ent, mnode_t *node)
|
|||
return;
|
||||
|
||||
// add an efrag if the node is a leaf
|
||||
|
||||
if (node->contents < 0) {
|
||||
if (ent->num_leafs == MAX_ENT_LEAFS)
|
||||
return;
|
||||
|
|
@ -338,10 +322,11 @@ SV_FindTouchedLeafs (edict_t *ent, mnode_t *node)
|
|||
ent->num_leafs++;
|
||||
return;
|
||||
}
|
||||
// NODE_MIXED
|
||||
|
||||
// NODE_MIXED
|
||||
splitplane = node->plane;
|
||||
sides = BOX_ON_PLANE_SIDE (SVFIELD (ent, absmin, vector), SVFIELD (ent, absmax, vector), splitplane);
|
||||
sides = BOX_ON_PLANE_SIDE (SVFIELD (ent, absmin, vector),
|
||||
SVFIELD (ent, absmax, vector), splitplane);
|
||||
|
||||
// recurse down the contacted sides
|
||||
if (sides & 1)
|
||||
|
|
@ -351,9 +336,7 @@ SV_FindTouchedLeafs (edict_t *ent, mnode_t *node)
|
|||
SV_FindTouchedLeafs (ent, node->children[1]);
|
||||
}
|
||||
|
||||
/*
|
||||
SV_LinkEdict
|
||||
*/
|
||||
|
||||
void
|
||||
SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
|
||||
{
|
||||
|
|
@ -369,21 +352,20 @@ SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
|
|||
return;
|
||||
|
||||
// set the abs box
|
||||
VectorAdd (SVFIELD (ent, origin, vector), SVFIELD (ent, mins, vector), SVFIELD (ent, absmin, vector));
|
||||
VectorAdd (SVFIELD (ent, origin, vector), SVFIELD (ent, maxs, vector), SVFIELD (ent, absmax, vector));
|
||||
VectorAdd (SVFIELD (ent, origin, vector), SVFIELD (ent, mins, vector),
|
||||
SVFIELD (ent, absmin, vector));
|
||||
VectorAdd (SVFIELD (ent, origin, vector), SVFIELD (ent, maxs, vector),
|
||||
SVFIELD (ent, absmax, vector));
|
||||
|
||||
//
|
||||
// to make items easier to pick up and allow them to be grabbed off
|
||||
// of shelves, the abs sizes are expanded
|
||||
//
|
||||
if ((int) SVFIELD (ent, flags, float) & FL_ITEM) {
|
||||
SVFIELD (ent, absmin, vector)[0] -= 15;
|
||||
SVFIELD (ent, absmin, vector)[1] -= 15;
|
||||
SVFIELD (ent, absmax, vector)[0] += 15;
|
||||
SVFIELD (ent, absmax, vector)[1] += 15;
|
||||
} else { // because movement is clipped an
|
||||
// epsilon away from an actual edge,
|
||||
// we must fully check even when bounding boxes don't quite touch
|
||||
} else { // movement is clipped an epsilon away from actual edge, so we
|
||||
// must fully check even when bounding boxes don't quite touch
|
||||
SVFIELD (ent, absmin, vector)[0] -= 1;
|
||||
SVFIELD (ent, absmin, vector)[1] -= 1;
|
||||
SVFIELD (ent, absmin, vector)[2] -= 1;
|
||||
|
|
@ -414,7 +396,6 @@ SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
|
|||
}
|
||||
|
||||
// link it in
|
||||
|
||||
if (SVFIELD (ent, solid, float) == SOLID_TRIGGER)
|
||||
InsertLinkBefore (&ent->area, &node->trigger_edicts);
|
||||
else
|
||||
|
|
@ -426,16 +407,12 @@ SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
|
|||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
POINT TESTING IN HULLS
|
||||
*/
|
||||
|
||||
#ifndef USE_INTEL_ASM
|
||||
|
||||
/*
|
||||
SV_HullPointContents
|
||||
*/
|
||||
#ifndef USE_INTEL_ASM
|
||||
int
|
||||
SV_HullPointContents (hull_t *hull, int num, vec3_t p)
|
||||
{
|
||||
|
|
@ -462,20 +439,15 @@ SV_HullPointContents (hull_t *hull, int num, vec3_t p)
|
|||
|
||||
return num;
|
||||
}
|
||||
|
||||
#endif // !USE_INTEL_ASM
|
||||
|
||||
|
||||
/*
|
||||
SV_PointContents
|
||||
*/
|
||||
int
|
||||
SV_PointContents (vec3_t p)
|
||||
{
|
||||
return SV_HullPointContents (&sv.worldmodel->hulls[0], 0, p);
|
||||
}
|
||||
|
||||
//===========================================================================
|
||||
|
||||
/*
|
||||
SV_TestEntityPosition
|
||||
|
|
@ -488,9 +460,9 @@ SV_TestEntityPosition (edict_t *ent)
|
|||
{
|
||||
trace_t trace;
|
||||
|
||||
trace =
|
||||
SV_Move (SVFIELD (ent, origin, vector), SVFIELD (ent, mins, vector), SVFIELD (ent, maxs, vector), SVFIELD (ent, origin, vector), 0,
|
||||
ent);
|
||||
trace = SV_Move (SVFIELD (ent, origin, vector),
|
||||
SVFIELD (ent, mins, vector), SVFIELD (ent, maxs, vector),
|
||||
SVFIELD (ent, origin, vector), 0, ent);
|
||||
|
||||
if (trace.startsolid)
|
||||
return sv.edicts;
|
||||
|
|
@ -498,6 +470,7 @@ SV_TestEntityPosition (edict_t *ent)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
LINE TESTING IN HULLS
|
||||
*/
|
||||
|
|
@ -505,9 +478,7 @@ SV_TestEntityPosition (edict_t *ent)
|
|||
// 1/32 epsilon to keep floating point happy
|
||||
#define DIST_EPSILON (0.03125)
|
||||
|
||||
/*
|
||||
SV_RecursiveHullCheck
|
||||
*/
|
||||
|
||||
qboolean
|
||||
SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1,
|
||||
vec3_t p2, trace_t *trace)
|
||||
|
|
@ -537,9 +508,7 @@ SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1,
|
|||
if (num < hull->firstclipnode || num > hull->lastclipnode)
|
||||
SV_Error ("SV_RecursiveHullCheck: bad node number");
|
||||
|
||||
//
|
||||
// find the point distances
|
||||
//
|
||||
node = hull->clipnodes + num;
|
||||
plane = hull->planes + node->planenum;
|
||||
|
||||
|
|
@ -553,18 +522,18 @@ SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1,
|
|||
|
||||
#if 1
|
||||
if (t1 >= 0 && t2 >= 0)
|
||||
return SV_RecursiveHullCheck (hull, node->children[0], p1f, p2f, p1, p2,
|
||||
trace);
|
||||
return SV_RecursiveHullCheck (hull, node->children[0], p1f, p2f, p1,
|
||||
p2, trace);
|
||||
if (t1 < 0 && t2 < 0)
|
||||
return SV_RecursiveHullCheck (hull, node->children[1], p1f, p2f, p1, p2,
|
||||
trace);
|
||||
return SV_RecursiveHullCheck (hull, node->children[1], p1f, p2f, p1,
|
||||
p2, trace);
|
||||
#else
|
||||
if ((t1 >= DIST_EPSILON && t2 >= DIST_EPSILON) || (t2 > t1 && t1 >= 0))
|
||||
return SV_RecursiveHullCheck (hull, node->children[0], p1f, p2f, p1, p2,
|
||||
trace);
|
||||
return SV_RecursiveHullCheck (hull, node->children[0], p1f, p2f, p1,
|
||||
p2, trace);
|
||||
if ((t1 <= -DIST_EPSILON && t2 <= -DIST_EPSILON) || (t2 < t1 && t1 <= 0))
|
||||
return SV_RecursiveHullCheck (hull, node->children[1], p1f, p2f, p1, p2,
|
||||
trace);
|
||||
return SV_RecursiveHullCheck (hull, node->children[1], p1f, p2f, p1,
|
||||
p2, trace);
|
||||
#endif
|
||||
|
||||
// put the crosspoint DIST_EPSILON pixels on the near side
|
||||
|
|
@ -598,15 +567,13 @@ SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1,
|
|||
if (SV_HullPointContents (hull, node->children[side ^ 1], mid)
|
||||
!= CONTENTS_SOLID)
|
||||
// go past the node
|
||||
return SV_RecursiveHullCheck (hull, node->children[side ^ 1], midf, p2f,
|
||||
mid, p2, trace);
|
||||
return SV_RecursiveHullCheck (hull, node->children[side ^ 1], midf,
|
||||
p2f, mid, p2, trace);
|
||||
|
||||
if (trace->allsolid)
|
||||
return false; // never got out of the solid area
|
||||
|
||||
//==================
|
||||
// the other side of the node is solid, this is the impact point
|
||||
//==================
|
||||
if (!side) {
|
||||
VectorCopy (plane->normal, trace->plane.normal);
|
||||
trace->plane.dist = plane->dist;
|
||||
|
|
@ -680,7 +647,6 @@ SV_ClipMoveToEntity (edict_t *ent, vec3_t start, vec3_t mins, vec3_t maxs,
|
|||
return trace;
|
||||
}
|
||||
|
||||
//===========================================================================
|
||||
|
||||
/*
|
||||
SV_ClipToLinks
|
||||
|
|
@ -705,7 +671,8 @@ SV_ClipToLinks (areanode_t *node, moveclip_t * clip)
|
|||
if (SVFIELD (touch, solid, float) == SOLID_TRIGGER)
|
||||
SV_Error ("Trigger in clipping list");
|
||||
|
||||
if (clip->type == MOVE_NOMONSTERS && SVFIELD (touch, solid, float) != SOLID_BSP)
|
||||
if (clip->type == MOVE_NOMONSTERS && SVFIELD (touch, solid, float)
|
||||
!= SOLID_BSP)
|
||||
continue;
|
||||
|
||||
if (clip->boxmins[0] > SVFIELD (touch, absmax, vector)[0]
|
||||
|
|
@ -730,13 +697,11 @@ SV_ClipToLinks (areanode_t *node, moveclip_t * clip)
|
|||
}
|
||||
|
||||
if ((int) SVFIELD (touch, flags, float) & FL_MONSTER)
|
||||
trace =
|
||||
SV_ClipMoveToEntity (touch, clip->start, clip->mins2,
|
||||
trace = SV_ClipMoveToEntity (touch, clip->start, clip->mins2,
|
||||
clip->maxs2, clip->end);
|
||||
else
|
||||
trace =
|
||||
SV_ClipMoveToEntity (touch, clip->start, clip->mins, clip->maxs,
|
||||
clip->end);
|
||||
trace = SV_ClipMoveToEntity (touch, clip->start, clip->mins,
|
||||
clip->maxs, clip->end);
|
||||
if (trace.allsolid || trace.startsolid
|
||||
|| trace.fraction < clip->trace.fraction) {
|
||||
trace.ent = touch;
|
||||
|
|
@ -760,9 +725,6 @@ SV_ClipToLinks (areanode_t *node, moveclip_t * clip)
|
|||
}
|
||||
|
||||
|
||||
/*
|
||||
SV_MoveBounds
|
||||
*/
|
||||
void
|
||||
SV_MoveBounds (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end,
|
||||
vec3_t boxmins, vec3_t boxmaxs)
|
||||
|
|
@ -786,9 +748,7 @@ SV_MoveBounds (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end,
|
|||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
SV_Move
|
||||
*/
|
||||
|
||||
trace_t
|
||||
SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type,
|
||||
edict_t *passedict)
|
||||
|
|
@ -828,11 +788,7 @@ SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type,
|
|||
return clip.trace;
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
|
||||
/*
|
||||
SV_TestPlayerPosition
|
||||
*/
|
||||
edict_t *
|
||||
SV_TestPlayerPosition (edict_t *ent, vec3_t origin)
|
||||
{
|
||||
|
|
@ -855,8 +811,9 @@ SV_TestPlayerPosition (edict_t *ent, vec3_t origin)
|
|||
for (e = 1; e < sv.num_edicts; e++, check = NEXT_EDICT (&sv_pr_state, check)) {
|
||||
if (check->free)
|
||||
continue;
|
||||
if (SVFIELD (check, solid, float) != SOLID_BSP &&
|
||||
SVFIELD (check, solid, float) != SOLID_BBOX && SVFIELD (check, solid, float) != SOLID_SLIDEBOX)
|
||||
if (SVFIELD (check, solid, float) != SOLID_BSP
|
||||
&& SVFIELD (check, solid, float) != SOLID_BBOX
|
||||
&& SVFIELD (check, solid, float) != SOLID_SLIDEBOX)
|
||||
continue;
|
||||
|
||||
if (boxmins[0] > SVFIELD (check, absmax, vector)[0]
|
||||
|
|
@ -871,7 +828,8 @@ SV_TestPlayerPosition (edict_t *ent, vec3_t origin)
|
|||
continue;
|
||||
|
||||
// get the clipping hull
|
||||
hull = SV_HullForEntity (check, SVFIELD (ent, mins, vector), SVFIELD (ent, maxs, vector), offset);
|
||||
hull = SV_HullForEntity (check, SVFIELD (ent, mins, vector),
|
||||
SVFIELD (ent, maxs, vector), offset);
|
||||
|
||||
VectorSubtract (origin, offset, offset);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue