Added a halloween themed brick covered with cobwebs

[supertux.git] / src / supertux / sector.cpp

diff --git a/src/supertux/sector.cpp b/src/supertux/sector.cpp
index b5c7580..4c666d9 100644 (file)
--- a/src/supertux/sector.cpp
+++ b/src/supertux/sector.cpp
@@ -58,6 +58,7 @@
 #include "supertux/savegame.hpp"
 #include "supertux/spawn_point.hpp"
 #include "supertux/tile.hpp"
+#include "trigger/secretarea_trigger.hpp"
 #include "trigger/sequence_trigger.hpp"
 #include "util/file_system.hpp"
 
@@ -76,6 +77,7 @@ Sector::Sector(Level* parent) :
   sector_table(),
   scripts(),
   ambient_light( 1.0f, 1.0f, 1.0f, 1.0f ),
+  foremost_layer(),
   gameobjects(),
   moving_objects(),
   spawnpoints(),
@@ -418,7 +420,9 @@ Sector::fix_old_tiles()
           add_object(std::make_shared<BonusBlock>(pos, tile->getData()));
           solids->change(x, y, 0);
         } else if(tile->getAttributes() & Tile::BRICK) {
-          if( ( id == 78 ) || ( id == 105 ) ){
+          if( ( id == 3159 ) || ( id == 3160 ) ){
+            add_object( std::make_shared<Brick>(pos, tile->getData(), "images/objects/bonus_block/brickWeb.sprite") );
+          } else if( ( id == 78 ) || ( id == 105 ) ){
             add_object( std::make_shared<Brick>(pos, tile->getData(), "images/objects/bonus_block/brickIce.sprite") );
           } else if( ( id == 77 ) || ( id == 104 ) ){
             add_object( std::make_shared<Brick>(pos, tile->getData(), "images/objects/bonus_block/brick.sprite") );
@@ -656,13 +660,25 @@ int
 Sector::calculate_foremost_layer()
 {
   int layer = 0;
+  std::vector<std::string> secret_area_layers;
+  for(auto i = gameobjects.begin(); i != gameobjects.end(); ++i)
+  {
+    SecretAreaTrigger* trigger = dynamic_cast<SecretAreaTrigger*>(i->get());
+    if (!trigger) continue;
+    secret_area_layers.push_back(trigger->get_fade_tilemap_name());
+  }
+
   for(auto i = gameobjects.begin(); i != gameobjects.end(); ++i)
   {
     TileMap* tm = dynamic_cast<TileMap*>(i->get());
     if (!tm) continue;
     if(tm->get_layer() > foremost_layer)
     {
-      foremost_layer = tm->get_layer();
+      if (std::find(secret_area_layers.begin(), secret_area_layers.end(), tm->get_name())
+            != secret_area_layers.end() || tm->is_solid())
+      {
+        layer = tm->get_layer();
+      }
     }
   }
   return layer;