Changed the background feeding format for the new level format.

[supertux.git] / src / worldmap.cpp

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index 58cfbbc..0258a66 100644 (file)
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -28,6 +28,7 @@
 #include "video/screen.h"
 #include "video/drawing_context.h"
 #include "utils/lispreader.h"
+#include "special/frame_rate.h"
 #include "gameloop.h"
 #include "app/setup.h"
 #include "sector.h"
@@ -37,7 +38,7 @@
 #include "app/gettext.h"
 #include "misc.h"
 
-#define DISPLAY_MAP_MESSAGE_TIME 2600
+#define DISPLAY_MAP_MESSAGE_TIME 2800
 
 Menu* worldmap_menu  = 0;
 
@@ -298,7 +299,10 @@ Tux::action(float delta)
 
           WorldMap::SpecialTile* special_tile = worldmap->at_special_tile();
           if(special_tile && special_tile->passive_message)
-            special_tile->display_map_message_timer.start(DISPLAY_MAP_MESSAGE_TIME);
+            {
+            worldmap->passive_message = special_tile->display_map_message;
+            worldmap->passive_message_timer.start(DISPLAY_MAP_MESSAGE_TIME);
+            }
 
           if (worldmap->at(tile_pos)->stop || (special_tile && 
               !special_tile->passive_message))
@@ -470,7 +474,6 @@ WorldMap::load_map()
                       special_tile.passive_message = false;
                       if(!special_tile.display_map_message.empty())
                         special_tile.passive_message = true;
-                      special_tile.display_map_message_timer.init(true);
                       reader.read_string("map-message", special_tile.display_map_message);
                       reader.read_string("next-world", special_tile.next_worldmap);
                       reader.read_string("level", special_tile.level_name, true);
@@ -537,7 +540,7 @@ void WorldMap::get_level_title(SpecialTile& special_tile)
   LispReader* reader = LispReader::load(datadir + "/levels/" + special_tile.level_name, "supertux-level");
   if(!reader)
     {
-    std::cerr << "Error: Could not open special_tile file. Ignoring...\n";
+    std::cerr << "Error: Could not open level file. Ignoring...\n";
     return;
     }
 
@@ -995,18 +998,11 @@ WorldMap::draw_status(DrawingContext& context)
             }
         }
     }
-  for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i)
-    {
-    /* Display a passive message in the map, if any as been selected */
-    if(i->display_map_message_timer.check())
-      {
-      if(!i->display_map_message.empty())
-        context.draw_text_center(gold_text, i->display_map_message, 
-                Vector(0, screen->h - white_text->get_height() - 60),
-                LAYER_FOREGROUND1);
-      break;
-      }
-    }
+  /* Display a passive message in the map, if needed */
+  if(passive_message_timer.check())
+    context.draw_text_center(gold_text, passive_message, 
+            Vector(0, screen->h - white_text->get_height() - 60),
+            LAYER_FOREGROUND1);
 }
 
 void
@@ -1018,24 +1014,23 @@ WorldMap::display()
 
   song = SoundManager::get()->load_music(datadir +  "/music/" + music);
   SoundManager::get()->play_music(song);
-  
-  unsigned int last_update_time;
-  unsigned int update_time;
 
-  last_update_time = update_time = Ticks::get();
+  FrameRate frame_rate(10);
+  frame_rate.set_frame_limit(false);
+
+  frame_rate.start();
 
   DrawingContext context;
   while(!quit)
     {
-      float delta = ((float)(update_time-last_update_time))/100.0;
+      float delta = frame_rate.get();
 
       delta *= 1.3f;
 
       if (delta > 10.0f)
         delta = .3f;
-      
-      last_update_time = update_time;
-      update_time      = Ticks::get();
+       
+      frame_rate.update();
 
       Vector tux_pos = tux->get_pos();
       if (1)
@@ -1053,7 +1048,7 @@ WorldMap::display()
       draw(context, offset);
       get_input();
       update(delta);
-
+      
       if(Menu::current())
         {
           Menu::current()->draw(context);