diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2017-06-03 14:55:10 -0400 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2017-06-03 14:55:10 -0400 |
| commit | caecdb681c428c1aab9c0f7eec2570c0460f995c (patch) | |
| tree | e5115982ea59bbf2343ba9b35bc4a0cfbb56f407 /src/mainmenumanager.h | |
| parent | 81d56b94919dceb7b2e51d70b21a7ca22f852bd5 (diff) | |
| parent | 80dc961d24e1964e25d57039ddb2ba639f9f4d22 (diff) | |
| download | minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.gz minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.bz2 minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.zip | |
Merge 0.4.16 into stable-0.4
Diffstat (limited to 'src/mainmenumanager.h')
| -rw-r--r-- | src/mainmenumanager.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mainmenumanager.h b/src/mainmenumanager.h index 17133b164..fb715ca9b 100644 --- a/src/mainmenumanager.h +++ b/src/mainmenumanager.h @@ -83,7 +83,7 @@ public: /*core::list<GUIModalMenu*>::Iterator i = m_stack.getLast(); assert(*i == menu); m_stack.erase(i);*/ - + if(!m_stack.empty()) m_stack.back()->setVisible(true); } @@ -119,7 +119,7 @@ public: extern MainMenuManager g_menumgr; -extern bool noMenuActive(); +extern bool isMenuActive(); class MainGameCallback : public IGameCallback { @@ -168,7 +168,7 @@ public: keyconfig_changed = true; } - + bool disconnect_requested; bool changepassword_requested; bool changevolume_requested; |