diff --git a/engine/client/view.c b/engine/client/view.c index 8c53bc7d6..e2c49aca7 100644 --- a/engine/client/view.c +++ b/engine/client/view.c @@ -1347,7 +1347,9 @@ void R_DrawNameTags(void) void V_RenderPlayerViews(int plnum) { +#ifdef SIDEVIEWS int viewnum; +#endif SCR_VRectForPlayer(&r_refdef.vrect, plnum); view_message = &view_frame->playerstate[cl.playernum[plnum]]; #ifdef NQPROT diff --git a/engine/common/common.h b/engine/common/common.h index 48962f9d8..1fcec34af 100644 --- a/engine/common/common.h +++ b/engine/common/common.h @@ -397,3 +397,17 @@ void TL_InitLanguages(void); void T_FreeStrings(void); 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); diff --git a/engine/common/log.c b/engine/common/log.c index f6dcc91a1..3623a54f8 100644 --- a/engine/common/log.c +++ b/engine/common/log.c @@ -263,6 +263,7 @@ void Con_Log (char *s) } +#ifndef CLIENTONLY //still to add stuff at: //connects //disconnects @@ -278,6 +279,7 @@ void SV_LogPlayer(client_t *cl, char *msg) Log_String(LOG_PLAYER, line); } +#endif diff --git a/engine/gl/gl_ppl.c b/engine/gl/gl_ppl.c index cb4ada316..3343cff65 100644 --- a/engine/gl/gl_ppl.c +++ b/engine/gl/gl_ppl.c @@ -4914,15 +4914,17 @@ void GL_CheckTMUIs0(void); void PPL_DrawWorld (void) { RSpeedLocals(); - dlight_t *l; #if 0 dlight_t *lc, *furthestprev; float furthest; #endif +#ifdef PPL + dlight_t *l; int i; int numlights; vec3_t mins, maxs; +#endif int maxshadowlights = gl_maxshadowlights.value; diff --git a/engine/gl/gl_rmain.c b/engine/gl/gl_rmain.c index 22f4b338c..f2e69f5ef 100644 --- a/engine/gl/gl_rmain.c +++ b/engine/gl/gl_rmain.c @@ -491,9 +491,10 @@ void R_DrawSpriteModel (entity_t *e) mspriteframe_t *frame; vec3_t forward, right, up; msprite_t *psprite; - qbyte coloursb[4]; #ifdef Q3SHADERS + qbyte coloursb[4]; + if (e->forcedshader) { meshbuffer_t mb; diff --git a/engine/server/server.h b/engine/server/server.h index 15ee785ab..42e4f3b85 100644 --- a/engine/server/server.h +++ b/engine/server/server.h @@ -1287,18 +1287,4 @@ typedef struct } date_t; 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 Log_Logfile_f (void); -void Log_Init(void);