stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-18 07:22:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
mazmazz 2018-09-12 11:14:52 -04:00
commit b120331151
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/p_saveg.c
View file

@ -476,6 +476,9 @@ static void P_NetUnArchivePlayers(void)
static void SaveExtraColormap(UINT8 *put, extracolormap_t *exc) static void SaveExtraColormap(UINT8 *put, extracolormap_t *exc)
{ {
if (!exc) // Just give it default values, we done goofed. (or sector->extra_colormap was intentionally set to default (NULL))
exc = R_GetDefaultColormap();
WRITEUINT8(put, exc->fadestart); WRITEUINT8(put, exc->fadestart);
WRITEUINT8(put, exc->fadeend); WRITEUINT8(put, exc->fadeend);
WRITEUINT8(put, (UINT8)exc->fog); WRITEUINT8(put, (UINT8)exc->fog);
@ -490,7 +493,7 @@ static void SaveExtraColormap(UINT8 *put, extracolormap_t *exc)
static extracolormap_t *LoadExtraColormap(UINT8 *get) static extracolormap_t *LoadExtraColormap(UINT8 *get)
{ {
extracolormap_t *exc; extracolormap_t *exc, *exc_exist;
//size_t dbg_i = 0; //size_t dbg_i = 0;
UINT8 fadestart = READUINT8(get), UINT8 fadestart = READUINT8(get),
@ -525,14 +528,21 @@ static extracolormap_t *LoadExtraColormap(UINT8 *get)
exc->rgba = rgba; exc->rgba = rgba;
exc->fadergba = fadergba; exc->fadergba = fadergba;
exc->colormap = R_CreateLightTable(exc);
R_AddColormapToList(exc);
#ifdef EXTRACOLORMAPLUMPS #ifdef EXTRACOLORMAPLUMPS
exc->lump = LUMPERROR; exc->lump = LUMPERROR;
exc->lumpname[0] = 0; exc->lumpname[0] = 0;
#endif #endif
if (!(exc_exist = R_GetColormapFromList(exc)))
{
exc->colormap = R_CreateLightTable(exc);
R_AddColormapToList(exc);
}
else
{
Z_Free(exc);
exc = R_CheckDefaultColormap(exc_exist, true, true, true) ? NULL : exc_exist;
}
} }
return exc; return exc;