zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-18 22:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed some menu issues.

Browse source 
The submenus still do not work. Something's off here.
This commit is contained in:
Christoph Oelckers 2019-12-14 13:40:58 +01:00
parent cc81b95570
commit 28cbecea67
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/common/menu/menu.cpp
View file

@ -385,8 +385,6 @@ void M_StartControlPanel (bool makeSound)
BackbuttonTime = 0; BackbuttonTime = 0;
BackbuttonAlpha = 0; BackbuttonAlpha = 0;
DrawBackground = -1; 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) void Menu_Open(int playerid)
@ -410,6 +408,8 @@ void M_ActivateMenu(DMenu *menu)
transition.StartTransition(DMenu::CurrentMenu, menu, MA_Advance); transition.StartTransition(DMenu::CurrentMenu, menu, MA_Advance);
} }
DMenu::CurrentMenu = menu; 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) bool M_SetMenu(FName menu, int param, FName caller)
{ {
if (DrawBackground == -1) if (DrawBackground == -1)
{ {
if (menu == NAME_MainMenu) DrawBackground = 1; if (menu == NAME_MainMenu) DrawBackground = 1;
else DrawBackground = 0; else DrawBackground = 0;

8
wadsrc/static/demolition/menudef.txt
View file

@ -84,9 +84,9 @@ LISTMENU "MainMenu"
centermenu centermenu
class "Exhumed.MainMenu" class "Exhumed.MainMenu"
linespacing 22 linespacing 22
NativeTextItem "3460", "n", "StartGame 1" NativeTextItem "3460", "n", "StartGame", 1
NativeTextItem "3461", "l", "LoadGameMenu" NativeTextItem "3461", "l", "LoadGameMenu"
NativeTextItem "3462", "m", "StartGame 3" NativeTextItem "3462", "m", "StartGame", 3
NativeTextItem "3463", "v", "OptionsMenu" NativeTextItem "3463", "v", "OptionsMenu"
NativeTextItem "3464", "q", "QuitMenu" NativeTextItem "3464", "q", "QuitMenu"
} }
@ -171,9 +171,9 @@ LISTMENU "IngameMenu"
centermenu centermenu
class "Exhumed.MainMenu" class "Exhumed.MainMenu"
linespacing 22 linespacing 22
NativeTextItem "3460", "n", "StartGame 1" NativeTextItem "3460", "n", "StartGame", 1
NativeTextItem "3461", "l", "LoadGameMenu" NativeTextItem "3461", "l", "LoadGameMenu"
NativeTextItem "3462", "m", "StartGame 3" NativeTextItem "3462", "m", "StartGame", 3
NativeTextItem "3463", "v", "OptionsMenu" NativeTextItem "3463", "v", "OptionsMenu"
NativeTextItem "3464", "q", "QuitMenu" NativeTextItem "3464", "q", "QuitMenu"
} }