zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-25 21:31:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

- do not blur the background for portrait-less conversations.

Browse source
This commit is contained in:
Christoph Oelckers 2019-08-09 15:22:52 +02:00
parent 1e4a32004b
commit 3b4184816b
4 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/menu/menu.cpp
View file

@ -887,7 +887,7 @@ void M_Drawer (void)
if (CurrentMenu != nullptr && menuactive != MENU_Off) if (CurrentMenu != nullptr && menuactive != MENU_Off)
{ {
screen->BlurScene(gameinfo.bluramount); if (!CurrentMenu->DontBlur) screen->BlurScene(gameinfo.bluramount);
if (!CurrentMenu->DontDim) if (!CurrentMenu->DontDim)
{ {
M_Dim(); M_Dim();
@ -1197,6 +1197,7 @@ DEFINE_FIELD(DMenu, mParentMenu)
DEFINE_FIELD(DMenu, mMouseCapture); DEFINE_FIELD(DMenu, mMouseCapture);
DEFINE_FIELD(DMenu, mBackbuttonSelected); DEFINE_FIELD(DMenu, mBackbuttonSelected);
DEFINE_FIELD(DMenu, DontDim); DEFINE_FIELD(DMenu, DontDim);
DEFINE_FIELD(DMenu, DontBlur);
DEFINE_FIELD(DMenuDescriptor, mMenuName) DEFINE_FIELD(DMenuDescriptor, mMenuName)
DEFINE_FIELD(DMenuDescriptor, mNetgameMessage) DEFINE_FIELD(DMenuDescriptor, mNetgameMessage)

1
src/menu/menu.h
View file

@ -271,6 +271,7 @@ public:
bool mMouseCapture; bool mMouseCapture;
bool mBackbuttonSelected; bool mBackbuttonSelected;
bool DontDim; bool DontDim;
bool DontBlur;
static int InMenu; static int InMenu;
DMenu(DMenu *parent = NULL); DMenu(DMenu *parent = NULL);

1
wadsrc/static/zscript/ui/menu/conversationmenu.zs
View file

@ -119,6 +119,7 @@ class ConversationMenu : Menu
let tex = TexMan.CheckForTexture (CurNode.Backdrop, TexMan.Type_MiscPatch); let tex = TexMan.CheckForTexture (CurNode.Backdrop, TexMan.Type_MiscPatch);
mHasBackdrop = tex.isValid(); mHasBackdrop = tex.isValid();
DontBlur = !mHasBackdrop;
if (!generic_ui && !dlg_vgafont) if (!generic_ui && !dlg_vgafont)
{ {

2
wadsrc/static/zscript/ui/menu/menu.zs
View file

@ -90,6 +90,7 @@ class Menu : Object native ui version("2.4")
native bool mMouseCapture; native bool mMouseCapture;
native bool mBackbuttonSelected; native bool mBackbuttonSelected;
native bool DontDim; native bool DontDim;
native bool DontBlur;
native static int MenuTime(); native static int MenuTime();
native static Menu GetCurrentMenu(); native static Menu GetCurrentMenu();
@ -113,6 +114,7 @@ class Menu : Object native ui version("2.4")
mMouseCapture = false; mMouseCapture = false;
mBackbuttonSelected = false; mBackbuttonSelected = false;
DontDim = false; DontDim = false;
DontBlur = false;
} }
//============================================================================= //=============================================================================