OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed layout issues with Strife's dialogues.

Browse source 
They were using some settings from the option menu which they never should have used to begin with.
This commit is contained in:
Christoph Oelckers 2019-03-19 17:46:59 +01:00
commit a1acc4adc4
4 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/menu/menu.cpp
View file

@ -56,6 +56,7 @@
#include "scripting/types.h"
int DMenu::InMenu;
static ScaleOverrider *CurrentScaleOverrider;
//
// Todo: Move these elsewhere
//
@ -348,7 +349,7 @@ bool DMenu::TranslateKeyboardEvents()
//
//=============================================================================
void M_StartControlPanel (bool makeSound)
void M_StartControlPanel (bool makeSound, bool scaleoverride)
{
// intro might call this repeatedly
if (CurrentMenu != nullptr)
@ -372,6 +373,7 @@ void M_StartControlPanel (bool makeSound)
}
BackbuttonTime = 0;
BackbuttonAlpha = 0;
if (scaleoverride && !CurrentScaleOverrider) CurrentScaleOverrider = new ScaleOverrider;
}
//=============================================================================
@ -912,6 +914,8 @@ void M_ClearMenus()
CurrentMenu = parent;
}
menuactive = MENU_Off;
if (CurrentScaleOverrider) delete CurrentScaleOverrider;
CurrentScaleOverrider = nullptr;
}
//=============================================================================