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 0b9a477..e6b479a 100644 (file)
--- a/src/worldmap/worldmap.cpp
+++ b/src/worldmap/worldmap.cpp
@@ -46,6 +46,7 @@
 #include "sprite/sprite.hpp"
 #include "sprite/sprite_manager.hpp"
 #include "supertux/game_session.hpp"
+#include "supertux/gameconfig.hpp"
 #include "supertux/globals.hpp"
 #include "supertux/menu/menu_storage.hpp"
 #include "supertux/menu/options_menu.hpp"
@@ -73,7 +74,6 @@
 #include "worldmap/tux.hpp"
 #include "worldmap/worldmap.hpp"
 
-
 static const float CAMERA_PAN_SPEED = 5.0;
 
 namespace worldmap {
@@ -643,12 +643,14 @@ 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();
     }
 
-    if(controller->pressed(Controller::CHEAT_MENU))
+    if(controller->pressed(Controller::CHEAT_MENU) &&
+       g_config->developer_mode)
     {
       MenuManager::instance().set_menu(MenuStorage::WORLDMAP_CHEAT_MENU);
     }