OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- merged finale branch back into trunk.

Browse source 
SVN r2911 (trunk)
This commit is contained in:
Christoph Oelckers 2010-10-06 10:44:03 +00:00
commit d9970ab9b6
30 changed files with 6132 additions and 5157 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/menu/menu.cpp
View file

@ -79,6 +79,7 @@ int MenuButtonTickers[NUM_MKEYS];
bool MenuButtonOrigin[NUM_MKEYS];
int BackbuttonTime;
fixed_t BackbuttonAlpha;
static bool MenuEnabled = true;
#define KEY_REPEAT_DELAY (TICRATE*5/12)
@ -633,7 +634,7 @@ bool M_Responder (event_t *ev)
}
return DMenu::CurrentMenu->Responder(ev) || !keyup;
}
else
else if (MenuEnabled)
{
if (ev->type == EV_KeyDown)
{
@ -761,6 +762,18 @@ void M_Init (void)
}
//=============================================================================
//
//
//
//=============================================================================
void M_EnableMenu (bool on)
{
MenuEnabled = on;
}
//=============================================================================
//
// [RH] Most menus can now be accessed directly