Fix nested imports

Author: Narre

src/supertux/tile_set_parser.cpp

@@ -39,16 +39,23 @@ TileSetParser::TileSetParser(TileSet& tileset, const std::string& filename) :
 }
 
 void
-TileSetParser::parse(uint32_t start, uint32_t end, int32_t offset, bool imported)
+TileSetParser::parse(int32_t start, int32_t end, int32_t offset, bool imported)
 {
-  if (offset && static_cast<int32_t>(start) + offset < 1) {
+  if (offset && start + offset < 1) {
     start = -offset + 1;
     log_warning << "The defined offset would assign non-positive ids to tiles, tiles below " << -offset + 1 << " will be ignored." << std::endl;
   }
-  if (end < start) {
-    log_warning << "The defined range has a negative size, no tiles will be imported." << std::endl;
+  if (end < 0) {
+    log_warning << "Cannot import tiles with negative IDs." << std::endl;
     return;
   }
+  if (start < 0) {
+    log_warning << "Cannot import tiles with negative IDs. Importing will start at ID 1." << std::endl;
+    start = 1;
+  }
+  if (imported && !end) {
+    log_warning << "Importing a tileset with no upper ID limit can cause ID conflicts if the imported tileset is expanded in the future." <<std::endl;
+  }
 
   m_tiles_path = FileSystem::dirname(m_filename);
 
@@ -104,12 +111,22 @@ TileSetParser::parse(uint32_t start, uint32_t end, int32_t offset, bool imported
     {
       ReaderMapping reader = iter.as_mapping();
       std::string import_filename;
-      uint32_t import_start = 0, import_end = 0;
-      int32_t import_offset = 0;
+      int32_t import_start = 0, import_end = 0, import_offset = 0;
       reader.get("file", import_filename);
       reader.get("start", import_start);
       reader.get("end", import_end);
       reader.get("offset", import_offset);
+      if (import_start + import_offset < start) {
+        import_start = (start - import_offset) < 0 ? 0 : (start - import_offset);
+      }
+      if (end && (!import_end || (import_end + import_offset) > end)) {
+        import_end = end - import_offset;
+      }
+      if (import_end < import_start) {
+        if (!imported) log_warning << "The defined range has a negative size, no tiles will be imported." << std::endl;
+        continue;
+      }
+      import_offset += offset;
       TileSetParser import_parser(m_tileset, import_filename);
       import_parser.parse(import_start, import_end, import_offset, true);
     }
@@ -126,14 +143,14 @@ TileSetParser::parse(uint32_t start, uint32_t end, int32_t offset, bool imported
 }
 
 void
-TileSetParser::parse_tile(const ReaderMapping& reader, uint32_t min, uint32_t max, int32_t offset)
+TileSetParser::parse_tile(const ReaderMapping& reader, int32_t min, int32_t max, int32_t offset)
 {
   uint32_t id;
   if (!reader.get("id", id))
   {
     throw std::runtime_error("Missing tile-id.");
   }
-  if (max && (id < min || id > max)) return;
+  if (max && (id < static_cast<uint32_t>(min) || id > static_cast<uint32_t>(max))) return;
   id += offset;
 
   uint32_t attributes = 0;
@@ -211,7 +228,7 @@ TileSetParser::parse_tile(const ReaderMapping& reader, uint32_t min, uint32_t ma
 }
 
 void
-TileSetParser::parse_tiles(const ReaderMapping& reader, uint32_t min, uint32_t max, int32_t offset)
+TileSetParser::parse_tiles(const ReaderMapping& reader, int32_t min, int32_t max, int32_t offset)
 {
   // List of ids (use 0 if the tile should be ignored)
   std::vector<uint32_t> ids;
@@ -300,7 +317,7 @@ TileSetParser::parse_tiles(const ReaderMapping& reader, uint32_t min, uint32_t m
 
       for (size_t i = 0; i < ids.size(); ++i)
       {
-        if (!ids[i] || (max && (ids[i] < min || ids[i] > max))) continue;
+        if (!ids[i] || (max && (ids[i] < static_cast<uint32_t>(min) || ids[i] > static_cast<uint32_t>(max)))) continue;
         ids[i] += offset;
 
         const int x = static_cast<int>(32 * (i % width));
@@ -333,7 +350,7 @@ TileSetParser::parse_tiles(const ReaderMapping& reader, uint32_t min, uint32_t m
     {
       for (size_t i = 0; i < ids.size(); ++i)
       {
-        if(!ids[i] || (max && (ids[i] < min || ids[i] > max))) continue;
+        if(!ids[i] || (max && (ids[i] < static_cast<uint32_t>(min) || ids[i] > static_cast<uint32_t>(max)))) continue;
         ids[i] += offset;
 
         int x = static_cast<int>(32 * (i % width));

src/supertux/tile_set_parser.hpp

@@ -38,11 +38,11 @@ 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, bool imported = false);
+  void parse(int32_t start = 0, int32_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);
-  void parse_tiles(const ReaderMapping& reader, uint32_t min, uint32_t max, int32_t offset);
+  void parse_tile(const ReaderMapping& reader, int32_t min, int32_t max, int32_t offset);
+  void parse_tiles(const ReaderMapping& reader, int32_t min, int32_t max, int32_t offset);
   std::vector<SurfacePtr> parse_imagespecs(const ReaderMapping& cur,
                                            const boost::optional<Rect>& region = boost::none) const;