OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'remotes/origin/master' into 2D_Refactor

Browse source 
# Conflicts:
#	src/posix/cocoa/i_video.mm
This commit is contained in:
Christoph Oelckers 2018-03-30 22:06:17 +02:00
commit 1e5fbc1423
18 changed files with 540 additions and 518 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/polyrenderer/scene/poly_playersprite.cpp
View file

@ -356,7 +356,8 @@ void RenderPolyPlayerSprites::RenderSprite(PolyRenderThread *thread, DPSprite *p
invertcolormap = !invertcolormap;
}
bool fullbright = !foggy && pspr->GetState()->GetFullbright();
const FState* const psprState = pspr->GetState();
bool fullbright = !foggy && (psprState == nullptr ? false : psprState->GetFullbright());
bool fadeToBlack = (vis.RenderStyle.Flags & STYLEF_FadeToBlack) != 0;
vis.Light.SetColormap(0, spriteshade, basecolormap, fullbright, invertcolormap, fadeToBlack);