diff --git a/common/cl_cam.c b/common/cl_cam.c index 5875e55..288dd4b 100644 --- a/common/cl_cam.c +++ b/common/cl_cam.c @@ -33,6 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include +#include #define PM_SPECTATORMAXSPEED 500 #define PM_STOPSPEED 100 @@ -48,8 +49,6 @@ static int oldbuttons; // track high fragger cvar_t cl_hightrack = {"cl_hightrack", "0" }; -cvar_t cl_chasecam = {"cl_chasecam", "0"}; - //cvar_t cl_camera_maxpitch = {"cl_camera_maxpitch", "10" }; //cvar_t cl_camera_maxyaw = {"cl_camera_maxyaw", "30" }; @@ -60,6 +59,70 @@ double cam_lastviewtime; int spec_track = 0; // player# of who we are tracking int autocam = CAM_NONE; +cvar_t cl_chasecam = {"cl_chasecam", "0", true}; +cvar_t cl_chasecam_up = {"cl_chasecam_up", "16", true}; +cvar_t cl_chasecam_back = {"cl_chasecam_back", "100", true}; +cvar_t cl_chasecam_right = {"cl_chasecam_right", "0", true}; + +vec3_t chase_pos; +vec3_t chase_angles; + +vec3_t chase_dest; +vec3_t chase_dest_angles; + +void Chase_Init (void) { + Cvar_RegisterVariable (&cl_chasecam); + Cvar_RegisterVariable (&cl_chasecam_up); + Cvar_RegisterVariable (&cl_chasecam_back); + Cvar_RegisterVariable (&cl_chasecam_right); +} + +void Chase_Reset (void) { + // for respawning and teleporting + // start position 12 units behind head +} + +void TraceLine (vec3_t start, vec3_t end, vec3_t impact) { + trace_t trace; + + memset (&trace, 0, sizeof(trace)); + SV_RecursiveHullCheck (cl.worldmodel->hulls, 0, 0, 1, start, end, &trace); + + VectorCopy (trace.endpos, impact); +} + +void Chase_Update (void) { + + int i; + float dist; + vec3_t forward, up, right; + vec3_t dest, stop; + + // if can't see player, reset + AngleVectors (cl.viewangles, forward, right, up); + + // calc exact destination + for (i=0 ; i<3 ; i++) + chase_dest[i] = r_refdef.vieworg[i] + - forward[i] * cl_chasecam_back.value + - right[i] * cl_chasecam_right.value; + chase_dest[2] = r_refdef.vieworg[2] + cl_chasecam_up.value; + + // find the spot the player is looking at + VectorMA (r_refdef.vieworg, 4096, forward, dest); + TraceLine (r_refdef.vieworg, dest, stop); + + // calculate pitch to look at the same spot from camera + VectorSubtract (stop, r_refdef.vieworg, stop); + dist = DotProduct (stop, forward); + if (dist < 1) + dist = 1; + r_refdef.viewangles[PITCH] = -atan(stop[2] / dist) / M_PI * 180; + + // move towards destination + VectorCopy (chase_dest, r_refdef.vieworg); +} + static void vectoangles(vec3_t vec, vec3_t ang) { float forward; diff --git a/common/common.c b/common/common.c index 2d22d9a..a3ceeb6 100644 --- a/common/common.c +++ b/common/common.c @@ -41,6 +41,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. char com_token[1024]; qboolean standard_quake = true, rogue, hipnotic; +qboolean msg_suppress_1 = 0; // ClearLink is used for new headnodes void ClearLink (link_t *l) diff --git a/common/phys.h b/common/phys.h new file mode 100644 index 0000000..5b3afd0 --- /dev/null +++ b/common/phys.h @@ -0,0 +1,70 @@ +// edict->movetype values +#define MOVETYPE_NONE 0 // never moves +#define MOVETYPE_ANGLENOCLIP 1 +#define MOVETYPE_ANGLECLIP 2 +#define MOVETYPE_WALK 3 // gravity +#define MOVETYPE_STEP 4 // gravity, special edge handling +#define MOVETYPE_FLY 5 +#define MOVETYPE_TOSS 6 // gravity +#define MOVETYPE_PUSH 7 // no clip to world, push and crush +#define MOVETYPE_NOCLIP 8 +#define MOVETYPE_FLYMISSILE 9 // extra size to monsters +#define MOVETYPE_BOUNCE 10 +#ifdef QUAKE2 +#define MOVETYPE_BOUNCEMISSILE 11 // bounce w/o gravity +#define MOVETYPE_FOLLOW 12 // track movement of aiment +#endif + +// edict->solid values +#define SOLID_NOT 0 // no interaction with other objects +#define SOLID_TRIGGER 1 // touch on edge, but not blocking +#define SOLID_BBOX 2 // touch on edge, block +#define SOLID_SLIDEBOX 3 // touch on edge, but not an onground +#define SOLID_BSP 4 // bsp clip, touch on edge, block + +// edict->deadflag values +#define DEAD_NO 0 +#define DEAD_DYING 1 +#define DEAD_DEAD 2 + +#define DAMAGE_NO 0 +#define DAMAGE_YES 1 +#define DAMAGE_AIM 2 + +// edict->flags +#define FL_FLY 1 +#define FL_SWIM 2 +//#define FL_GLIMPSE 4 +#define FL_CONVEYOR 4 +#define FL_CLIENT 8 +#define FL_INWATER 16 +#define FL_MONSTER 32 +#define FL_GODMODE 64 +#define FL_NOTARGET 128 +#define FL_ITEM 256 +#define FL_ONGROUND 512 +#define FL_PARTIALGROUND 1024 // not all corners are valid +#define FL_WATERJUMP 2048 // player jumping out of water +#define FL_JUMPRELEASED 4096 // for jump debouncing +#ifdef QUAKE2 +#define FL_FLASHLIGHT 8192 +#define FL_ARCHIVE_OVERRIDE 1048576 +#endif + +// entity effects + +#define EF_BRIGHTFIELD 1 +#define EF_MUZZLEFLASH 2 +#define EF_BRIGHTLIGHT 4 +#define EF_DIMLIGHT 8 +#ifdef QUAKE2 +#define EF_DARKLIGHT 16 +#define EF_DARKFIELD 32 +#define EF_LIGHT 64 +#define EF_NODRAW 128 +#endif + +#define SPAWNFLAG_NOT_EASY 256 +#define SPAWNFLAG_NOT_MEDIUM 512 +#define SPAWNFLAG_NOT_HARD 1024 +#define SPAWNFLAG_NOT_DEATHMATCH 2048 diff --git a/common/progs.h b/common/progs.h index 0c505db..4aacb01 100644 --- a/common/progs.h +++ b/common/progs.h @@ -24,7 +24,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define _PROGS_H #include "pr_comp.h" // defs shared with qcc -#include "progdefs.h" // generated by program cdefs +#ifdef UQUAKE +#include "../uquake/progdefs.h" // generated by program cdefs +#elif defined(QUAKEWORLD) +#include "../qw_server/progdefs.h" // generated by program cdefs +#endif typedef union eval_s { diff --git a/uquake/world.c b/common/world.c similarity index 90% rename from uquake/world.c rename to common/world.c index 959bcd1..5d3e571 100644 --- a/uquake/world.c +++ b/common/world.c @@ -1,6 +1,8 @@ /* world.c - world query functions Copyright (C) 1996-1997 Id Software, Inc. +Copyright (C) 1999,2000 contributors of the QuakeForge project +Please see the file "AUTHORS" for a list of contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -19,13 +21,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifdef SERVERONLY +#include "qwsvdef.h" +#endif #include #include #include #include #include #include -#include +#include #include /* @@ -144,12 +149,12 @@ hull_t *SV_HullForEntity (edict_t *ent, vec3_t mins, vec3_t maxs, vec3_t offset) if (ent->v.solid == SOLID_BSP) { // explicit hulls in the BSP model if (ent->v.movetype != MOVETYPE_PUSH) - Sys_Error ("SOLID_BSP without MOVETYPE_PUSH"); + SV_Error ("SOLID_BSP without MOVETYPE_PUSH"); model = sv.models[ (int)ent->v.modelindex ]; if (!model || model->type != mod_brush) - Sys_Error ("MOVETYPE_PUSH with a non bsp model"); + SV_Error ("MOVETYPE_PUSH with a non bsp model"); VectorSubtract (maxs, mins, size); if (size[0] < 3) @@ -185,20 +190,9 @@ ENTITY AREA CHECKING =============================================================================== */ -typedef struct areanode_s -{ - int axis; // -1 = leaf node - float dist; - struct areanode_s *children[2]; - link_t trigger_edicts; - link_t solid_edicts; -} areanode_t; -#define AREA_DEPTH 4 -#define AREA_NODES 32 - -static areanode_t sv_areanodes[AREA_NODES]; -static int sv_numareanodes; +areanode_t sv_areanodes[AREA_NODES]; +int sv_numareanodes; /* =============== @@ -303,6 +297,7 @@ void SV_TouchLinks ( edict_t *ent, areanode_t *node ) || ent->v.absmax[1] < touch->v.absmin[1] || ent->v.absmax[2] < touch->v.absmin[2] ) continue; + old_self = pr_global_struct->self; old_other = pr_global_struct->other; @@ -390,6 +385,10 @@ void SV_LinkEdict (edict_t *ent, qboolean touch_triggers) return; // set the abs box +#ifdef QUAKEWORLD + VectorAdd (ent->v.origin, ent->v.mins, ent->v.absmin); + VectorAdd (ent->v.origin, ent->v.maxs, ent->v.absmax); +#else #ifdef QUAKE2 if (ent->v.solid == SOLID_BSP && @@ -420,6 +419,7 @@ void SV_LinkEdict (edict_t *ent, qboolean touch_triggers) VectorAdd (ent->v.origin, ent->v.mins, ent->v.absmin); VectorAdd (ent->v.origin, ent->v.maxs, ent->v.absmax); } +#endif // // to make items easier to pick up and allow them to be grabbed off @@ -504,7 +504,7 @@ int SV_HullPointContents (hull_t *hull, int num, vec3_t p) while (num >= 0) { if (num < hull->firstclipnode || num > hull->lastclipnode) - Sys_Error ("SV_HullPointContents: bad node number"); + SV_Error ("SV_HullPointContents: bad node number"); node = hull->clipnodes + num; plane = hull->planes + node->planenum; @@ -552,6 +552,9 @@ int SV_TruePointContents (vec3_t p) ============ SV_TestEntityPosition +A small wrapper around SV_BoxInSolidEntity that never clips against the +supplied entity. + This could be a lot more efficient... ============ */ @@ -567,7 +570,6 @@ edict_t *SV_TestEntityPosition (edict_t *ent) return NULL; } - /* =============================================================================== @@ -613,7 +615,7 @@ qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec } if (num < hull->firstclipnode || num > hull->lastclipnode) - Sys_Error ("SV_RecursiveHullCheck: bad node number"); + SV_Error ("SV_RecursiveHullCheck: bad node number"); // // find the point distances @@ -664,14 +666,14 @@ qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec if (!SV_RecursiveHullCheck (hull, node->children[side], p1f, midf, p1, mid, trace) ) return false; -//#ifdef PARANOID -// if (SV_HullPointContents (sv_hullmodel, mid, node->children[side]) -// == CONTENTS_SOLID) -// { -// Con_Printf ("mid PointInHullSolid\n"); -// return false; -// } -//#endif +#ifdef PARANOID + if (SV_HullPointContents (sv_hullmodel, mid, node->children[side]) + == CONTENTS_SOLID) + { + Con_Printf ("mid PointInHullSolid\n"); + return false; + } +#endif if (SV_HullPointContents (hull, node->children[side^1], mid) != CONTENTS_SOLID) @@ -703,7 +705,7 @@ qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec { trace->fraction = midf; VectorCopy (mid, trace->endpos); - Con_DPrintf ("backup past 0\n"); + Con_Printf ("backup past 0\n"); return false; } midf = p1f + (p2f - p1f)*frac; @@ -834,7 +836,7 @@ void SV_ClipToLinks ( areanode_t *node, moveclip_t *clip ) if (touch == clip->passedict) continue; if (touch->v.solid == SOLID_TRIGGER) - Sys_Error ("Trigger in clipping list"); + SV_Error ("Trigger in clipping list"); if (clip->type == MOVE_NOMONSTERS && touch->v.solid != SOLID_BSP) continue; @@ -967,3 +969,63 @@ trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, e return clip.trace; } +//============================================================================= + +/* +============ +SV_TestPlayerPosition + +============ +*/ +edict_t *SV_TestPlayerPosition (edict_t *ent, vec3_t origin) +{ + hull_t *hull; + edict_t *check; + vec3_t boxmins, boxmaxs; + vec3_t offset; + int e; + +// check world first + hull = &sv.worldmodel->hulls[1]; + if ( SV_HullPointContents (hull, hull->firstclipnode, origin) != CONTENTS_EMPTY ) + return sv.edicts; + +// check all entities + VectorAdd (origin, ent->v.mins, boxmins); + VectorAdd (origin, ent->v.maxs, boxmaxs); + + check = NEXT_EDICT(sv.edicts); + for (e=1 ; efree) + continue; + if (check->v.solid != SOLID_BSP && + check->v.solid != SOLID_BBOX && + check->v.solid != SOLID_SLIDEBOX) + continue; + + if (boxmins[0] > check->v.absmax[0] + || boxmins[1] > check->v.absmax[1] + || boxmins[2] > check->v.absmax[2] + || boxmaxs[0] < check->v.absmin[0] + || boxmaxs[1] < check->v.absmin[1] + || boxmaxs[2] < check->v.absmin[2] ) + continue; + + if (check == ent) + continue; + + // get the clipping hull + hull = SV_HullForEntity (check, ent->v.mins, ent->v.maxs, offset); + + VectorSubtract (origin, offset, offset); + + // test the point + if ( SV_HullPointContents (hull, hull->firstclipnode, offset) != CONTENTS_EMPTY ) + return check; + } + + return NULL; +} + + diff --git a/qw_server/world.h b/common/world.h similarity index 89% rename from qw_server/world.h rename to common/world.h index f0419ca..d5e7e6b 100644 --- a/qw_server/world.h +++ b/common/world.h @@ -1,4 +1,5 @@ /* +world.h Copyright (C) 1996-1997 Id Software, Inc. Copyright (C) 1999,2000 contributors of the QuakeForge project Please see the file "AUTHORS" for a list of contributors @@ -19,7 +20,12 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// world.h + +#ifndef _WORLD_H +#define _WORLD_H + +#include +#include typedef struct { @@ -73,8 +79,10 @@ void SV_LinkEdict (edict_t *ent, qboolean touch_triggers); // if touchtriggers, calls prog functions for the intersected triggers int SV_PointContents (vec3_t p); +int SV_TruePointContents (vec3_t p); // returns the CONTENTS_* value from the world at the given point. // does not check any entities at all +// the non-true version remaps the water current contents to content_water edict_t *SV_TestEntityPosition (edict_t *ent); @@ -91,5 +99,8 @@ 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) +qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1, vec3_t p2, trace_t *trace); edict_t *SV_TestPlayerPosition (edict_t *ent, vec3_t origin); + +#endif // _WORLD_H diff --git a/qw_client/Makefile.in b/qw_client/Makefile.in index 14c0764..8cbc89d 100644 --- a/qw_client/Makefile.in +++ b/qw_client/Makefile.in @@ -163,7 +163,7 @@ SW_REND_SRC = screen.c $(SWREND_SRC_PLAT) draw.c \ # Client source files CL_SRC = cl_demo.c cl_input.c cl_main.c cl_parse.c cl_tent.c -QW_CL_SRC = cl_cam.c cl_ents.c cl_pred.c host.c +QW_CL_SRC = cl_cam.c cl_ents.c cl_pred.c host.c world.c CL_GUI_SRC= console.c sbar.c view.c keys.c menu.c # Server source files diff --git a/qw_server/server.h b/qw_server/server.h index e3f6616..829486a 100644 --- a/qw_server/server.h +++ b/qw_server/server.h @@ -266,61 +266,6 @@ typedef struct #define HEARTBEAT_SECONDS 3 #define MAX_BEATCOUNT 100 // 5 Minutes -// edict->movetype values -#define MOVETYPE_NONE 0 // never moves -#define MOVETYPE_ANGLENOCLIP 1 -#define MOVETYPE_ANGLECLIP 2 -#define MOVETYPE_WALK 3 // gravity -#define MOVETYPE_STEP 4 // gravity, special edge handling -#define MOVETYPE_FLY 5 -#define MOVETYPE_TOSS 6 // gravity -#define MOVETYPE_PUSH 7 // no clip to world, push and crush -#define MOVETYPE_NOCLIP 8 -#define MOVETYPE_FLYMISSILE 9 // extra size to monsters -#define MOVETYPE_BOUNCE 10 - -// edict->solid values -#define SOLID_NOT 0 // no interaction with other objects -#define SOLID_TRIGGER 1 // touch on edge, but not blocking -#define SOLID_BBOX 2 // touch on edge, block -#define SOLID_SLIDEBOX 3 // touch on edge, but not an onground -#define SOLID_BSP 4 // bsp clip, touch on edge, block - -// edict->deadflag values -#define DEAD_NO 0 -#define DEAD_DYING 1 -#define DEAD_DEAD 2 - -#define DAMAGE_NO 0 -#define DAMAGE_YES 1 -#define DAMAGE_AIM 2 - -// edict->flags -#define FL_FLY 1 -#define FL_SWIM 2 -#define FL_GLIMPSE 4 -#define FL_CLIENT 8 -#define FL_INWATER 16 -#define FL_MONSTER 32 -#define FL_GODMODE 64 -#define FL_NOTARGET 128 -#define FL_ITEM 256 -#define FL_ONGROUND 512 -#define FL_PARTIALGROUND 1024 // not all corners are valid -#define FL_WATERJUMP 2048 // player jumping out of water - -// entity effects - -//define EF_BRIGHTFIELD 1 -//define EF_MUZZLEFLASH 2 -#define EF_BRIGHTLIGHT 4 -#define EF_DIMLIGHT 8 - - -#define SPAWNFLAG_NOT_EASY 256 -#define SPAWNFLAG_NOT_MEDIUM 512 -#define SPAWNFLAG_NOT_HARD 1024 -#define SPAWNFLAG_NOT_DEATHMATCH 2048 #define MULTICAST_ALL 0 #define MULTICAST_PHS 1 diff --git a/qw_server/world.c b/qw_server/world.c deleted file mode 100644 index dc427d7..0000000 --- a/qw_server/world.c +++ /dev/null @@ -1,926 +0,0 @@ -/* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ -// world.c -- world query functions - -#include "qwsvdef.h" - -/* - -entities never clip against themselves, or their owner - -line of sight checks trace->crosscontent, but bullets don't - -*/ - - -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 - float *start, *end; - trace_t trace; - int type; - edict_t *passedict; -} moveclip_t; - - -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) -{ - int i; - int side; - - box_hull.clipnodes = box_clipnodes; - box_hull.planes = box_planes; - box_hull.firstclipnode = 0; - box_hull.lastclipnode = 5; - - for (i=0 ; i<6 ; i++) - { - box_clipnodes[i].planenum = i; - - side = i&1; - - box_clipnodes[i].children[side] = CONTENTS_EMPTY; - if (i != 5) - box_clipnodes[i].children[side^1] = i + 1; - else - box_clipnodes[i].children[side^1] = CONTENTS_SOLID; - - box_planes[i].type = i>>1; - box_planes[i].normal[i>>1] = 1; - } - -} - - -/* -=================== -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) -{ - box_planes[0].dist = maxs[0]; - box_planes[1].dist = mins[0]; - box_planes[2].dist = maxs[1]; - box_planes[3].dist = mins[1]; - box_planes[4].dist = maxs[2]; - box_planes[5].dist = mins[2]; - - return &box_hull; -} - - - -/* -================ -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. -================ -*/ -hull_t *SV_HullForEntity (edict_t *ent, vec3_t mins, vec3_t maxs, vec3_t offset) -{ - model_t *model; - vec3_t size; - vec3_t hullmins, hullmaxs; - hull_t *hull; - -// decide which clipping hull to use, based on the size - if (ent->v.solid == SOLID_BSP) - { // explicit hulls in the BSP model - if (ent->v.movetype != MOVETYPE_PUSH) - SV_Error ("SOLID_BSP without MOVETYPE_PUSH"); - - model = sv.models[ (int)ent->v.modelindex ]; - - if (!model || model->type != mod_brush) - SV_Error ("MOVETYPE_PUSH with a non bsp model"); - - VectorSubtract (maxs, mins, size); - if (size[0] < 3) - hull = &model->hulls[0]; - else if (size[0] <= 32) - hull = &model->hulls[1]; - else - hull = &model->hulls[2]; - -// calculate an offset value to center the origin - VectorSubtract (hull->clip_mins, mins, offset); - VectorAdd (offset, ent->v.origin, offset); - } - else - { // create a temp hull from bounding box sizes - - VectorSubtract (ent->v.mins, maxs, hullmins); - VectorSubtract (ent->v.maxs, mins, hullmaxs); - hull = SV_HullForBox (hullmins, hullmaxs); - - VectorCopy (ent->v.origin, 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) -{ - areanode_t *anode; - vec3_t size; - vec3_t mins1, maxs1, mins2, maxs2; - - anode = &sv_areanodes[sv_numareanodes]; - sv_numareanodes++; - - ClearLink (&anode->trigger_edicts); - ClearLink (&anode->solid_edicts); - - if (depth == AREA_DEPTH) - { - anode->axis = -1; - anode->children[0] = anode->children[1] = NULL; - return anode; - } - - VectorSubtract (maxs, mins, size); - if (size[0] > size[1]) - anode->axis = 0; - else - anode->axis = 1; - - anode->dist = 0.5 * (maxs[anode->axis] + mins[anode->axis]); - VectorCopy (mins, mins1); - VectorCopy (mins, mins2); - VectorCopy (maxs, maxs1); - VectorCopy (maxs, maxs2); - - maxs1[anode->axis] = mins2[anode->axis] = anode->dist; - - anode->children[0] = SV_CreateAreaNode (depth+1, mins2, maxs2); - anode->children[1] = SV_CreateAreaNode (depth+1, mins1, maxs1); - - return anode; -} - -/* -=============== -SV_ClearWorld - -=============== -*/ -void SV_ClearWorld (void) -{ - SV_InitBoxHull (); - - memset (sv_areanodes, 0, sizeof(sv_areanodes)); - sv_numareanodes = 0; - SV_CreateAreaNode (0, sv.worldmodel->mins, sv.worldmodel->maxs); -} - - -/* -=============== -SV_UnlinkEdict - -=============== -*/ -void SV_UnlinkEdict (edict_t *ent) -{ - if (!ent->area.prev) - return; // not linked in anywhere - RemoveLink (&ent->area); - ent->area.prev = ent->area.next = NULL; -} - - -/* -==================== -SV_TouchLinks -==================== -*/ -void SV_TouchLinks ( edict_t *ent, areanode_t *node ) -{ - link_t *l, *next; - edict_t *touch; - int old_self, old_other; - -// touch linked edicts - for (l = node->trigger_edicts.next ; l != &node->trigger_edicts ; l = next) - { - next = l->next; - touch = EDICT_FROM_AREA(l); - if (touch == ent) - continue; - if (!touch->v.touch || touch->v.solid != SOLID_TRIGGER) - continue; - if (ent->v.absmin[0] > touch->v.absmax[0] - || ent->v.absmin[1] > touch->v.absmax[1] - || ent->v.absmin[2] > touch->v.absmax[2] - || ent->v.absmax[0] < touch->v.absmin[0] - || ent->v.absmax[1] < touch->v.absmin[1] - || ent->v.absmax[2] < touch->v.absmin[2] ) - continue; - - old_self = pr_global_struct->self; - old_other = pr_global_struct->other; - - pr_global_struct->self = EDICT_TO_PROG(touch); - pr_global_struct->other = EDICT_TO_PROG(ent); - pr_global_struct->time = sv.time; - PR_ExecuteProgram (touch->v.touch); - - pr_global_struct->self = old_self; - pr_global_struct->other = old_other; - } - -// recurse down both sides - if (node->axis == -1) - return; - - if ( ent->v.absmax[node->axis] > node->dist ) - SV_TouchLinks ( ent, node->children[0] ); - if ( ent->v.absmin[node->axis] < node->dist ) - SV_TouchLinks ( ent, node->children[1] ); -} - - -/* -=============== -SV_FindTouchedLeafs - -=============== -*/ -void SV_FindTouchedLeafs (edict_t *ent, mnode_t *node) -{ - mplane_t *splitplane; - mleaf_t *leaf; - int sides; - int leafnum; - - if (node->contents == CONTENTS_SOLID) - return; - -// add an efrag if the node is a leaf - - if ( node->contents < 0) - { - if (ent->num_leafs == MAX_ENT_LEAFS) - return; - - leaf = (mleaf_t *)node; - leafnum = leaf - sv.worldmodel->leafs - 1; - - ent->leafnums[ent->num_leafs] = leafnum; - ent->num_leafs++; - return; - } - -// NODE_MIXED - - splitplane = node->plane; - sides = BOX_ON_PLANE_SIDE(ent->v.absmin, ent->v.absmax, splitplane); - -// recurse down the contacted sides - if (sides & 1) - SV_FindTouchedLeafs (ent, node->children[0]); - - if (sides & 2) - SV_FindTouchedLeafs (ent, node->children[1]); -} - -/* -=============== -SV_LinkEdict - -=============== -*/ -void SV_LinkEdict (edict_t *ent, qboolean touch_triggers) -{ - areanode_t *node; - - if (ent->area.prev) - SV_UnlinkEdict (ent); // unlink from old position - - if (ent == sv.edicts) - return; // don't add the world - - if (ent->free) - return; - -// set the abs box - VectorAdd (ent->v.origin, ent->v.mins, ent->v.absmin); - VectorAdd (ent->v.origin, ent->v.maxs, ent->v.absmax); - -// -// to make items easier to pick up and allow them to be grabbed off -// of shelves, the abs sizes are expanded -// - if ((int)ent->v.flags & FL_ITEM) - { - ent->v.absmin[0] -= 15; - ent->v.absmin[1] -= 15; - ent->v.absmax[0] += 15; - ent->v.absmax[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 - ent->v.absmin[0] -= 1; - ent->v.absmin[1] -= 1; - ent->v.absmin[2] -= 1; - ent->v.absmax[0] += 1; - ent->v.absmax[1] += 1; - ent->v.absmax[2] += 1; - } - -// link to PVS leafs - ent->num_leafs = 0; - if (ent->v.modelindex) - SV_FindTouchedLeafs (ent, sv.worldmodel->nodes); - - if (ent->v.solid == SOLID_NOT) - return; - -// find the first node that the ent's box crosses - node = sv_areanodes; - while (1) - { - if (node->axis == -1) - break; - if (ent->v.absmin[node->axis] > node->dist) - node = node->children[0]; - else if (ent->v.absmax[node->axis] < node->dist) - node = node->children[1]; - else - break; // crosses the node - } - -// link it in - - if (ent->v.solid == SOLID_TRIGGER) - InsertLinkBefore (&ent->area, &node->trigger_edicts); - else - InsertLinkBefore (&ent->area, &node->solid_edicts); - -// if touch_triggers, touch all entities at this node and decend for more - if (touch_triggers) - SV_TouchLinks ( ent, sv_areanodes ); -} - - - -/* -=============================================================================== - -POINT TESTING IN HULLS - -=============================================================================== -*/ - -#if !id386 - -/* -================== -SV_HullPointContents - -================== -*/ -int SV_HullPointContents (hull_t *hull, int num, vec3_t p) -{ - float d; - dclipnode_t *node; - mplane_t *plane; - - while (num >= 0) - { - if (num < hull->firstclipnode || num > hull->lastclipnode) - SV_Error ("SV_HullPointContents: bad node number"); - - node = hull->clipnodes + num; - plane = hull->planes + node->planenum; - - if (plane->type < 3) - d = p[plane->type] - plane->dist; - else - d = DotProduct (plane->normal, p) - plane->dist; - if (d < 0) - num = node->children[1]; - else - num = node->children[0]; - } - - return num; -} - -#endif // !id386 - - -/* -================== -SV_PointContents - -================== -*/ -int SV_PointContents (vec3_t p) -{ - return SV_HullPointContents (&sv.worldmodel->hulls[0], 0, p); -} - -//=========================================================================== - -/* -============ -SV_TestEntityPosition - -A small wrapper around SV_BoxInSolidEntity that never clips against the -supplied entity. -============ -*/ -edict_t *SV_TestEntityPosition (edict_t *ent) -{ - trace_t trace; - - trace = SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, ent->v.origin, 0, ent); - - if (trace.startsolid) - return sv.edicts; - - return NULL; -} - -/* -=============================================================================== - -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) -{ - dclipnode_t *node; - mplane_t *plane; - float t1, t2; - float frac; - int i; - vec3_t mid; - int side; - float midf; - -// check for empty - if (num < 0) - { - if (num != CONTENTS_SOLID) - { - trace->allsolid = false; - if (num == CONTENTS_EMPTY) - trace->inopen = true; - else - trace->inwater = true; - } - else - trace->startsolid = true; - return true; // empty - } - - 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; - - if (plane->type < 3) - { - t1 = p1[plane->type] - plane->dist; - t2 = p2[plane->type] - plane->dist; - } - else - { - t1 = DotProduct (plane->normal, p1) - plane->dist; - t2 = DotProduct (plane->normal, p2) - plane->dist; - } - -#if 1 - if (t1 >= 0 && t2 >= 0) - 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); -#else - if ( (t1 >= DIST_EPSILON && t2 >= DIST_EPSILON) || (t2 > t1 && t1 >= 0) ) - 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); -#endif - -// put the crosspoint DIST_EPSILON pixels on the near side - if (t1 < 0) - frac = (t1 + DIST_EPSILON)/(t1-t2); - else - frac = (t1 - DIST_EPSILON)/(t1-t2); - if (frac < 0) - frac = 0; - if (frac > 1) - frac = 1; - - midf = p1f + (p2f - p1f)*frac; - for (i=0 ; i<3 ; i++) - mid[i] = p1[i] + frac*(p2[i] - p1[i]); - - side = (t1 < 0); - -// move up to the node - if (!SV_RecursiveHullCheck (hull, node->children[side], p1f, midf, p1, mid, trace) ) - return false; - -#ifdef PARANOID - if (SV_HullPointContents (sv_hullmodel, mid, node->children[side]) - == CONTENTS_SOLID) - { - Con_Printf ("mid PointInHullSolid\n"); - return false; - } -#endif - - 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); - - 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; - } - else - { - VectorSubtract (vec3_origin, plane->normal, trace->plane.normal); - trace->plane.dist = -plane->dist; - } - - while (SV_HullPointContents (hull, hull->firstclipnode, mid) - == CONTENTS_SOLID) - { // shouldn't really happen, but does occasionally - frac -= 0.1; - if (frac < 0) - { - trace->fraction = midf; - VectorCopy (mid, trace->endpos); - Con_Printf ("backup past 0\n"); - return false; - } - midf = p1f + (p2f - p1f)*frac; - for (i=0 ; i<3 ; i++) - mid[i] = p1[i] + frac*(p2[i] - p1[i]); - } - - trace->fraction = midf; - VectorCopy (mid, trace->endpos); - - return false; -} - - -/* -================== -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, vec3_t end) -{ - trace_t trace; - vec3_t offset; - vec3_t start_l, end_l; - hull_t *hull; - -// fill in a default trace - memset (&trace, 0, sizeof(trace_t)); - trace.fraction = 1; - trace.allsolid = true; - VectorCopy (end, trace.endpos); - -// get the clipping hull - hull = SV_HullForEntity (ent, mins, maxs, offset); - - VectorSubtract (start, offset, start_l); - VectorSubtract (end, offset, end_l); - -// trace a line through the apropriate clipping hull - SV_RecursiveHullCheck (hull, hull->firstclipnode, 0, 1, start_l, end_l, &trace); - -// fix trace up by the offset - if (trace.fraction != 1) - VectorAdd (trace.endpos, offset, trace.endpos); - -// did we clip the move? - if (trace.fraction < 1 || trace.startsolid ) - trace.ent = ent; - - return trace; -} - -//=========================================================================== - -/* -==================== -SV_ClipToLinks - -Mins and maxs enclose the entire area swept by the move -==================== -*/ -void SV_ClipToLinks ( areanode_t *node, moveclip_t *clip ) -{ - link_t *l, *next; - edict_t *touch; - trace_t trace; - -// touch linked edicts - for (l = node->solid_edicts.next ; l != &node->solid_edicts ; l = next) - { - next = l->next; - touch = EDICT_FROM_AREA(l); - if (touch->v.solid == SOLID_NOT) - continue; - if (touch == clip->passedict) - continue; - if (touch->v.solid == SOLID_TRIGGER) - SV_Error ("Trigger in clipping list"); - - if (clip->type == MOVE_NOMONSTERS && touch->v.solid != SOLID_BSP) - continue; - - if (clip->boxmins[0] > touch->v.absmax[0] - || clip->boxmins[1] > touch->v.absmax[1] - || clip->boxmins[2] > touch->v.absmax[2] - || clip->boxmaxs[0] < touch->v.absmin[0] - || clip->boxmaxs[1] < touch->v.absmin[1] - || clip->boxmaxs[2] < touch->v.absmin[2] ) - continue; - - if (clip->passedict && clip->passedict->v.size[0] && !touch->v.size[0]) - continue; // points never interact - - // might intersect, so do an exact clip - if (clip->trace.allsolid) - return; - if (clip->passedict) - { - if (PROG_TO_EDICT(touch->v.owner) == clip->passedict) - continue; // don't clip against own missiles - if (PROG_TO_EDICT(clip->passedict->v.owner) == touch) - continue; // don't clip against owner - } - - if ((int)touch->v.flags & FL_MONSTER) - 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); - if (trace.allsolid || trace.startsolid || - trace.fraction < clip->trace.fraction) - { - trace.ent = touch; - if (clip->trace.startsolid) - { - clip->trace = trace; - clip->trace.startsolid = true; - } - else - clip->trace = trace; - } - else if (trace.startsolid) - clip->trace.startsolid = true; - } - -// recurse down both sides - if (node->axis == -1) - return; - - if ( clip->boxmaxs[node->axis] > node->dist ) - SV_ClipToLinks ( node->children[0], clip ); - if ( clip->boxmins[node->axis] < node->dist ) - SV_ClipToLinks ( node->children[1], clip ); -} - - -/* -================== -SV_MoveBounds -================== -*/ -void SV_MoveBounds (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, vec3_t boxmins, vec3_t boxmaxs) -{ -#if 0 -// debug to test against everything -boxmins[0] = boxmins[1] = boxmins[2] = -9999; -boxmaxs[0] = boxmaxs[1] = boxmaxs[2] = 9999; -#else - int i; - - for (i=0 ; i<3 ; i++) - { - if (end[i] > start[i]) - { - boxmins[i] = start[i] + mins[i] - 1; - boxmaxs[i] = end[i] + maxs[i] + 1; - } - else - { - boxmins[i] = end[i] + mins[i] - 1; - boxmaxs[i] = start[i] + maxs[i] + 1; - } - } -#endif -} - -/* -================== -SV_Move -================== -*/ -trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, edict_t *passedict) -{ - moveclip_t clip; - int i; - - memset ( &clip, 0, sizeof ( moveclip_t ) ); - -// clip to world - clip.trace = SV_ClipMoveToEntity ( sv.edicts, start, mins, maxs, end ); - - clip.start = start; - clip.end = end; - clip.mins = mins; - clip.maxs = maxs; - clip.type = type; - clip.passedict = passedict; - - if (type == MOVE_MISSILE) - { - for (i=0 ; i<3 ; i++) - { - clip.mins2[i] = -15; - clip.maxs2[i] = 15; - } - } - else - { - VectorCopy (mins, clip.mins2); - VectorCopy (maxs, clip.maxs2); - } - -// create the bounding box of the entire move - SV_MoveBounds ( start, clip.mins2, clip.maxs2, end, clip.boxmins, clip.boxmaxs ); - -// clip to entities - SV_ClipToLinks ( sv_areanodes, &clip ); - - return clip.trace; -} - -//============================================================================= - -/* -============ -SV_TestPlayerPosition - -============ -*/ -edict_t *SV_TestPlayerPosition (edict_t *ent, vec3_t origin) -{ - hull_t *hull; - edict_t *check; - vec3_t boxmins, boxmaxs; - vec3_t offset; - int e; - -// check world first - hull = &sv.worldmodel->hulls[1]; - if ( SV_HullPointContents (hull, hull->firstclipnode, origin) != CONTENTS_EMPTY ) - return sv.edicts; - -// check all entities - VectorAdd (origin, ent->v.mins, boxmins); - VectorAdd (origin, ent->v.maxs, boxmaxs); - - check = NEXT_EDICT(sv.edicts); - for (e=1 ; efree) - continue; - if (check->v.solid != SOLID_BSP && - check->v.solid != SOLID_BBOX && - check->v.solid != SOLID_SLIDEBOX) - continue; - - if (boxmins[0] > check->v.absmax[0] - || boxmins[1] > check->v.absmax[1] - || boxmins[2] > check->v.absmax[2] - || boxmaxs[0] < check->v.absmin[0] - || boxmaxs[1] < check->v.absmin[1] - || boxmaxs[2] < check->v.absmin[2] ) - continue; - - if (check == ent) - continue; - - // get the clipping hull - hull = SV_HullForEntity (check, ent->v.mins, ent->v.maxs, offset); - - VectorSubtract (origin, offset, offset); - - // test the point - if ( SV_HullPointContents (hull, hull->firstclipnode, offset) != CONTENTS_EMPTY ) - return check; - } - - return NULL; -} - - diff --git a/uquake/Makefile.in b/uquake/Makefile.in index 4e3847d..cde756c 100644 --- a/uquake/Makefile.in +++ b/uquake/Makefile.in @@ -199,7 +199,7 @@ CFLAGS += @CFLAGS@ $(OPTFLAGS) $(DEFS) -I. $(SRC_DIR_INC) \ -I$(COMMON_ODIR) -I$(COMMON_DIR) -DUQUAKE GENERAL_SRC = $(CL_COMMON_SRC) \ - $(SYS_SRC) chasecam.c world.c $(SRV_PR_SRC) \ + $(SYS_SRC) world.c $(SRV_PR_SRC) \ $(UQ_NET_SRC) $(UQ_SRV_SRC) \ $(UQ_GENERAL_SRC) $(UQ_SWREND_SRC_PLAT) diff --git a/uquake/server.h b/uquake/server.h index ace9325..a52fff9 100644 --- a/uquake/server.h +++ b/uquake/server.h @@ -118,76 +118,6 @@ typedef struct client_s //============================================================================= -// edict->movetype values -#define MOVETYPE_NONE 0 // never moves -#define MOVETYPE_ANGLENOCLIP 1 -#define MOVETYPE_ANGLECLIP 2 -#define MOVETYPE_WALK 3 // gravity -#define MOVETYPE_STEP 4 // gravity, special edge handling -#define MOVETYPE_FLY 5 -#define MOVETYPE_TOSS 6 // gravity -#define MOVETYPE_PUSH 7 // no clip to world, push and crush -#define MOVETYPE_NOCLIP 8 -#define MOVETYPE_FLYMISSILE 9 // extra size to monsters -#define MOVETYPE_BOUNCE 10 -#ifdef QUAKE2 -#define MOVETYPE_BOUNCEMISSILE 11 // bounce w/o gravity -#define MOVETYPE_FOLLOW 12 // track movement of aiment -#endif - -// edict->solid values -#define SOLID_NOT 0 // no interaction with other objects -#define SOLID_TRIGGER 1 // touch on edge, but not blocking -#define SOLID_BBOX 2 // touch on edge, block -#define SOLID_SLIDEBOX 3 // touch on edge, but not an onground -#define SOLID_BSP 4 // bsp clip, touch on edge, block - -// edict->deadflag values -#define DEAD_NO 0 -#define DEAD_DYING 1 -#define DEAD_DEAD 2 - -#define DAMAGE_NO 0 -#define DAMAGE_YES 1 -#define DAMAGE_AIM 2 - -// edict->flags -#define FL_FLY 1 -#define FL_SWIM 2 -//#define FL_GLIMPSE 4 -#define FL_CONVEYOR 4 -#define FL_CLIENT 8 -#define FL_INWATER 16 -#define FL_MONSTER 32 -#define FL_GODMODE 64 -#define FL_NOTARGET 128 -#define FL_ITEM 256 -#define FL_ONGROUND 512 -#define FL_PARTIALGROUND 1024 // not all corners are valid -#define FL_WATERJUMP 2048 // player jumping out of water -#define FL_JUMPRELEASED 4096 // for jump debouncing -#ifdef QUAKE2 -#define FL_FLASHLIGHT 8192 -#define FL_ARCHIVE_OVERRIDE 1048576 -#endif - -// entity effects - -#define EF_BRIGHTFIELD 1 -#define EF_MUZZLEFLASH 2 -#define EF_BRIGHTLIGHT 4 -#define EF_DIMLIGHT 8 -#ifdef QUAKE2 -#define EF_DARKLIGHT 16 -#define EF_DARKFIELD 32 -#define EF_LIGHT 64 -#define EF_NODRAW 128 -#endif - -#define SPAWNFLAG_NOT_EASY 256 -#define SPAWNFLAG_NOT_MEDIUM 512 -#define SPAWNFLAG_NOT_HARD 1024 -#define SPAWNFLAG_NOT_DEATHMATCH 2048 #ifdef QUAKE2 // server flags diff --git a/uquake/world.h b/uquake/world.h deleted file mode 100644 index d5a1550..0000000 --- a/uquake/world.h +++ /dev/null @@ -1,87 +0,0 @@ -/* -world.h -Copyright (C) 1996-1997 Id Software, Inc. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifndef _WORLD_H -#define _WORLD_H - -#include - -typedef struct -{ - vec3_t normal; - float dist; -} plane_t; - -typedef struct -{ - 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 -} trace_t; - - -#define MOVE_NORMAL 0 -#define MOVE_NOMONSTERS 1 -#define MOVE_MISSILE 2 - - -void SV_ClearWorld (void); -// called after the world model has been loaded, before linking any entities - -void SV_UnlinkEdict (edict_t *ent); -// call before removing an entity, and before trying to move one, -// so it doesn't clip against itself -// flags ent->v.modified - -void SV_LinkEdict (edict_t *ent, qboolean touch_triggers); -// Needs to be called any time an entity changes origin, mins, maxs, or solid -// flags ent->v.modified -// sets ent->v.absmin and ent->v.absmax -// if touchtriggers, calls prog functions for the intersected triggers - -int SV_PointContents (vec3_t p); -int SV_TruePointContents (vec3_t p); -// returns the CONTENTS_* value from the world at the given point. -// does not check any entities at all -// the non-true version remaps the water current contents to content_water - -edict_t *SV_TestEntityPosition (edict_t *ent); - -trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, edict_t *passedict); -// mins and maxs are reletive - -// if the entire move stays in a solid volume, trace.allsolid will be set - -// if the starting point is in a solid, it will be allowed to move out -// to an open area - -// nomonsters is used for line of sight or edge testing, where mosnters -// shouldn't be considered solid objects - -// passedict is explicitly excluded from clipping checks (normally NULL) - -qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1, vec3_t p2, trace_t *trace); - -#endif // _WORLD_H