mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-16 01:31:30 +00:00
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
This commit is contained in:
commit
36522665c3
2 changed files with 10 additions and 0 deletions
|
@ -1369,11 +1369,18 @@ void R_AddColormapToList(extracolormap_t *extra_colormap)
|
|||
return;
|
||||
}
|
||||
|
||||
#ifdef COLORMAPREVERSELIST
|
||||
extra_colormaps->prev = extra_colormap;
|
||||
extra_colormap->next = extra_colormaps;
|
||||
extra_colormaps = extra_colormap;
|
||||
extra_colormap->prev = 0;
|
||||
#else
|
||||
for (exc = extra_colormaps; exc->next; exc = exc->next);
|
||||
|
||||
exc->next = extra_colormap;
|
||||
extra_colormap->prev = exc;
|
||||
extra_colormap->next = 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef EXTRACOLORMAPLUMPS
|
||||
|
|
|
@ -100,6 +100,9 @@ INT32 R_CheckTextureNumForName(const char *name);
|
|||
// Uncomment to enable
|
||||
//#define EXTRACOLORMAPLUMPS
|
||||
|
||||
// Uncomment to make extra_colormaps order Newest -> Oldest
|
||||
//#define COLORMAPREVERSELIST
|
||||
|
||||
void R_ReInitColormaps(UINT16 num);
|
||||
void R_ClearColormaps(void);
|
||||
void R_AddColormapToList(extracolormap_t *extra_colormap);
|
||||
|
|
Loading…
Reference in a new issue