zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-21 02:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
- Fixed the mHasBackdrop flag. (drfrag)

# Conflicts:
#	wadsrc/static/zscript/ui/menu/conversationmenu.zs

# Conflicts:
#	src/menu/menu.cpp
This commit is contained in:
Christoph Oelckers 2019-08-09 15:22:52 +02:00 committed by drfrag
parent d6e7e68bfa
commit 1161a17f00
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/menu/menu.cpp
View file

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

1
src/menu/menu.h
View file

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

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

@ -77,8 +77,8 @@ class ConversationMenu : Menu
Array<String> mResponseLines;
Array<uint> mResponses;
bool mShowGold;
bool mHasBackdrop; // hack hack
bool mConfineTextToBackdrop;
bool mHasBackdrop;
bool mConfineTextToBackdrop; // hack hack
StrifeDialogueNode mCurNode;
int mYpos;
PlayerInfo mPlayer;
@ -117,8 +117,10 @@ class ConversationMenu : Menu
ConversationPauseTic = gametic + 20;
DontDim = true;
mHasBackdrop = false; // hack hack
let tex = TexMan.CheckForTexture (CurNode.Backdrop, TexMan.Type_MiscPatch);
mHasBackdrop = tex.isValid();
DontBlur = !mHasBackdrop;
displayFont = SmallFont;
displayWidth = CleanWidth;
displayHeight = CleanHeight;
@ -129,7 +131,7 @@ class ConversationMenu : Menu
ReplyWidth = 320-50-10;
SpeechWidth = screen.GetWidth()/CleanXfac - 24*2;
ReplyLineHeight = LineHeight = displayFont.GetHeight();
mConfineTextToBackdrop = false;
mConfineTextToBackdrop = false; // hack hack
speechDisplayWidth = displayWidth;
LineHeight = SmallFont.GetHeight();

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 mBackbuttonSelected;
native bool DontDim;
native bool DontBlur;
native static int MenuTime();
native static void SetVideoMode();
@ -114,6 +115,7 @@ class Menu : Object native ui version("2.4")
mMouseCapture = false;
mBackbuttonSelected = false;
DontDim = false;
DontBlur = false;
}
//=============================================================================