Add optional lpSecurityAttributes parameter to CreateDirectory call to make compilati...

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

diff --git a/src/supertux/sector.cpp b/src/supertux/sector.cpp
index b5c7580..409ec87 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(),
@@ -226,7 +228,7 @@ Sector::parse(const Reader& sector)
 
   update_game_objects();
 
-  if(solid_tilemaps.size() < 1) { log_warning << "sector '" << name << "' does not contain a solid tile layer." << std::endl; }
+  if(solid_tilemaps.empty()) { log_warning << "sector '" << name << "' does not contain a solid tile layer." << std::endl; }
 
   fix_old_tiles();
   if(!camera) {
@@ -391,7 +393,7 @@ Sector::parse_old_format(const Reader& reader)
 
   update_game_objects();
 
-  if(solid_tilemaps.size() < 1) { log_warning << "sector '" << name << "' does not contain a solid tile layer." << std::endl; }
+  if(solid_tilemaps.empty()) { log_warning << "sector '" << name << "' does not contain a solid tile layer." << std::endl; }
 
   fix_old_tiles();
   update_game_objects();
@@ -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_tilemaps;
+  for(auto i = gameobjects.begin(); i != gameobjects.end(); ++i)
+  {
+    SecretAreaTrigger* trigger = dynamic_cast<SecretAreaTrigger*>(i->get());
+    if (!trigger) continue;
+    secret_area_tilemaps.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_tilemaps.begin(), secret_area_tilemaps.end(), tm->get_name())
+            != secret_area_tilemaps.end() || tm->is_solid())
+      {
+        layer = tm->get_layer();
+      }
     }
   }
   return layer;
@@ -1452,23 +1468,6 @@ Sector::is_free_of_movingstatics(const Rectf& rect, const MovingObject* ignore_o
 }
 
 bool
-Sector::add_bullet(const Vector& pos, const PlayerStatus* player_status, float xm, Direction dir)
-{
-  // TODO remove this function and move these checks elsewhere...
-  if((player_status->bonus == FIRE_BONUS &&
-      (int)bullets.size() >= player_status->max_fire_bullets) ||
-     (player_status->bonus == ICE_BONUS &&
-      (int)bullets.size() >= player_status->max_ice_bullets))
-    return false;
-  auto new_bullet = std::make_shared<Bullet>(pos, xm, dir, player_status->bonus);
-  add_object(new_bullet);
-
-  SoundManager::current()->play("sounds/shoot.wav");
-
-  return true;
-}
-
-bool
 Sector::add_smoke_cloud(const Vector& pos)
 {
   add_object(std::make_shared<SmokeCloud>(pos));