projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix file lookup
[supertux.git]
/
src
/
gui
/
menu.cpp
diff --git
a/src/gui/menu.cpp
b/src/gui/menu.cpp
index
88fffd5
..
361173c
100644
(file)
--- a/
src/gui/menu.cpp
+++ b/
src/gui/menu.cpp
@@
-139,6
+139,8
@@
Menu::pop_current()
current_->effect.start(500);
last_menus.pop_back();
current_->effect.start(500);
last_menus.pop_back();
+ } else {
+ current_ = 0;
}
}
}
}
@@
-818,12
+820,11
@@
Menu::event(const SDL_Event& event)
void
Menu::set_active_item(int id)
{
void
Menu::set_active_item(int id)
{
-
for(in
t i = 0; i < items.size(); ++i) {
-
MenuItem* item = items[i];
-
if(item->id == id) {
-
active_item = i;
-
break;
-
}
-
}
+
for(size_
t i = 0; i < items.size(); ++i) {
+ MenuItem* item = items[i];
+ if(item->id == id) {
+ active_item = i;
+ break;
+ }
+ }
}
}
-