qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2025-03-21 16:31:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

sufflin' shufflin' shuflin'.. raaw-source

Browse source 
qw-client now links, but qw-server won't compile (yet)
This commit is contained in:
Bill Currie 2000-02-11 04:21:10 +00:00
parent de1e542ead
commit ce9580f237
4 changed files with 32 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
common/world.c
View file

@ -65,7 +65,6 @@ HULL BOXES
===============================================================================
*/
static hull_t box_hull;
static dclipnode_t box_clipnodes[6];
static mplane_t box_planes[6];
@ -129,6 +128,7 @@ hull_t *SV_HullForBox (vec3_t mins, vec3_t maxs)
#ifdef SERVERONLY
/*
================
SV_HullForEntity
@ -182,6 +182,7 @@ hull_t *SV_HullForEntity (edict_t *ent, vec3_t mins, vec3_t maxs, vec3_t offset)
return hull;
}
#endif
/*
===============================================================================
@ -240,6 +241,7 @@ areanode_t *SV_CreateAreaNode (int depth, vec3_t mins, vec3_t maxs)
return anode;
}
#ifdef SERVERONLY
/*
===============
SV_ClearWorld
@ -254,7 +256,7 @@ void SV_ClearWorld (void)
sv_numareanodes = 0;
SV_CreateAreaNode (0, sv.worldmodel->mins, sv.worldmodel->maxs);
}
#endif
/*
===============
@ -270,7 +272,7 @@ void SV_UnlinkEdict (edict_t *ent)
ent->area.prev = ent->area.next = NULL;
}
#ifdef SERVERONLY
/*
====================
SV_TouchLinks
@ -321,7 +323,6 @@ void SV_TouchLinks ( edict_t *ent, areanode_t *node )
SV_TouchLinks ( ent, node->children[1] );
}
/*
===============
SV_FindTouchedLeafs
@ -478,7 +479,7 @@ void SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
SV_TouchLinks ( ent, sv_areanodes );
}
#endif
/*
===============================================================================
@ -525,7 +526,7 @@ int SV_HullPointContents (hull_t *hull, int num, vec3_t p)
#endif // !id386
#ifdef SERVERONLY
/*
==================
SV_PointContents
@ -546,9 +547,11 @@ int SV_TruePointContents (vec3_t p)
{
return SV_HullPointContents (&sv.worldmodel->hulls[0], 0, p);
}
#endif
//===========================================================================
#ifdef SERVERONLY
/*
============
SV_TestEntityPosition
@ -570,6 +573,7 @@ edict_t *SV_TestEntityPosition (edict_t *ent)
return NULL;
}
#endif
/*
===============================================================================
@ -615,8 +619,13 @@ qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec
return true; // empty
}
if (num < hull->firstclipnode || num > hull->lastclipnode)
if (num < hull->firstclipnode || num > hull->lastclipnode) {
#ifdef SERVERONLY
SV_Error ("SV_RecursiveHullCheck: bad node number");
#else
Sys_Error ("SV_RecursiveHullCheck: bad node number");
#endif
}
//
// find the point distances
@ -721,6 +730,7 @@ qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec
}
#ifdef SERVERONLY
/*
==================
SV_ClipMoveToEntity
@ -811,9 +821,11 @@ trace_t SV_ClipMoveToEntity (edict_t *ent, vec3_t start, vec3_t mins, vec3_t max
return trace;
}
#endif
//===========================================================================
#ifdef SERVERONLY
/*
====================
SV_ClipToLinks
@ -893,7 +905,7 @@ void SV_ClipToLinks ( areanode_t *node, moveclip_t *clip )
if ( clip->boxmins[node->axis] < node->dist )
SV_ClipToLinks ( node->children[1], clip );
}
#endif
/*
==================
@ -925,6 +937,7 @@ boxmaxs[0] = boxmaxs[1] = boxmaxs[2] = 9999;
#endif
}
#ifdef SERVERONLY
/*
==================
SV_Move
@ -1028,5 +1041,4 @@ edict_t *SV_TestPlayerPosition (edict_t *ent, vec3_t origin)
return NULL;
}
#endif

0
uquake/worlda.s → common/worlda.s
View file

2
qw_client/Makefile.in
View file

@ -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 world.c
QW_CL_SRC = cl_cam.c cl_ents.c cl_pred.c host.c world.c worlda.s
CL_GUI_SRC= console.c sbar.c view.c keys.c menu.c
# Server source files

11
qw_server/sv_main.c
View file

@ -22,12 +22,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <qwsvdef.h>
#ifdef HAVE_STRINGS_H
#include <strings.h>
#endif
#include <quakedef.h>
#include <qtypes.h>
#include <net.h>
#include <cmd.h>
#include <sys.h>
#include <console.h>
#include <protocol.h>
#include <server.h>
quakeparms_t host_parms;
qboolean host_initialized; // true if into command execution (compatability)