zdoom/gzdoom-last-svn
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-last-svn.git synced 2025-06-02 02:01:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added custom colormap support for DECORATE items.

Browse source 
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@471 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
Christoph Oelckers 2009-09-21 20:54:52 +00:00
parent e34e78571f
commit 139baf158e
35 changed files with 311 additions and 514 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/r_main.cpp
View file

@ -1212,9 +1212,9 @@ void R_SetupFrame (AActor *actor)
if (player != NULL && camera == player->mo)
{
if (player->fixedcolormap >= 0 && player->fixedcolormap < NUM_SPECIALCOLORMAPS)
if (player->fixedcolormap >= 0 && player->fixedcolormap < (int)SpecialColormaps.Size())
{
fixedcolormap = SpecialColormaps[player->fixedcolormap];
fixedcolormap = SpecialColormaps[player->fixedcolormap].Colormap;
}
else if (player->fixedlightlevel >= 0 && player->fixedlightlevel < NUMCOLORMAPS)
{
@ -1224,7 +1224,7 @@ void R_SetupFrame (AActor *actor)
// [RH] Inverse light for shooting the Sigil
if (fixedcolormap == NULL && extralight == INT_MIN)
{
fixedcolormap = SpecialColormaps[INVERSECOLORMAP];
fixedcolormap = SpecialColormaps[INVERSECOLORMAP].Colormap;
extralight = 0;
}