projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Split Controller::PAUSE_MENU into ESCAPE and START, as they need to act different...
[supertux.git]
/
src
/
worldmap
/
worldmap.cpp
diff --git
a/src/worldmap/worldmap.cpp
b/src/worldmap/worldmap.cpp
index
fcf772e
..
e6b479a
100644
(file)
--- a/
src/worldmap/worldmap.cpp
+++ b/
src/worldmap/worldmap.cpp
@@
-643,7
+643,8
@@
WorldMap::update(float delta)
if(!controller->pressed(Controller::UP))
enter_level = true;
}
- if(controller->pressed(Controller::PAUSE_MENU))
+ if(controller->pressed(Controller::START) ||
+ controller->pressed(Controller::ESCAPE))
{
on_escape_press();
}