diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-05-13 11:05:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-13 11:05:16 +0200 |
| commit | 9b8ca3a746cdb9478a46939d36c30484a97255e1 (patch) | |
| tree | c754605c7c955440a1d66d413a80f994d6b83006 /src/mainmenumanager.h | |
| parent | 5cb7f6a9b7268ee6bfa5eae4f8af9613403f9965 (diff) | |
| download | minetest-9b8ca3a746cdb9478a46939d36c30484a97255e1.tar.gz minetest-9b8ca3a746cdb9478a46939d36c30484a97255e1.tar.bz2 minetest-9b8ca3a746cdb9478a46939d36c30484a97255e1.zip | |
Move KeyList & InputHandler from game.h to client/inputhandler.h (#5752)
* Move KeyList & InputHandler from game.h to client/inputhandler.h
We have a header for inputs, move inputhandler class & related keylist object to it
Also introduce a cpp file for MyEventReceiver::OnEvent function in inputhandler.h because a so huge function doesn't needs to be inlined
* Pass clang-format on inputhandler.{cpp,h} (compatible)
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; |