From f3f02e5353210e150e4ca44fae31b4d2938e6916 Mon Sep 17 00:00:00 2001 From: TimeServ Date: Sat, 28 Jan 2006 02:43:10 +0000 Subject: [PATCH] fix warning git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1900 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/gl/gl_alias.c | 8 +++----- engine/sw/r_main.c | 5 +---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/engine/gl/gl_alias.c b/engine/gl/gl_alias.c index 0ab42346d..cb41f8075 100644 --- a/engine/gl/gl_alias.c +++ b/engine/gl/gl_alias.c @@ -1502,7 +1502,9 @@ qboolean R_CullEntityBox(entity_t *e, vec3_t modmins, vec3_t modmaxs) return R_CullBox(wmin, wmax); } - +#ifdef Q3SHADERS +mfog_t *CM_FogForOrigin(vec3_t org); +#endif void R_DrawGAliasModel (entity_t *e) { extern cvar_t r_drawflat; @@ -1847,10 +1849,6 @@ void R_DrawGAliasModel (entity_t *e) } #ifdef Q3SHADERS - //if they're in different files it's probably just the compiler not knowing the return type when it reaches that line so it guesses int - //timeserv thinks we need a prototype (whatever that is) ~ Moodles - #pragma warning(disable:4047) - fog = CM_FogForOrigin(currententity->origin); #endif diff --git a/engine/sw/r_main.c b/engine/sw/r_main.c index eb2441d4b..fb8b12e16 100644 --- a/engine/sw/r_main.c +++ b/engine/sw/r_main.c @@ -549,6 +549,7 @@ void SWR_ViewChanged (vrect_t *pvrect, int lineadj, float aspect) R_MarkLeaves =============== */ +qbyte *SWMod_LeafPVS (model_t *model, mleaf_t *leaf, qbyte *buffer); void SWR_MarkLeaves (void) { qbyte *vis; @@ -620,10 +621,6 @@ void SWR_MarkLeaves (void) r_visframecount++; r_oldviewleaf = r_viewleaf; - //if they're in different files it's probably just the compiler not knowing the return type when it reaches that line so it guesses int - //timeserv thinks we need a prototype (whatever that is) ~ Moodles - #pragma warning(disable:4047) - vis = SWMod_LeafPVS (cl.worldmodel, r_viewleaf, NULL); for (i=0 ; inumleafs ; i++)