eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Added endifs, moved log.c declarations to common.h but kept SV_LogPlayer in server.h (is this ugly? probably)

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2579 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Molgrum 2007-08-07 14:41:23 +00:00
parent eadc9f6d6a
commit 273dedc28c
6 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/client/view.c
View file

@ -1347,7 +1347,9 @@ void R_DrawNameTags(void)
void V_RenderPlayerViews(int plnum) void V_RenderPlayerViews(int plnum)
{ {
#ifdef SIDEVIEWS
int viewnum; int viewnum;
#endif
SCR_VRectForPlayer(&r_refdef.vrect, plnum); SCR_VRectForPlayer(&r_refdef.vrect, plnum);
view_message = &view_frame->playerstate[cl.playernum[plnum]]; view_message = &view_frame->playerstate[cl.playernum[plnum]];
#ifdef NQPROT #ifdef NQPROT

14
engine/common/common.h
View file

@ -397,3 +397,17 @@ void TL_InitLanguages(void);
void T_FreeStrings(void); void T_FreeStrings(void);
char *T_GetString(int num); char *T_GetString(int num);
//
// log.c
//
typedef enum {
LOG_CONSOLE,
LOG_PLAYER,
LOG_TYPES
} logtype_t;
void Log_Dir_Callback (struct cvar_s *var, char *oldvalue);
void Log_Name_Callback (struct cvar_s *var, char *oldvalue);
void Log_String (logtype_t lognum, char *s);
void Con_Log (char *s);
void Log_Logfile_f (void);
void Log_Init(void);

2
engine/common/log.c
View file

@ -263,6 +263,7 @@ void Con_Log (char *s)
} }
#ifndef CLIENTONLY
//still to add stuff at: //still to add stuff at:
//connects //connects
//disconnects //disconnects
@ -278,6 +279,7 @@ void SV_LogPlayer(client_t *cl, char *msg)
Log_String(LOG_PLAYER, line); Log_String(LOG_PLAYER, line);
} }
#endif

4
engine/gl/gl_ppl.c
View file

@ -4914,15 +4914,17 @@ void GL_CheckTMUIs0(void);
void PPL_DrawWorld (void) void PPL_DrawWorld (void)
{ {
RSpeedLocals(); RSpeedLocals();
dlight_t *l;
#if 0 #if 0
dlight_t *lc, *furthestprev; dlight_t *lc, *furthestprev;
float furthest; float furthest;
#endif #endif
#ifdef PPL
dlight_t *l;
int i; int i;
int numlights; int numlights;
vec3_t mins, maxs; vec3_t mins, maxs;
#endif
int maxshadowlights = gl_maxshadowlights.value; int maxshadowlights = gl_maxshadowlights.value;

3
engine/gl/gl_rmain.c
View file

@ -491,9 +491,10 @@ void R_DrawSpriteModel (entity_t *e)
mspriteframe_t *frame; mspriteframe_t *frame;
vec3_t forward, right, up; vec3_t forward, right, up;
msprite_t *psprite; msprite_t *psprite;
qbyte coloursb[4];
#ifdef Q3SHADERS #ifdef Q3SHADERS
qbyte coloursb[4];
if (e->forcedshader) if (e->forcedshader)
{ {
meshbuffer_t mb; meshbuffer_t mb;

14
engine/server/server.h
View file

@ -1287,18 +1287,4 @@ typedef struct
} date_t; } date_t;
void SV_TimeOfDay(date_t *date); void SV_TimeOfDay(date_t *date);
//
// log.c
//
typedef enum {
LOG_CONSOLE,
LOG_PLAYER,
LOG_TYPES
} logtype_t;
void Log_Dir_Callback (struct cvar_s *var, char *oldvalue);
void Log_Name_Callback (struct cvar_s *var, char *oldvalue);
void Log_String (logtype_t lognum, char *s);
void Con_Log (char *s);
void SV_LogPlayer(client_t *cl, char *msg); void SV_LogPlayer(client_t *cl, char *msg);
void Log_Logfile_f (void);
void Log_Init(void);