diff --git a/source/common/menu/menu.cpp b/source/common/menu/menu.cpp index 3cb51f927..3b05f6933 100644 --- a/source/common/menu/menu.cpp +++ b/source/common/menu/menu.cpp @@ -385,8 +385,6 @@ void M_StartControlPanel (bool makeSound) BackbuttonTime = 0; BackbuttonAlpha = 0; DrawBackground = -1; - DMenu::MenuTime = -1; - M_Ticker(); // This needs to be called once here to make sure that the menu actually has ticked before it gets drawn for the first time. } void Menu_Open(int playerid) @@ -410,6 +408,8 @@ void M_ActivateMenu(DMenu *menu) transition.StartTransition(DMenu::CurrentMenu, menu, MA_Advance); } DMenu::CurrentMenu = menu; + DMenu::MenuTime = -1; + M_Ticker(); // This needs to be called once here to make sure that the menu actually has ticked before it gets drawn for the first time. } //============================================================================= @@ -420,7 +420,7 @@ void M_ActivateMenu(DMenu *menu) bool M_SetMenu(FName menu, int param, FName caller) { - if (DrawBackground == -1) + if (DrawBackground == -1) { if (menu == NAME_MainMenu) DrawBackground = 1; else DrawBackground = 0; diff --git a/wadsrc/static/demolition/menudef.txt b/wadsrc/static/demolition/menudef.txt index aa463a3e1..aeee33bf0 100644 --- a/wadsrc/static/demolition/menudef.txt +++ b/wadsrc/static/demolition/menudef.txt @@ -84,9 +84,9 @@ LISTMENU "MainMenu" centermenu class "Exhumed.MainMenu" linespacing 22 - NativeTextItem "3460", "n", "StartGame 1" + NativeTextItem "3460", "n", "StartGame", 1 NativeTextItem "3461", "l", "LoadGameMenu" - NativeTextItem "3462", "m", "StartGame 3" + NativeTextItem "3462", "m", "StartGame", 3 NativeTextItem "3463", "v", "OptionsMenu" NativeTextItem "3464", "q", "QuitMenu" } @@ -171,9 +171,9 @@ LISTMENU "IngameMenu" centermenu class "Exhumed.MainMenu" linespacing 22 - NativeTextItem "3460", "n", "StartGame 1" + NativeTextItem "3460", "n", "StartGame", 1 NativeTextItem "3461", "l", "LoadGameMenu" - NativeTextItem "3462", "m", "StartGame 3" + NativeTextItem "3462", "m", "StartGame", 3 NativeTextItem "3463", "v", "OptionsMenu" NativeTextItem "3464", "q", "QuitMenu" }