Fix various issues with sectors without any solid tilemap (#2228)

Author: mrkubax10

src/editor/layers_widget.cpp

@@ -312,6 +312,7 @@ EditorLayersWidget::refresh()
   m_layer_icons.clear();
 
   bool tsel = false;
+  TileMap* first_tm = nullptr;
   for (auto& i : m_editor.get_sector()->get_objects())
   {
     auto* go = i.get();
@@ -323,6 +324,8 @@ EditorLayersWidget::refresh()
 
       auto tm = dynamic_cast<TileMap*>(go);
       if (tm) {
+        if (first_tm == nullptr)
+          first_tm = tm;
         if ( !tm->is_solid() || tsel ) {
           tm->m_editor_active = false;
         } else {
@@ -333,6 +336,11 @@ EditorLayersWidget::refresh()
       }
     }
   }
+  if (!tsel && first_tm != nullptr)
+  {
+    first_tm->m_editor_active = true;
+    m_selected_tilemap = first_tm;
+  }
 
   sort_layers();
   refresh_sector_text();

src/supertux/game_object_manager.cpp

@@ -28,6 +28,7 @@ GameObjectManager::GameObjectManager() :
   m_gameobjects(),
   m_gameobjects_new(),
   m_solid_tilemaps(),
+  m_all_tilemaps(),
   m_objects_by_name(),
   m_objects_by_uid(),
   m_objects_by_type_index(),
@@ -198,18 +199,7 @@ GameObjectManager::flush_game_objects()
       }
     }
   }
-  update_solids();
-}
-
-void
-GameObjectManager::update_solids() 
-{
-  m_solid_tilemaps.clear();
-  for (auto tilemap : get_objects_by_type_index(typeid(TileMap)))
-  {
-    TileMap* tm = static_cast<TileMap*>(tilemap);
-    if (tm->is_solid()) m_solid_tilemaps.push_back(tm);
-  }
+  update_tilemaps();
 }
 
 void 
@@ -222,6 +212,20 @@ GameObjectManager::update_solid(TileMap* tm) {
     m_solid_tilemaps.erase(it);
   }
 }
+
+void
+GameObjectManager::update_tilemaps()
+{
+  m_solid_tilemaps.clear();
+  m_all_tilemaps.clear();
+  for (auto tilemap : get_objects_by_type_index(typeid(TileMap)))
+  {
+    TileMap* tm = static_cast<TileMap*>(tilemap);
+    if (tm->is_solid()) m_solid_tilemaps.push_back(tm);
+    m_all_tilemaps.push_back(tm);
+  }
+}
+
 void
 GameObjectManager::this_before_object_add(GameObject& object)
 {
@@ -270,8 +274,8 @@ float
 GameObjectManager::get_width() const
 {
   float width = 0;
-  for (auto& solids: get_solid_tilemaps()) {
-    width = std::max(width, solids->get_bbox().get_right());
+  for (auto& tilemap: get_all_tilemaps()) {
+    width = std::max(width, tilemap->get_bbox().get_right());
   }
 
   return width;
@@ -281,8 +285,8 @@ float
 GameObjectManager::get_height() const
 {
   float height = 0;
-  for (const auto& solids: get_solid_tilemaps()) {
-    height = std::max(height, solids->get_bbox().get_bottom());
+  for (const auto& tilemap: get_all_tilemaps()) {
+    height = std::max(height, tilemap->get_bbox().get_bottom());
   }
 
   return height;
@@ -292,9 +296,9 @@ float
 GameObjectManager::get_tiles_width() const
 {
   float width = 0;
-  for (const auto& solids : get_solid_tilemaps()) {
-    if (static_cast<float>(solids->get_width()) > width)
-      width = static_cast<float>(solids->get_width());
+  for (const auto& tilemap : get_all_tilemaps()) {
+    if (static_cast<float>(tilemap->get_width()) > width)
+      width = static_cast<float>(tilemap->get_width());
   }
   return width;
 }
@@ -303,9 +307,9 @@ float
 GameObjectManager::get_tiles_height() const
 {
   float height = 0;
-  for (const auto& solids : get_solid_tilemaps()) {
-    if (static_cast<float>(solids->get_height()) > height)
-      height = static_cast<float>(solids->get_height());
+  for (const auto& tilemap : get_all_tilemaps()) {
+    if (static_cast<float>(tilemap->get_height()) > height)
+      height = static_cast<float>(tilemap->get_height());
   }
   return height;
 }

src/supertux/game_object_manager.hpp

@@ -178,11 +178,13 @@ class GameObjectManager
   }
 
   const std::vector<TileMap*>& get_solid_tilemaps() const { return m_solid_tilemaps; }
+  const std::vector<TileMap*>& get_all_tilemaps() const { return m_all_tilemaps; }
 
-  void update_solids();
   void update_solid(TileMap* solid);
 
 protected:
+  void update_tilemaps();
+
   void process_resolve_requests();
 
   /** Same as process_resolve_requests(), but those it can't find will be kept in the buffer */
@@ -214,6 +216,9 @@ class GameObjectManager
   /** Fast access to solid tilemaps */
   std::vector<TileMap*> m_solid_tilemaps;
 
+  /** Fast access to all tilemaps */
+  std::vector<TileMap*> m_all_tilemaps;
+
   std::unordered_map<std::string, GameObject*> m_objects_by_name;
   std::unordered_map<UID, GameObject*> m_objects_by_uid;
   std::unordered_map<std::type_index, std::vector<GameObject*> > m_objects_by_type_index;

src/supertux/sector.cpp

@@ -538,8 +538,8 @@ Sector::can_see_player(const Vector& eye) const
 bool
 Sector::inside(const Rectf& rect) const
 {
-  for (const auto& solids : get_solid_tilemaps()) {
-    Rectf bbox = solids->get_bbox();
+  for (const auto& tilemap : get_all_tilemaps()) {
+    Rectf bbox = tilemap->get_bbox();
 
     // the top of the sector extends to infinity
     if (bbox.get_left() <= rect.get_left() &&
@@ -554,14 +554,14 @@ Sector::inside(const Rectf& rect) const
 Size
 Sector::get_editor_size() const
 {
-  // Find the solid tilemap with the greatest surface
+  // Find the tilemap with the greatest surface
   size_t max_surface = 0;
   Size size;
-  for (const auto& solids: get_solid_tilemaps()) {
-    size_t surface = solids->get_width() * solids->get_height();
+  for (const auto& tilemap : get_all_tilemaps()) {
+    size_t surface = tilemap->get_width() * tilemap->get_height();
     if (surface > max_surface) {
       max_surface = surface;
-      size = solids->get_size();
+      size = tilemap->get_size();
     }
   }
 

src/worldmap/worldmap_parser.cpp

@@ -146,7 +146,7 @@ WorldMapParser::load_worldmap(const std::string& filename)
     m_worldmap.flush_game_objects();
 
     if (m_worldmap.get_solid_tilemaps().empty())
-      throw std::runtime_error("No solid tilemap specified");
+      log_warning << "No solid tilemap specified" << std::endl;
 
     m_worldmap.move_to_spawnpoint("main");