Add a proper check for whether a tileset is imported

Author: Narre

src/supertux/tile_set_parser.cpp

@@ -39,7 +39,7 @@ TileSetParser::TileSetParser(TileSet& tileset, const std::string& filename) :
 }
 
 void
-TileSetParser::parse(uint32_t start, uint32_t end, int32_t offset)
+TileSetParser::parse(uint32_t start, uint32_t end, int32_t offset, bool imported)
 {
   if (offset && static_cast<int32_t>(start) + offset < 1) {
     start = -offset + 1;
@@ -70,8 +70,8 @@ TileSetParser::parse(uint32_t start, uint32_t end, int32_t offset)
     else if (iter.get_key() == "tilegroup")
     {
       /* tilegroups are only interesting for the editor */
-      /* ignore tilegroups for imported tilesets unless there's no limit and no offset*/
-      if (start || end || offset) continue;
+      /* ignore tilegroups for imported tilesets */
+      if (imported) continue;
       ReaderMapping reader = iter.as_mapping();
       Tilegroup tilegroup;
       reader.get("name", tilegroup.name);
@@ -85,8 +85,8 @@ TileSetParser::parse(uint32_t start, uint32_t end, int32_t offset)
     }
     else if (iter.get_key() == "autotileset")
     {
-      /* ignore autotiles for imported tilesets unless there's no limit and no offset */
-      if (start || end || offset) continue;
+      /* ignore autotiles for imported tilesets */
+      if (imported) continue;
       ReaderMapping reader = iter.as_mapping();
       std::string autotile_filename;
       if (!reader.get("source", autotile_filename))
@@ -111,15 +111,15 @@ TileSetParser::parse(uint32_t start, uint32_t end, int32_t offset)
       reader.get("end", import_end);
       reader.get("offset", import_offset);
       TileSetParser import_parser(m_tileset, import_filename);
-      import_parser.parse(import_start, import_end, import_offset);
+      import_parser.parse(import_start, import_end, import_offset, true);
     }
     else
     {
       log_warning << "Unknown symbol '" << iter.get_key() << "' in tileset file" << std::endl;
     }
   }
   /* only create the unassigned tilegroup from the parent strf */
-  if (g_config->developer_mode && !end)
+  if (g_config->developer_mode && !imported)
   {
     m_tileset.add_unassigned_tilegroup();
   }

src/supertux/tile_set_parser.hpp

@@ -38,7 +38,7 @@ class TileSetParser final
 public:
   TileSetParser(TileSet& tileset, const std::string& filename);
 
-  void parse(uint32_t start = 0, uint32_t end = 0, int32_t offset = 0);
+  void parse(uint32_t start = 0, uint32_t end = 0, int32_t offset = 0, bool imported = false);
 
 private:
   void parse_tile(const ReaderMapping& reader, uint32_t min, uint32_t max, int32_t offset);