mirror of https://github.com/ZDoom/gzdoom.git
- fixed: M_Ticker should not run any code when the menu is off.
SVN r2805 (trunk)
This commit is contained in:
parent
35aa6e7847
commit
ae3c60454f
|
@ -673,6 +673,7 @@ void M_Ticker (void)
|
||||||
{
|
{
|
||||||
DMenu::MenuTime++;
|
DMenu::MenuTime++;
|
||||||
if (DMenu::CurrentMenu != NULL && menuactive != MENU_Off)
|
if (DMenu::CurrentMenu != NULL && menuactive != MENU_Off)
|
||||||
|
{
|
||||||
DMenu::CurrentMenu->Ticker();
|
DMenu::CurrentMenu->Ticker();
|
||||||
|
|
||||||
for (int i = 0; i < NUM_MKEYS; ++i)
|
for (int i = 0; i < NUM_MKEYS; ++i)
|
||||||
|
@ -686,7 +687,6 @@ void M_Ticker (void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (BackbuttonTime > 0)
|
if (BackbuttonTime > 0)
|
||||||
{
|
{
|
||||||
if (BackbuttonAlpha < FRACUNIT) BackbuttonAlpha += FRACUNIT/10;
|
if (BackbuttonAlpha < FRACUNIT) BackbuttonAlpha += FRACUNIT/10;
|
||||||
|
@ -698,6 +698,7 @@ void M_Ticker (void)
|
||||||
if (BackbuttonAlpha < 0) BackbuttonAlpha = 0;
|
if (BackbuttonAlpha < 0) BackbuttonAlpha = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
//
|
//
|
||||||
|
|
Loading…
Reference in New Issue