Candle property warning to debug

[supertux.git] / src / control / keyboard_config.cpp

diff --git a/src/control/keyboard_config.cpp b/src/control/keyboard_config.cpp
index dd2bf12..a8ec960 100644 (file)
--- a/src/control/keyboard_config.cpp
+++ b/src/control/keyboard_config.cpp
@@ -31,9 +31,9 @@ KeyboardConfig::KeyboardConfig() :
   keymap[SDLK_SPACE]    = Controller::JUMP;
   keymap[SDLK_LCTRL]    = Controller::ACTION;
   keymap[SDLK_LALT]     = Controller::ACTION;
-  keymap[SDLK_ESCAPE]   = Controller::PAUSE_MENU;
-  keymap[SDLK_p]        = Controller::PAUSE_MENU;
-  keymap[SDLK_PAUSE]    = Controller::PAUSE_MENU;
+  keymap[SDLK_ESCAPE]   = Controller::ESCAPE;
+  keymap[SDLK_p]        = Controller::START;
+  keymap[SDLK_PAUSE]    = Controller::START;
   keymap[SDLK_RETURN]   = Controller::MENU_SELECT;
   keymap[SDLK_KP_ENTER] = Controller::MENU_SELECT;
   keymap[SDLK_CARET]    = Controller::CONSOLE;
@@ -54,7 +54,6 @@ KeyboardConfig::read(const lisp::Lisp& keymap_lisp)
   keymap_lisp.get("sdl2", config_is_sdl2);
   if (config_is_sdl2)
   {
-    keymap.clear();
     keymap_lisp.get("jump-with-up", jump_with_up_kbd);
     lisp::ListIterator iter(&keymap_lisp);
     while(iter.next())