fix D_IdentityRemap warnings
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1899 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
9620a98dc2
commit
ec34ee2e5e
4 changed files with 3 additions and 4 deletions
|
@ -2312,8 +2312,6 @@ entity_t *CL_NewTempEntity (void)
|
||||||
memset (ent, 0, sizeof(*ent));
|
memset (ent, 0, sizeof(*ent));
|
||||||
|
|
||||||
#ifdef SWQUAKE
|
#ifdef SWQUAKE
|
||||||
//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
|
|
||||||
ent->palremap = D_IdentityRemap();
|
ent->palremap = D_IdentityRemap();
|
||||||
#endif
|
#endif
|
||||||
#ifdef PEXT_SCALE
|
#ifdef PEXT_SCALE
|
||||||
|
|
|
@ -267,6 +267,7 @@ void D_DeleteSurfaceCache (void);
|
||||||
void D_InitCaches (void *buffer, int size);
|
void D_InitCaches (void *buffer, int size);
|
||||||
void R_SetVrect (vrect_t *pvrect, vrect_t *pvrectin, int lineadj);
|
void R_SetVrect (vrect_t *pvrect, vrect_t *pvrectin, int lineadj);
|
||||||
|
|
||||||
|
struct palremap_s *D_IdentityRemap(void);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -153,7 +153,7 @@ int palremapsize;
|
||||||
|
|
||||||
palremap_t *D_GetPaletteRemap(int red, int green, int blue, qboolean desaturate, qboolean fullbrights, int topcolor, int bottomcolor);
|
palremap_t *D_GetPaletteRemap(int red, int green, int blue, qboolean desaturate, qboolean fullbrights, int topcolor, int bottomcolor);
|
||||||
qbyte *D_GetMenuTintPal(void);
|
qbyte *D_GetMenuTintPal(void);
|
||||||
palremap_t *D_IdentityRemap(void);
|
struct palremap_s *D_IdentityRemap(void);
|
||||||
void D_DereferenceRemap(palremap_t *palremap);
|
void D_DereferenceRemap(palremap_t *palremap);
|
||||||
|
|
||||||
void D_InitTrans(void);
|
void D_InitTrans(void);
|
||||||
|
|
|
@ -464,7 +464,7 @@ qbyte *D_GetMenuTintPal(void)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
palremap_t *D_IdentityRemap(void) // TODO: explicitly inline this
|
struct palremap_s *D_IdentityRemap(void) // TODO: explicitly inline this
|
||||||
{
|
{
|
||||||
return palremaps;
|
return palremaps;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue