lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef

Browse source
This commit is contained in:
mazmazz 2018-09-11 15:57:58 -04:00
parent 3290104922 c920827032
commit c6dbf2e560
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_saveg.c
View file

@ -886,7 +886,7 @@ static void P_NetUnArchiveWorld(void)
else else
{ {
#endif #endif
exc = R_GetExistingColormapByValues(rgba, fadergba, fadestart, fadeend, fog); exc = R_GetColormapFromListByValues(rgba, fadergba, fadestart, fadeend, fog);
if (!exc) if (!exc)
{ {

18
src/r_data.c
View file

@ -1458,13 +1458,13 @@ boolean R_CheckDefaultColormapValues(extracolormap_t *extra_colormap, boolean ch
} }
// //
// R_GetExistingColormapByValues() // R_GetColormapFromListByValues()
// NOTE: Returns NULL if no match is found // NOTE: Returns NULL if no match is found
// //
#ifdef EXTRACOLORMAPLUMPS #ifdef EXTRACOLORMAPLUMPS
extracolormap_t *R_GetExistingColormapByValues(INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, boolean fog, lumpnum_t lump) extracolormap_t *R_GetColormapFromListByValues(INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, boolean fog, lumpnum_t lump)
#else #else
extracolormap_t *R_GetExistingColormapByValues(INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, boolean fog) extracolormap_t *R_GetColormapFromListByValues(INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, boolean fog)
#endif #endif
{ {
extracolormap_t *exc; extracolormap_t *exc;
@ -1492,12 +1492,12 @@ extracolormap_t *R_GetExistingColormapByValues(INT32 rgba, INT32 fadergba, UINT8
return NULL; return NULL;
} }
extracolormap_t *R_GetExistingColormap(extracolormap_t *extra_colormap) extracolormap_t *R_GetColormapFromList(extracolormap_t *extra_colormap)
{ {
#ifdef EXTRACOLORMAPLUMPS #ifdef EXTRACOLORMAPLUMPS
return R_GetExistingColormapByValues(extra_colormap->rgba, extra_colormap->fadergba, extra_colormap->fadestart, extra_colormap->fadeend, extra_colormap->fog, extra_colormap->lump); return R_GetColormapFromListByValues(extra_colormap->rgba, extra_colormap->fadergba, extra_colormap->fadestart, extra_colormap->fadeend, extra_colormap->fog, extra_colormap->lump);
else else
return R_GetExistingColormapByValues(extra_colormap->rgba, extra_colormap->fadergba, extra_colormap->fadestart, extra_colormap->fadeend, extra_colormap->fog); return R_GetColormapFromListByValues(extra_colormap->rgba, extra_colormap->fadergba, extra_colormap->fadestart, extra_colormap->fadeend, extra_colormap->fog);
#endif #endif
} }
@ -1511,7 +1511,7 @@ extracolormap_t *R_ColormapForName(char *name)
if (lump == LUMPERROR) if (lump == LUMPERROR)
I_Error("R_ColormapForName: Cannot find colormap lump %.8s\n", name); I_Error("R_ColormapForName: Cannot find colormap lump %.8s\n", name);
exc = R_GetExistingColormapByValues(0, 0x19000000, 0, 31, 0, lump); exc = R_GetColormapFromListByValues(0, 0x19000000, 0, 31, 0, lump);
if (exc) if (exc)
return exc; return exc;
@ -1809,9 +1809,9 @@ extracolormap_t *R_CreateColormap(char *p1, char *p2, char *p3)
// Look for existing colormaps // Look for existing colormaps
#ifdef EXTRACOLORMAPLUMPS #ifdef EXTRACOLORMAPLUMPS
exc = R_GetExistingColormapByValues(rgba, fadergba, fadestart, fadeend, fog, LUMPERROR); exc = R_GetColormapFromListByValues(rgba, fadergba, fadestart, fadeend, fog, LUMPERROR);
#else #else
exc = R_GetExistingColormapByValues(rgba, fadergba, fadestart, fadeend, fog); exc = R_GetColormapFromListByValues(rgba, fadergba, fadestart, fadeend, fog);
#endif #endif
if (exc) if (exc)
return exc; return exc;

5
src/r_data.h
View file

@ -111,10 +111,11 @@ extracolormap_t *R_CopyColormap(extracolormap_t *extra_colormap, boolean lightta
void R_AddColormapToList(extracolormap_t *extra_colormap); void R_AddColormapToList(extracolormap_t *extra_colormap);
boolean R_CheckDefaultColormapValues(extracolormap_t *extra_colormap, boolean checkrgba, boolean checkfadergba, boolean checkparams); boolean R_CheckDefaultColormapValues(extracolormap_t *extra_colormap, boolean checkrgba, boolean checkfadergba, boolean checkparams);
#ifdef EXTRACOLORMAPLUMPS #ifdef EXTRACOLORMAPLUMPS
extracolormap_t *R_GetExistingColormapByValues(INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, boolean fog, lumpnum_t lump); extracolormap_t *R_GetColormapFromListByValues(INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, boolean fog, lumpnum_t lump);
#else #else
extracolormap_t *R_GetExistingColormapByValues(INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, boolean fog); extracolormap_t *R_GetColormapFromListByValues(INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, boolean fog);
#endif #endif
extracolormap_t *R_GetColormapFromList(extracolormap_t *extra_colormap);
lighttable_t *R_CreateLightTable(extracolormap_t *extra_colormap); lighttable_t *R_CreateLightTable(extracolormap_t *extra_colormap);
extracolormap_t *R_CreateColormap(char *p1, char *p2, char *p3); extracolormap_t *R_CreateColormap(char *p1, char *p2, char *p3);
#ifdef EXTRACOLORMAPLUMPS #ifdef EXTRACOLORMAPLUMPS