zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-04-23 08:09:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "- fixed layout issues with Strife's dialogues."

Browse source 
This reverts commit 963d1b682c.

Partial revert.
This commit is contained in:
drfrag 2019-07-16 00:00:58 +02:00
parent 25ffe28abe
commit 7b3d02dfec
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/menu/menu.cpp
View file

@ -61,7 +61,6 @@
#include "scripting/types.h"
int DMenu::InMenu;
static ScaleOverrider *CurrentScaleOverrider;
//
// Todo: Move these elsewhere
//
@ -344,7 +343,7 @@ bool DMenu::TranslateKeyboardEvents()
//
//=============================================================================
void M_StartControlPanel (bool makeSound, bool scaleoverride)
void M_StartControlPanel (bool makeSound)
{
// intro might call this repeatedly
if (CurrentMenu != nullptr)
@ -368,7 +367,6 @@ void M_StartControlPanel (bool makeSound, bool scaleoverride)
}
BackbuttonTime = 0;
BackbuttonAlpha = 0;
if (scaleoverride && !CurrentScaleOverrider) CurrentScaleOverrider = new ScaleOverrider;
}
//=============================================================================
@ -857,8 +855,6 @@ void M_ClearMenus()
}
V_SetBorderNeedRefresh();
menuactive = MENU_Off;
if (CurrentScaleOverrider) delete CurrentScaleOverrider;
CurrentScaleOverrider = nullptr;
}
//=============================================================================

2
src/menu/menu.h
View file

@ -343,7 +343,7 @@ void M_ActivateMenu(DMenu *menu);
void M_ClearMenus ();
void M_ParseMenuDefs();
void M_StartupSkillMenu(FGameStartup *gs);
void M_StartControlPanel (bool makeSound, bool scaleoverride = false);
void M_StartControlPanel (bool makeSound);
void M_SetMenu(FName menu, int param = -1);
void M_StartMessage(const char *message, int messagemode, FName action = NAME_None);
DMenu *StartPickerMenu(DMenu *parent, const char *name, FColorCVar *cvar);

2
src/p_conversation.cpp
View file

@ -922,7 +922,6 @@ void P_StartConversation (AActor *npc, AActor *pc, bool facetalker, bool saveang
I_SetMusicVolume (dlg_musicvolume);
S_Sound (npc, CHAN_VOICE|CHAN_NOPAUSE, CurNode->SpeakerVoice, 1, ATTN_NORM);
}
M_StartControlPanel(false, true);
// Create the menu. This may be a user-defined class so check if it is good to use.
FName cls = CurNode->MenuClassName;
@ -947,6 +946,7 @@ void P_StartConversation (AActor *npc, AActor *pc, bool facetalker, bool saveang
}
// And open the menu
M_StartControlPanel (false);
M_ActivateMenu((DMenu*)cmenu);
menuactive = MENU_OnNoPause;
}