projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated addon repository URL and improved debug output on download
[supertux.git]
/
src
/
gui
/
menu.cpp
diff --git
a/src/gui/menu.cpp
b/src/gui/menu.cpp
index
e17764d
..
fd253e9
100644
(file)
--- a/
src/gui/menu.cpp
+++ b/
src/gui/menu.cpp
@@
-227,8
+227,9
@@
Menu::process_input()
|| controller->pressed(Controller::MENU_SELECT)) {
menuaction = MENU_ACTION_HIT;
}
|| controller->pressed(Controller::MENU_SELECT)) {
menuaction = MENU_ACTION_HIT;
}
- if(controller->pressed(Controller::PAUSE_MENU)
- || controller->pressed(Controller::MENU_BACK)) {
+ if(controller->pressed(Controller::ESCAPE) ||
+ controller->pressed(Controller::START) ||
+ controller->pressed(Controller::MENU_BACK)) {
menuaction = MENU_ACTION_BACK;
}
menuaction = MENU_ACTION_BACK;
}
@@
-624,7
+625,7
@@
Menu::get_item_by_id(int id)
}
}
}
}
- throw std::runtime_error("MenuItem not found
"
);
+ throw std::runtime_error("MenuItem not found
: " + std::to_string(id)
);
}
const MenuItem&
}
const MenuItem&