this time 1-hole problems are fixed for real

[supertux.git] / src / worldmap.cpp

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index 94500ac..974c75c 100644 (file)
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -40,6 +40,7 @@
 #include "resources.h"
 #include "app/gettext.h"
 #include "misc.h"
+#include "scene.h"
 
 #define map_message_TIME 2.8
 
@@ -178,8 +179,8 @@ TileManager::TileManager()
                 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()))
@@ -453,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);
     }
@@ -487,9 +487,7 @@ WorldMap::WorldMap()
   enter_level = false;
 
   name = "<no title>";
-  music = "SALCON.MOD";
-
-  global_frame_counter = 0;
+  music = "salcon.mod";
 
   total_stats.reset();
 }
@@ -830,10 +828,6 @@ std::cerr << "one way only\n";
 void
 WorldMap::update(float delta)
 {
-  if(!frame_timer.check()) {
-    global_frame_counter++;
-  }
-
   if (enter_level && !tux->is_moving())
     {
       /* Check special tile action */
@@ -869,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(level->name,
+              GameSession session(
+                  get_resource_filename(std::string("levels/" + level->name)),
                                   ST_GL_LOAD_LEVEL_FILE, level->vertical_flip,
                                   &level->statistics);
 
@@ -1183,7 +1178,6 @@ WorldMap::display()
   frame_rate.set_frame_limit(false);
 
   frame_rate.start();
-  frame_timer.start(.25, true);
 
   DrawingContext context;
   while(!quit)