OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'truecolor' of https://github.com/dpjudas/zdoom

Browse source 
# Conflicts:
#	src/v_video.cpp
This commit is contained in:
raa-eruanna 2016-09-08 03:19:08 -04:00
commit 32f758de41
60 changed files with 8510 additions and 1030 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/g_level.cpp
View file

@ -1312,7 +1312,7 @@ void G_InitLevelLocals ()
level_info_t *info;
BaseBlendA = 0.0f; // Remove underwater blend effect, if any
NormalLight.Maps = realcolormaps;
NormalLight.Maps = realcolormaps.Maps;
// [BB] Instead of just setting the color, we also have to reset Desaturate and build the lights.
NormalLight.ChangeColor (PalEntry (255, 255, 255), 0);