X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap.cpp;h=360cc3cc0d45351253f98c7c8c3f95a6856f8640;hb=4c53a552c13dbe9d587e34e3cf48e82877d09288;hp=e7eed6d1c32139e317212445bc18ea2e716800dd;hpb=e68610f027ad6f35025d9aca87202ceb4501e97e;p=supertux.git

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index e7eed6d1c..360cc3cc0 100644
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -681,7 +681,8 @@ void
 WorldMap::get_input()
 {
   enter_level = false;
-   
+  SDLKey key;
+
   SDL_Event event;
   while (SDL_PollEvent(&event))
     {
@@ -698,32 +699,22 @@ WorldMap::get_input()
               break;
           
             case SDL_KEYDOWN:
-              switch(event.key.keysym.sym)
-                {
-                case SDLK_ESCAPE:
-                  on_escape_press();
-                  break;
-                case SDLK_LCTRL:
-                case SDLK_RETURN:
-                  enter_level = true;
-                  break;
-
-                case SDLK_LEFT:
-                  tux->set_direction(D_WEST);
-                  break;
-                case SDLK_RIGHT:
-                  tux->set_direction(D_EAST);
-                  break;
-                case SDLK_UP:
-                  tux->set_direction(D_NORTH);
-                  break;
-                case SDLK_DOWN:
-                  tux->set_direction(D_SOUTH);
-                  break;
+              key = event.key.keysym.sym;
 
-                default:
-                  break;
-                }
+              if(key == SDLK_ESCAPE)
+                on_escape_press();
+              else if(key == SDLK_RETURN || key == keymap.power)
+                enter_level = true;
+              else if(key == SDLK_LEFT || key == keymap.power)
+                tux->set_direction(D_WEST);
+              else if(key == SDLK_RIGHT || key == keymap.right)
+                tux->set_direction(D_EAST);
+              else if(key == SDLK_UP || key == keymap.up ||
+                key == keymap.jump)
+                  // there might be ppl that use jump as up key
+                tux->set_direction(D_NORTH);
+              else if(key == SDLK_DOWN || key == keymap.down)
+                tux->set_direction(D_SOUTH);
               break;
 
             case SDL_JOYHATMOTION:
@@ -1266,6 +1257,7 @@ WorldMap::savegame(const std::string& filename)
   writer->write_string("map", map_filename);
   writer->write_int("lives", player_status.lives);
   writer->write_int("distros", player_status.lives);
+  writer->write_int("max-score-multiplier", player_status.max_score_multiplier);
 
   writer->start_list("tux");
 
@@ -1339,6 +1331,7 @@ WorldMap::loadgame(const std::string& filename)
 
   reader.read_int("lives", player_status.lives);
   reader.read_int("distros", player_status.distros);
+  reader.read_int("max-score-multiplier", player_status.max_score_multiplier);
 
   if (player_status.lives < 0)
     player_status.lives = START_LIVES;