zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 07:12:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: M_Ticker should not run any code when the menu is off.

Browse source 
SVN r2805 (trunk)
This commit is contained in:
Christoph Oelckers 2010-09-17 06:20:08 +00:00
parent 35aa6e7847
commit ae3c60454f
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/menu/menu.cpp
View file

@ -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;
@ -697,6 +697,7 @@ void M_Ticker (void)
if (BackbuttonAlpha > 0) BackbuttonAlpha -= FRACUNIT/10; if (BackbuttonAlpha > 0) BackbuttonAlpha -= FRACUNIT/10;
if (BackbuttonAlpha < 0) BackbuttonAlpha = 0; if (BackbuttonAlpha < 0) BackbuttonAlpha = 0;
} }
}
} }
//============================================================================= //=============================================================================