zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Making any blends with full red a special colormap seems like it would be far too 

easy to accidentally trigger.

SVN r1864 (trunk)
This commit is contained in:
Randy Heit 2009-09-22 01:31:36 +00:00
parent e9d61a3f46
commit 79298285f7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/v_palette.h
View File

@ -106,21 +106,22 @@ struct FSpecialColormap
extern TArray<FSpecialColormap> SpecialColormaps;
// some utility functions to store special colormaps in powerup blends
#define SPECIALCOLORMAP_MASK 0x00ff0000
#define SPECIALCOLORMAP_MASK 0xBEEF0000
inline int MakeSpecialColormap(int index)
{
assert(index >= 0 && index < 65536);
return index | SPECIALCOLORMAP_MASK;
}
inline bool IsSpecialColormap(int map)
{
return (map & SPECIALCOLORMAP_MASK) == SPECIALCOLORMAP_MASK;
return (map & 0xFFFF0000) == SPECIALCOLORMAP_MASK;
}
inline int GetSpecialColormap(int blend)
{
return IsSpecialColormap(blend)? blend & ~SPECIALCOLORMAP_MASK : NOFIXEDCOLORMAP;
return IsSpecialColormap(blend) ? blend & 0xFFFF : NOFIXEDCOLORMAP;
}
int AddSpecialColormap(double r, double g, double b, bool inv);