diff --git a/codemp/icarus/icarus.h b/codemp/icarus/icarus.h index 845534b..26686ad 100644 --- a/codemp/icarus/icarus.h +++ b/codemp/icarus/icarus.h @@ -5,6 +5,9 @@ #ifndef __ICARUS__ #define __ICARUS__ +extern void *ICARUS_Malloc(int iSize); +extern void ICARUS_Free(void *pMem); + #include "../game/g_public.h" #pragma warning( disable : 4786 ) // identifier was truncated @@ -25,8 +28,4 @@ #pragma warning( pop ) //restore - -extern void *ICARUS_Malloc(int iSize); -extern void ICARUS_Free(void *pMem); - #endif //__ICARUS__ diff --git a/codemp/renderer/tr_image.cpp b/codemp/renderer/tr_image.cpp index 07abe3e..ddb1b22 100644 --- a/codemp/renderer/tr_image.cpp +++ b/codemp/renderer/tr_image.cpp @@ -2942,9 +2942,6 @@ SKINS ============================================================================ */ -static char *CommaParse( char **data_p ); -//can't be dec'd here since we need it for non-dedicated builds now as well. - /* =============== RE_RegisterSkin @@ -2955,9 +2952,10 @@ RE_RegisterSkin #endif // !DEDICATED bool gServerSkinHack = false; +static char *CommaParse( char **data_p ); +//can't be dec'd here since we need it for non-dedicated builds now as well. shader_t *R_FindServerShader( const char *name, const int *lightmapIndex, const byte *styles, qboolean mipRawImage ); -char *CommaParse( char **data_p ); /* =============== RE_SplitSkins