- Allow custom leveldots

[supertux.git] / src / worldmap.cpp

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index c6f9053..37ef759 100644 (file)
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -132,7 +132,7 @@ Tux::~Tux()
 void
 Tux::draw(DrawingContext& context)
 {
-  switch (player_status.bonus) {
+  switch (player_status->bonus) {
     case GROWUP_BONUS:
       tux_sprite->set_action("large");
       break;
@@ -352,8 +352,6 @@ WorldMap::WorldMap()
   tux = new Tux(this);
   add_object(tux);
     
-  leveldot_green= new Surface("images/worldmap/common/leveldot_green.png", true);
-  leveldot_red = new Surface("images/worldmap/common/leveldot_red.png", true);
   messagedot = new Surface("images/worldmap/common/messagedot.png", true);
   teleporterdot = new Surface("images/worldmap/common/teleporterdot.png", true);
 
@@ -371,11 +369,13 @@ WorldMap::~WorldMap()
       i != spawn_points.end(); ++i) {
     delete *i;
   }
-    
+  for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) {
+    Level& level = *i;
+    delete level.sprite;
+  }
+  
   delete tile_manager;
 
-  delete leveldot_green;
-  delete leveldot_red;
   delete messagedot;
   delete teleporterdot;
 }
@@ -516,6 +516,10 @@ WorldMap::parse_level_tile(const lisp::Lisp* level_lisp)
   level.south = true;
   level.west  = true;
 
+  std::string sprite = "leveldot";
+  level_lisp->get("sprite", sprite);
+  level.sprite = sprite_manager->create(sprite);
+
   level_lisp->get("extro-script", level.extro_script);
   level_lisp->get("next-worldmap", level.next_worldmap);
 
@@ -713,7 +717,7 @@ WorldMap::update(float delta)
         if (special_tile->teleport_dest != Vector(-1,-1))
           {
           // TODO: an animation, camera scrolling or a fading would be a nice touch
-          sound_manager->play("sounds/warp.ogg");
+          sound_manager->play("sounds/warp.wav");
           tux->back_direction = D_NONE;
           tux->set_tile_pos(special_tile->teleport_dest);
           SDL_Delay(1000);
@@ -735,7 +739,8 @@ WorldMap::update(float delta)
       if (level->pos == tux->get_tile_pos())
         {
           sound_manager->stop_music();
-          PlayerStatus old_player_status = player_status;
+          PlayerStatus old_player_status;
+          old_player_status = *player_status;
 
           // do a shriking fade to the level
           shrink_fade(Vector((level->pos.x*32 + 16 + offset.x),
@@ -750,6 +755,7 @@ WorldMap::update(float delta)
                 level_finished = true;
                 bool old_level_state = level->solved;
                 level->solved = true;
+                level->sprite->set_action("solved");
 
                 // deal with statistics
                 level->statistics.merge(global_stats);
@@ -787,9 +793,9 @@ WorldMap::update(float delta)
               level_finished = false;
               /* In case the player's abort the level, keep it using the old
                   status. But the minimum lives and no bonus. */
-              player_status.coins = old_player_status.coins;
-              player_status.lives = std::min(old_player_status.lives, player_status.lives);
-              player_status.bonus = NO_BONUS;
+              player_status->coins = old_player_status.coins;
+              player_status->lives = std::min(old_player_status.lives, player_status->lives);
+              player_status->bonus = NO_BONUS;
 
               break;
             case GameSession::ES_GAME_OVER:
@@ -808,7 +814,7 @@ WorldMap::update(float delta)
               context.draw_text(blue_text, _("GAMEOVER"), 
                   Vector(SCREEN_WIDTH/2, 200), CENTER_ALLIGN, LAYER_FOREGROUND1);
 
-              sprintf(str, _("COINS: %d"), player_status.coins);
+              sprintf(str, _("COINS: %d"), player_status->coins);
               context.draw_text(gold_text, str,
                   Vector(SCREEN_WIDTH/2, SCREEN_WIDTH - 32), CENTER_ALLIGN,
                   LAYER_FOREGROUND1);
@@ -820,7 +826,7 @@ WorldMap::update(float delta)
               wait_for_event(2.0, 6.0);
 
               quit = true;
-              player_status.reset();
+              player_status->reset();
               break;
               }
             case GameSession::ES_NONE:
@@ -905,12 +911,8 @@ WorldMap::draw(DrawingContext& context)
   
   for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
     {
-      if (i->solved)
-        context.draw_surface(leveldot_green,
-            Vector(i->pos.x*32, i->pos.y*32), LAYER_TILES+1);
-      else
-        context.draw_surface(leveldot_red,
-            Vector(i->pos.x*32, i->pos.y*32), LAYER_TILES+1);
+      const Level& level = *i;
+      level.sprite->draw(context, level.pos*32 + Vector(16, 16), LAYER_TILES+1);
     }
 
   for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i)
@@ -936,7 +938,7 @@ WorldMap::draw_status(DrawingContext& context)
   context.push_transform();
   context.set_translation(Vector(0, 0));
  
-  player_status.draw(context);
+  player_status->draw(context);
 
   if (!tux->is_moving())
     {
@@ -1078,7 +1080,7 @@ WorldMap::savegame(const std::string& filename)
   writer.write_float("x", tux->get_tile_pos().x);
   writer.write_float("y", tux->get_tile_pos().y);
   writer.write_string("back", direction_to_string(tux->back_direction));
-  player_status.write(writer);
+  player_status->write(writer);
   writer.write_string("back", direction_to_string(tux->back_direction));
 
   writer.end_list("tux");
@@ -1124,11 +1126,11 @@ WorldMap::loadgame(const std::string& filename)
     load_map(); 
 
     savegame->get("intro-displayed", intro_displayed);
-    savegame->get("lives", player_status.lives);
-    savegame->get("coins", player_status.coins);
-    savegame->get("max-score-multiplier", player_status.max_score_multiplier);
-    if (player_status.lives < 0)
-      player_status.reset();
+    savegame->get("lives", player_status->lives);
+    savegame->get("coins", player_status->coins);
+    savegame->get("max-score-multiplier", player_status->max_score_multiplier);
+    if (player_status->lives < 0)
+      player_status->reset();
 
     const lisp::Lisp* tux_lisp = savegame->get_lisp("tux");
     if(tux)
@@ -1139,7 +1141,7 @@ WorldMap::loadgame(const std::string& filename)
       tux_lisp->get("x", p.x);
       tux_lisp->get("y", p.y);
       tux_lisp->get("back", back_str);
-      player_status.read(*tux_lisp);
+      player_status->read(*tux_lisp);
       
       tux->back_direction = string_to_direction(back_str);      
       tux->set_tile_pos(p);
@@ -1162,6 +1164,7 @@ WorldMap::loadgame(const std::string& filename)
             if (name == i->name)
             {
               i->solved = solved;
+              i->sprite->set_action(solved ? "solved" : "default");
               i->statistics.parse(*level);
               break;
             }
@@ -1176,7 +1179,7 @@ WorldMap::loadgame(const std::string& filename)
     std::cerr << "Problem loading game '" << filename << "': " << e.what() 
               << "\n";
     load_map();
-    player_status.reset();
+    player_status->reset();
   }
 
   calculate_total_stats();