ioquake/jedi-academy
0
0
Fork 0
mirror of https://github.com/ioquake/jedi-academy.git synced 2025-02-16 17:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

shuffle some prototypes around to appease gcc

Browse source
This commit is contained in:
Jonathan Gray 2013-04-26 17:36:46 +10:00
parent 15cc54b440
commit defd14bd3c
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
codemp/icarus/icarus.h
View file

@ -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__

6
codemp/renderer/tr_image.cpp
View file

@ -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