X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap.cpp;h=d746f8f7010d4428ee75ca7291b98eb2e230691b;hb=c06f17a80ab84d8a26bf7c7bb381ad3f15596de8;hp=37010995249ced7ba3ef1691b78bf33f3561331a;hpb=48a8fed65234a322853b48d6c76ece4a082f5264;p=supertux.git

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index 370109952..d746f8f70 100644
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -169,7 +169,7 @@ TileManager::TileManager()
                 std::cerr << "Warning: no image specified for tile " << id
                           << ".\nIgnoring...\n" << std::endl;
 
-              for(int i = 0; i < filenames.size(); i++)
+              for(int i = 0; static_cast<unsigned int>(i) < filenames.size(); i++)
                 {
                 Surface* image = new Surface(
                          datadir +  "/images/worldmap/" + filenames[i], true);
@@ -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:
@@ -879,7 +870,7 @@ WorldMap::update(float delta)
               // do a shriking fade to the level
               shrink_fade(Vector((level->pos.x*32 + 16 + offset.x),(level->pos.y*32 + 16
                       + offset.y)), 500);
-              GameSession session(datadir +  "/levels/" + level->name,
+              GameSession session(level->name,
                                   ST_GL_LOAD_LEVEL_FILE, level->vertical_flip,
                                   &level->statistics);