zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 23:32:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit '8678baf6f589a68635939a1063a28231a0aa01a1'

Browse source 
# Conflicts:
#	src/r_data/colormaps.cpp
#	src/r_main.cpp
#	src/r_segs.cpp
#	src/r_things.cpp
#	wadsrc/static/language.enu
#	wadsrc/static/menudef.txt
This commit is contained in:
raa-eruanna 2016-10-21 07:42:28 -04:00
commit 1ae478aacd
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/r_data/colormaps.cpp
View file

@ -73,6 +73,7 @@ struct FakeCmap
TArray<FakeCmap> fakecmaps; TArray<FakeCmap> fakecmaps;
FSWColormap realcolormaps; FSWColormap realcolormaps;
FSWColormap realfbcolormaps; //[SP] For fullbright use
size_t numfakecmaps; size_t numfakecmaps;
@ -456,6 +457,12 @@ void R_DeinitColormaps ()
SpecialColormaps.Clear(); SpecialColormaps.Clear();
fakecmaps.Clear(); fakecmaps.Clear();
delete[] realcolormaps.Maps; delete[] realcolormaps.Maps;
if (realfbcolormaps != NULL)
{
delete[] realfbcolormaps;
realfbcolormaps = NULL;
}
delete[] realfbcolormaps.Maps;
FreeSpecialLights(); FreeSpecialLights();
} }
@ -545,12 +552,20 @@ void R_InitColormaps ()
} }
} }
} }
// [SP] Create a copy of the colormap
if (!realfbcolormaps)
{
realfbcolormaps = new BYTE[256*NUMCOLORMAPS*fakecmaps.Size()];
memcpy(realfbcolormaps, realcolormaps, 256*NUMCOLORMAPS*fakecmaps.Size());
}
NormalLight.Color = PalEntry (255, 255, 255); NormalLight.Color = PalEntry (255, 255, 255);
NormalLight.Fade = 0; NormalLight.Fade = 0;
NormalLight.Maps = realcolormaps.Maps; NormalLight.Maps = realcolormaps.Maps;
FullNormalLight.Color = PalEntry (255, 255, 255); FullNormalLight.Color = PalEntry (255, 255, 255);
FullNormalLight.Fade = 0; FullNormalLight.Fade = 0;
FullNormalLight.Maps = realcolormaps.Maps; FullNormalLight.Maps = realfbcolormaps.Maps;
NormalLightHasFixedLights = R_CheckForFixedLights(realcolormaps.Maps); NormalLightHasFixedLights = R_CheckForFixedLights(realcolormaps.Maps);
numfakecmaps = fakecmaps.Size(); numfakecmaps = fakecmaps.Size();