qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-22 20:02:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

A couple cl_ents functions removed from cl_main for uquake, we're close to

Browse source 
being able to link uquake again!  Reformatted the top of cl_ents
This commit is contained in:
Joseph Carter 2000-02-10 06:22:29 +00:00
parent aa720bf076
commit 44ec4f61d5
2 changed files with 10 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
common/cl_ents.c
View file

@ -1,4 +1,5 @@
/* /*
cl_ents.c - entity parsing and management
Copyright (C) 1996-1997 Id Software, Inc. Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999,2000 contributors of the QuakeForge project Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors Please see the file "AUTHORS" for a list of contributors
@ -19,17 +20,16 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// cl_ents.c -- entity parsing and management
#include "qtypes.h" #include <qtypes.h>
#include "quakedef.h" #include <quakedef.h>
#include "cvar.h" #include <cvar.h>
#include "client.h" #include <client.h>
#include "console.h" #include <console.h>
#include "mathlib.h" #include <mathlib.h>
#include "view.h" #include <view.h>
#include "cvars.h" #include <cvars.h>
#include "model.h" #include <model.h>
extern cvar_t cl_predict_players; extern cvar_t cl_predict_players;
extern cvar_t cl_predict_players2; extern cvar_t cl_predict_players2;

72
common/cl_main.c
View file

@ -193,51 +193,6 @@ char modellist_name[] = "modellist %i %i";
char soundlist_name[] = "soundlist %i %i"; char soundlist_name[] = "soundlist %i %i";
#ifdef UQUAKE
/*
===============
CL_AllocDlight
===============
*/
dlight_t *CL_AllocDlight (int key)
{
int i;
dlight_t *dl;
// first look for an exact key match
if (key)
{
dl = cl_dlights;
for (i=0 ; i<MAX_DLIGHTS ; i++, dl++)
{
if (dl->key == key)
{
memset (dl, 0, sizeof(*dl));
dl->key = key;
return dl;
}
}
}
// then look for anything else
dl = cl_dlights;
for (i=0 ; i<MAX_DLIGHTS ; i++, dl++)
{
if (dl->die < cl.time)
{
memset (dl, 0, sizeof(*dl));
dl->key = key;
return dl;
}
}
dl = &cl_dlights[0];
memset (dl, 0, sizeof(*dl));
dl->key = key;
return dl;
}
#endif
#ifdef QUAKEWORLD #ifdef QUAKEWORLD
void CL_BeginServerConnect(void) void CL_BeginServerConnect(void)
{ {
@ -563,33 +518,6 @@ void CL_ConnectionlessPacket (void)
} }
#endif #endif
#ifdef UQUAKE
/*
===============
CL_DecayLights
===============
*/
void CL_DecayLights (void)
{
int i;
dlight_t *dl;
float time;
time = cl.time - cl.oldtime;
dl = cl_dlights;
for (i=0 ; i<MAX_DLIGHTS ; i++, dl++)
{
if (dl->die < cl.time || !dl->radius)
continue;
dl->radius -= time*dl->decay;
if (dl->radius < 0)
dl->radius = 0;
}
}
#endif
/* /*
===================== =====================