projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Object properties: Fix loss of custom selectionbox
[oweals/minetest.git]
/
src
/
mainmenumanager.h
diff --git
a/src/mainmenumanager.h
b/src/mainmenumanager.h
index 2618d3ccfb948d8389a498cfa66ba0e233fb417a..ea9327813407e03dae232ebfaba72cb6793dd84e 100644
(file)
--- a/
src/mainmenumanager.h
+++ b/
src/mainmenumanager.h
@@
-22,8
+22,8
@@
with this program; if not, write to the Free Software Foundation, Inc.,
/*
All kinds of stuff that needs to be exposed from main.cpp
*/
/*
All kinds of stuff that needs to be exposed from main.cpp
*/
-#include "debug.h" // assert
#include "modalMenu.h"
#include "modalMenu.h"
+#include <cassert>
#include <list>
class IGameCallback
#include <list>
class IGameCallback
@@
-48,12
+48,11
@@
class MainMenuManager : public IMenuManager
public:
virtual void createdMenu(gui::IGUIElement *menu)
{
public:
virtual void createdMenu(gui::IGUIElement *menu)
{
- for(std::list<gui::IGUIElement*>::iterator
- i = m_stack.begin();
- i != m_stack.end(); ++i)
- {
- assert(*i != menu);
+#ifndef NDEBUG
+ for (gui::IGUIElement *i : m_stack) {
+ assert(i != menu);
}
}
+#endif
if(!m_stack.empty())
m_stack.back()->setVisible(false);
if(!m_stack.empty())
m_stack.back()->setVisible(false);
@@
-103,10
+102,8
@@
public:
bool pausesGame()
{
bool pausesGame()
{
- for(std::list<gui::IGUIElement*>::iterator
- i = m_stack.begin(); i != m_stack.end(); ++i)
- {
- GUIModalMenu *mm = dynamic_cast<GUIModalMenu*>(*i);
+ for (gui::IGUIElement *i : m_stack) {
+ GUIModalMenu *mm = dynamic_cast<GUIModalMenu*>(i);
if (mm && mm->pausesGame())
return true;
}
if (mm && mm->pausesGame())
return true;
}
@@
-123,8
+120,8
@@
extern bool isMenuActive();
class MainGameCallback : public IGameCallback
{
public:
class MainGameCallback : public IGameCallback
{
public:
- MainGameCallback()
{}
- virtual ~MainGameCallback()
{}
+ MainGameCallback()
= default;
+ virtual ~MainGameCallback()
= default;
virtual void exitToOS()
{
virtual void exitToOS()
{