From 18f2cf0fdc269f2e533cef57157343c0f60329fa Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 20 Jun 2020 12:06:49 +0300 Subject: [PATCH] - exposed menu blur amount to engine interface https://forum.zdoom.org/viewtopic.php?t=69056 --- src/common/engine/i_interface.cpp | 1 + src/common/engine/i_interface.h | 1 + src/d_main.cpp | 1 + src/menu/menu.cpp | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/common/engine/i_interface.cpp b/src/common/engine/i_interface.cpp index 803317a81f3..acecd0673b8 100644 --- a/src/common/engine/i_interface.cpp +++ b/src/common/engine/i_interface.cpp @@ -5,4 +5,5 @@ SystemCallbacks *sysCallbacks; double refreshfreq; FString endoomName; bool batchrun; +float menuBlurAmount; diff --git a/src/common/engine/i_interface.h b/src/common/engine/i_interface.h index f5fed4531de..3b4892edd55 100644 --- a/src/common/engine/i_interface.h +++ b/src/common/engine/i_interface.h @@ -31,3 +31,4 @@ struct WadStuff extern FString endoomName; extern bool batchrun; +extern float menuBlurAmount; diff --git a/src/d_main.cpp b/src/d_main.cpp index 65575b6ae22..a3fe910b83a 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -3333,6 +3333,7 @@ static int D_DoomMain_Internal (void) G_ParseMapInfo (iwad_info->MapInfo); MessageBoxClass = gameinfo.MessageBoxClass; endoomName = gameinfo.Endoom; + menuBlurAmount = gameinfo.bluramount; ReadStatistics(); // MUSINFO must be parsed after MAPINFO diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp index e244710ebe9..0bac3a57d48 100644 --- a/src/menu/menu.cpp +++ b/src/menu/menu.cpp @@ -741,7 +741,7 @@ void M_Drawer (void) if (CurrentMenu != nullptr && menuactive != MENU_Off) { - if (!CurrentMenu->DontBlur) screen->BlurScene(0); + if (!CurrentMenu->DontBlur) screen->BlurScene(menuBlurAmount); if (!CurrentMenu->DontDim) { if (sysCallbacks && sysCallbacks->MenuDim) sysCallbacks->MenuDim();