X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap.cpp;h=974c75c8ccd8eceed292495fe808a233cd71cbcb;hb=6e843b1780f62f45b7021bd8c38181aa211588ee;hp=22372c11702e170be2a16ba2601020f160b117ae;hpb=c0af01d5e9974c6206d7978ab871f6868e903a7e;p=supertux.git

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index 22372c117..974c75c8c 100644
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -17,6 +17,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <config.h>
+
 #include <iostream>
 #include <fstream>
 #include <vector>
@@ -38,8 +40,9 @@
 #include "resources.h"
 #include "app/gettext.h"
 #include "misc.h"
+#include "scene.h"
 
-#define map_message_TIME 2800
+#define map_message_TIME 2.8
 
 Menu* worldmap_menu  = 0;
 
@@ -169,15 +172,15 @@ 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);
                 tile->images.push_back(image);
                 }
 
-              tile->anim_speed = 25;
-              reader.read_int("anim-speed", tile->anim_speed);
+              tile->anim_fps = 1;
+              reader.read_float("anim-fps", tile->anim_fps);
 
 
               if (id >= int(tiles.size()))
@@ -359,7 +362,7 @@ Tux::action(float delta)
             {
               if(special_tile && !special_tile->map_message.empty() &&
                 !special_tile->passive_message)
-                worldmap->passive_message_timer.stop();
+                worldmap->passive_message_timer.start(0);
               stop();
             }
           else
@@ -451,8 +454,7 @@ Tile::draw(DrawingContext& context, Vector pos)
 
   if(images.size() > 1)
     {
-    size_t frame 
-      = ((global_frame_counter*25) / anim_speed) % images.size();
+    size_t frame = size_t(global_time * anim_fps) % images.size();
 
     context.draw_surface(images[frame], pos, LAYER_TILES);
     }
@@ -485,10 +487,7 @@ WorldMap::WorldMap()
   enter_level = false;
 
   name = "<no title>";
-  music = "SALCON.MOD";
-
-  global_frame_counter = 0;
-  frame_timer.init(true);
+  music = "salcon.mod";
 
   total_stats.reset();
 }
@@ -631,6 +630,9 @@ WorldMap::load_map()
     }
 
     lisp_free(root_obj);
+
+    delete tux;
+    tux = new Tux(this);
 }
 
 void WorldMap::get_level_title(Level& level)
@@ -678,7 +680,8 @@ void
 WorldMap::get_input()
 {
   enter_level = false;
-   
+  SDLKey key;
+
   SDL_Event event;
   while (SDL_PollEvent(&event))
     {
@@ -695,32 +698,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:
@@ -835,12 +828,6 @@ std::cerr << "one way only\n";
 void
 WorldMap::update(float delta)
 {
-  if(!frame_timer.check())
-    {
-    frame_timer.start(25);
-    global_frame_counter++;
-    }
-
   if (enter_level && !tux->is_moving())
     {
       /* Check special tile action */
@@ -876,7 +863,8 @@ 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(
+                  get_resource_filename(std::string("levels/" + level->name)),
                                   ST_GL_LOAD_LEVEL_FILE, level->vertical_flip,
                                   &level->statistics);
 
@@ -1263,6 +1251,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");
 
@@ -1336,6 +1325,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;