zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-11 15:22:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed compiler errors with r_fullbrightignoresectorcolor merge

Browse source
This commit is contained in:
raa-eruanna 2016-10-21 07:53:32 -04:00
parent 1ae478aacd
commit ec9dd3f5af
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/r_data/colormaps.cpp
View file

@ -457,11 +457,6 @@ 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; delete[] realfbcolormaps.Maps;
FreeSpecialLights(); FreeSpecialLights();
} }
@ -554,10 +549,10 @@ void R_InitColormaps ()
} }
// [SP] Create a copy of the colormap // [SP] Create a copy of the colormap
if (!realfbcolormaps) if (!realfbcolormaps.Maps)
{ {
realfbcolormaps = new BYTE[256*NUMCOLORMAPS*fakecmaps.Size()]; realfbcolormaps.Maps = new BYTE[256*NUMCOLORMAPS*fakecmaps.Size()];
memcpy(realfbcolormaps, realcolormaps, 256*NUMCOLORMAPS*fakecmaps.Size()); memcpy(realfbcolormaps.Maps, realcolormaps.Maps, 256*NUMCOLORMAPS*fakecmaps.Size());
} }
NormalLight.Color = PalEntry (255, 255, 255); NormalLight.Color = PalEntry (255, 255, 255);