zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-14 16:41:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into zmusic_work

Browse source 
# Conflicts:
#	src/sound/music/i_musicinterns.h
This commit is contained in:
Christoph Oelckers 2019-09-30 17:48:34 +02:00
commit 2b87941d7d
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/CMakeLists.txt
View file

@ -1359,7 +1359,8 @@ if( APPLE )
set_target_properties(zdoom PROPERTIES set_target_properties(zdoom PROPERTIES
LINK_FLAGS "${LINK_FRAMEWORKS}" LINK_FLAGS "${LINK_FRAMEWORKS}"
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/posix/osx/zdoom-info.plist" ) MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/posix/osx/zdoom-info.plist"
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "" )
# Dymanic libraries like libvulkan.dylib or libMoltenVK.dylib will be loaded by dlopen() # Dymanic libraries like libvulkan.dylib or libMoltenVK.dylib will be loaded by dlopen()
# if placed in the directory with the main executable # if placed in the directory with the main executable

3
src/rendering/swrenderer/scene/r_light.cpp
View file

@ -205,7 +205,10 @@ namespace swrenderer
int shade = LightVisibility::LightLevelToShade(lightlevel, foggy, thread->Viewport.get()); int shade = LightVisibility::LightLevelToShade(lightlevel, foggy, thread->Viewport.get());
if (psprite) if (psprite)
{
visibility = 0;
shade -= 24 * FRACUNIT; shade -= 24 * FRACUNIT;
}
BaseColormap = basecolormap; BaseColormap = basecolormap;
ColormapNum = GETPALOOKUP(visibility, shade); ColormapNum = GETPALOOKUP(visibility, shade);

2
wadsrc/static/zscript/ui/statusbar/alt_hud.zs
View file

@ -68,7 +68,7 @@ class AltHud ui
if (IndexFont == NULL) IndexFont = ConFont; // Emergency fallback if (IndexFont == NULL) IndexFont = ConFont; // Emergency fallback
invgem_left = TexMan.CheckForTexture("INVGEML1", TexMan.Type_MiscPatch); invgem_left = TexMan.CheckForTexture("INVGEML1", TexMan.Type_MiscPatch);
invgem_left = TexMan.CheckForTexture("INVGEMR1", TexMan.Type_MiscPatch); invgem_right = TexMan.CheckForTexture("INVGEMR1", TexMan.Type_MiscPatch);
tnt1a0 = TexMan.CheckForTexture("TNT1A0", TexMan.Type_Sprite); tnt1a0 = TexMan.CheckForTexture("TNT1A0", TexMan.Type_Sprite);
fragpic = TexMan.CheckForTexture("HU_FRAGS", TexMan.Type_MiscPatch); fragpic = TexMan.CheckForTexture("HU_FRAGS", TexMan.Type_MiscPatch);
statspace = SmallFont.StringWidth("Ac:"); statspace = SmallFont.StringWidth("Ac:");