From 97f836b5ede234d05397218001f1b5d777b3e2e4 Mon Sep 17 00:00:00 2001 From: Spoike Date: Sun, 17 Sep 2006 02:42:18 +0000 Subject: [PATCH] Just fixing my errors before TimeServ moans some more. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2383 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/m_mp3.c | 2 ++ engine/common/gl_q2bsp.c | 2 +- engine/sw/r_light.c | 4 ++-- engine/sw/sw_model.c | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/engine/client/m_mp3.c b/engine/client/m_mp3.c index c2d2a8e1..18a4c185 100644 --- a/engine/client/m_mp3.c +++ b/engine/client/m_mp3.c @@ -1983,6 +1983,7 @@ void Media_Init(void) Cmd_AddCommand("music_rewind", Media_Rewind_f); Cmd_AddCommand("music_next", Media_Next_f); +#if defined(RGLQUAKE) Cmd_AddCommand("capture", Media_RecordFilm_f); Cmd_AddCommand("capturedemo", Media_RecordDemo_f); Cmd_AddCommand("capturestop", Media_StopRecordFilm_f); @@ -1992,6 +1993,7 @@ void Media_Init(void) Cvar_Register(&capturesound, "AVI capture controls"); Cvar_Register(&capturerate, "AVI capture controls"); Cvar_Register(&capturecodec, "AVI capture controls"); +#endif #if defined(WINAVI) Cvar_Register(&capturesoundbits, "AVI capture controls"); diff --git a/engine/common/gl_q2bsp.c b/engine/common/gl_q2bsp.c index 4523fe11..551cde78 100644 --- a/engine/common/gl_q2bsp.c +++ b/engine/common/gl_q2bsp.c @@ -3774,7 +3774,7 @@ qboolean Q2BSP_EdictInFatPVS(model_t *mod, edict_t *ent); void Q2BSP_FindTouchedLeafs(model_t *mod, edict_t *ent); #endif void GLQ2BSP_LightPointValues(model_t *mod, vec3_t point, vec3_t res_diffuse, vec3_t res_ambient, vec3_t res_dir); -void SWQ2BSP_LightPointValues(vec3_t point, vec3_t res_diffuse, vec3_t res_ambient, vec3_t res_dir); +void SWQ2BSP_LightPointValues(model_t *mod, vec3_t point, vec3_t res_diffuse, vec3_t res_ambient, vec3_t res_dir); /* ================== diff --git a/engine/sw/r_light.c b/engine/sw/r_light.c index 90c4a053..e96e4c1d 100644 --- a/engine/sw/r_light.c +++ b/engine/sw/r_light.c @@ -438,7 +438,7 @@ int SWR_LightPoint (vec3_t p) return r; } -void SWQ1BSP_LightPointValues(vec3_t point, vec3_t res_diffuse, vec3_t res_ambient, vec3_t res_dir) +void SWQ1BSP_LightPointValues(model_t *mod, vec3_t point, vec3_t res_diffuse, vec3_t res_ambient, vec3_t res_dir) { vec3_t end; float r; @@ -451,7 +451,7 @@ void SWQ1BSP_LightPointValues(vec3_t point, vec3_t res_diffuse, vec3_t res_ambie end[1] = point[1]; end[2] = point[2] - 2048; - r = SWRecursiveLightPoint3C(cl.worldmodel->nodes, point, end); + r = SWRecursiveLightPoint3C(mod->nodes, point, end); if (r < 0) { res_diffuse[0] = 0; diff --git a/engine/sw/sw_model.c b/engine/sw/sw_model.c index 9d983eb0..d913cf90 100644 --- a/engine/sw/sw_model.c +++ b/engine/sw/sw_model.c @@ -1969,7 +1969,7 @@ float RadiusFromBounds (vec3_t mins, vec3_t maxs); void Q1BSP_MarkLights (dlight_t *light, int bit, mnode_t *node); -void SWQ1BSP_LightPointValues(vec3_t point, vec3_t res_diffuse, vec3_t res_ambient, vec3_t res_dir); +void SWQ1BSP_LightPointValues(model_t *mod, vec3_t point, vec3_t res_diffuse, vec3_t res_ambient, vec3_t res_dir); void SWR_Q1BSP_StainNode (mnode_t *node, float *parms); /*