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 747aa7d..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,6 +38,8 @@
 #include "app/gettext.h"
 #include "misc.h"
 
+#define DISPLAY_MAP_MESSAGE_TIME 2800
+
 Menu* worldmap_menu  = 0;
 
 namespace WorldMapNS {
@@ -294,7 +297,15 @@ Tux::action(float delta)
         { // We reached the next tile, so we check what to do now
           offset -= 32;
 
-          if (worldmap->at(tile_pos)->stop || worldmap->at_special_tile())
+          WorldMap::SpecialTile* special_tile = worldmap->at_special_tile();
+          if(special_tile && special_tile->passive_message)
+            {
+            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))
             {
               stop();
             }
@@ -388,9 +399,9 @@ WorldMap::WorldMap()
   start_x = 4;
   start_y = 5;
   
-  level_sprite = new Surface(datadir +  "/images/worldmap/levelmarker.png", true);
   leveldot_green = new Surface(datadir +  "/images/worldmap/leveldot_green.png", true);
   leveldot_red = new Surface(datadir +  "/images/worldmap/leveldot_red.png", true);
+  messagedot   = new Surface(datadir +  "/images/worldmap/messagedot.png", true);
 
   enter_level = false;
 
@@ -403,9 +414,9 @@ WorldMap::~WorldMap()
   delete tux;
   delete tile_manager;
 
-  delete level_sprite;
   delete leveldot_green;
   delete leveldot_red;
+  delete messagedot;
 }
 
 void
@@ -459,6 +470,10 @@ WorldMap::load_map()
                       special_tile.west  = true;
 
                       reader.read_string("extro-filename", special_tile.extro_filename);
+                      reader.read_string("passive-message", special_tile.display_map_message);
+                      special_tile.passive_message = false;
+                      if(!special_tile.display_map_message.empty())
+                        special_tile.passive_message = 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);
@@ -525,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;
     }
 
@@ -704,7 +719,7 @@ WorldMap::update(float delta)
             {
               PlayerStatus old_player_status = player_status;
 
-              std::cout << "Enter the current special_tile: " << special_tile->level_name << std::endl;
+              std::cout << "Enter the current level: " << special_tile->level_name << std::endl;
               // do a shriking fade to the special_tile
               shrink_fade(Vector((special_tile->x*32 + 16 + offset.x),(special_tile->y*32 + 16
                       + offset.y)), 500);
@@ -902,7 +917,13 @@ WorldMap::draw(DrawingContext& context, const Vector& offset)
   for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i)
     {
       if(i->level_name.empty())
+        {
+        if (!i->display_map_message.empty() && !i->passive_message)
+          context.draw_surface(messagedot,
+              Vector(i->x*32 + offset.x, i->y*32 + offset.y), LAYER_TILES+1);
+
         continue;
+        }
 
       if (i->solved)
         context.draw_surface(leveldot_green,
@@ -968,7 +989,7 @@ WorldMap::draw_status(DrawingContext& context)
                     LAYER_FOREGROUND1);
                 }
 
-              /* Display a message in the map, if any as been selected */
+              /* Display an in-map message in the map, if any as been selected */
               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),
@@ -977,6 +998,11 @@ WorldMap::draw_status(DrawingContext& context)
             }
         }
     }
+  /* 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
@@ -988,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)
@@ -1023,7 +1048,7 @@ WorldMap::display()
       draw(context, offset);
       get_input();
       update(delta);
-
+      
       if(Menu::current())
         {
           Menu::current()->draw(context);
@@ -1039,7 +1064,7 @@ WorldMap::display()
 void
 WorldMap::savegame(const std::string& filename)
 {
-  if(filename != "")
+  if(filename == "")
     return;
 
   std::cout << "savegame: " << filename << std::endl;