From 634ef60c78c769def1d9ab23d1a35f2dc74c61f9 Mon Sep 17 00:00:00 2001 From: drfrag Date: Sat, 28 Sep 2019 10:07:20 +0200 Subject: [PATCH 1/5] - Fixed player sprites not being affected by sector light level in the classic software renderer. --- src/rendering/swrenderer/scene/r_light.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/rendering/swrenderer/scene/r_light.cpp b/src/rendering/swrenderer/scene/r_light.cpp index 13c19bf93..0f4914ff6 100644 --- a/src/rendering/swrenderer/scene/r_light.cpp +++ b/src/rendering/swrenderer/scene/r_light.cpp @@ -205,7 +205,10 @@ namespace swrenderer int shade = LightVisibility::LightLevelToShade(lightlevel, foggy, thread->Viewport.get()); if (psprite) + { + visibility = 0; shade -= 24 * FRACUNIT; + } BaseColormap = basecolormap; ColormapNum = GETPALOOKUP(visibility, shade); From 663c45f6b6f99beb6aa572f33de3e9aad131a275 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 28 Sep 2019 12:09:08 +0300 Subject: [PATCH 2/5] - fixed compilation of debug targets libraries/oplsynth/opl_mus_player.cpp:272:25: error: use of undeclared identifier 'ticky' --- libraries/oplsynth/opl_mus_player.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/oplsynth/opl_mus_player.cpp b/libraries/oplsynth/opl_mus_player.cpp index ebb39f382..fe771fdd9 100644 --- a/libraries/oplsynth/opl_mus_player.cpp +++ b/libraries/oplsynth/opl_mus_player.cpp @@ -269,7 +269,6 @@ bool OPLmusicBlock::ServiceStream (void *buff, int numbytes) io->chips[i]->Update(samples1, samplesleft); } OffsetSamples(samples1, samplesleft << stereoshift); - assert(NextTickIn == ticky); NextTickIn -= samplesleft; assert (NextTickIn >= 0); numsamples -= samplesleft; From 9f190e76e3922b28199c166f050264bc6c9fe1cc Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 28 Sep 2019 12:45:20 +0300 Subject: [PATCH 3/5] - disabled code signing in Xcode by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s impossible to build GZDoom without valid code signing identity with Xcode 11 using a project --- src/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 428ee7d3e..849486726 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1413,7 +1413,8 @@ if( APPLE ) set_target_properties(zdoom PROPERTIES 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() # if placed in the directory with the main executable From e00a4a53a601131965a0095bea4d4b5208f263ee Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 28 Sep 2019 12:46:40 +0300 Subject: [PATCH 4/5] - fixed compilation of Linux targets src/sound/music/i_musicinterns.h:111:7: error: no template named 'shared_ptr' in namespace 'std' src/sound/music/i_musicinterns.h:133:7: error: no template named 'shared_ptr' in namespace 'std' src/sound/music/i_musicinterns.h:152:7: error: no template named 'shared_ptr' in namespace 'std' --- src/sound/music/i_musicinterns.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/sound/music/i_musicinterns.h b/src/sound/music/i_musicinterns.h index 5402ff5d3..5f9ec23f3 100644 --- a/src/sound/music/i_musicinterns.h +++ b/src/sound/music/i_musicinterns.h @@ -1,6 +1,8 @@ #include #include +#include + #include "oplsynth/opl_mus_player.h" #include "c_cvars.h" #include "mus2midi.h" From ef7a35664456f5982b2b99850341f7eb1eb5ad1b Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 29 Sep 2019 16:07:25 +0300 Subject: [PATCH 5/5] - fixed inventory scroll arrows in alternative HUD https://forum.zdoom.org/viewtopic.php?t=65976 --- wadsrc/static/zscript/ui/statusbar/alt_hud.zs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wadsrc/static/zscript/ui/statusbar/alt_hud.zs b/wadsrc/static/zscript/ui/statusbar/alt_hud.zs index dd9f3d0ce..b0efdc541 100644 --- a/wadsrc/static/zscript/ui/statusbar/alt_hud.zs +++ b/wadsrc/static/zscript/ui/statusbar/alt_hud.zs @@ -68,7 +68,7 @@ class AltHud ui if (IndexFont == NULL) IndexFont = ConFont; // Emergency fallback 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); fragpic = TexMan.CheckForTexture("HU_FRAGS", TexMan.Type_MiscPatch); statspace = SmallFont.StringWidth("Ac:");