1 files changed, 21 insertions, 23 deletions

@@ -264,15 +264,32 @@ int main(int argc, char** argv) {
     itemised.push_back(std::move(newLayer));
   }
 
+  constexpr int TILES_PER_ROW = 10;
+  int sheetWidth;
+  int sheetHeight;
 
+  if (metatiles.size() < TILES_PER_ROW) {
+    sheetWidth = metatiles.size() * 16;
+    sheetHeight = 16;
+  } else {
+    sheetWidth = TILES_PER_ROW * 16;
+    sheetHeight = (metatiles.size() / TILES_PER_ROW + 1) * 16;
+  }
 
+  // Generate map datafile.
   std::ofstream mapfile("out.tmx");
   mapfile << R"(<map version="1.0" orientation="orthogonal" renderorder="right-down" width=")";
   mapfile << width;
   mapfile << R"(" height=")";
   mapfile << height;
   mapfile << R"(" tilewidth="16" tileheight="16">)" << std::endl;
-  mapfile << R"(  <tileset firstgid="0" source="out.tsx" />)" << std::endl;
+  mapfile << R"(  <tileset firstgid="1" name="fromRom" tilewidth="16" tileheight="16" tilecount=")";
+  mapfile << metatiles.size();
+  mapfile << R"(" columns=")";
+  mapfile << TILES_PER_ROW;
+  mapfile << R"(">)" << std::endl;
+  mapfile << R"(    <image source="tiles.png" />)" << std::endl;
+  mapfile << R"(  </tileset>)" << std::endl;
 
   for (int layer=itemised.size()-1; layer>=0; layer--) {
     mapfile << R"(  <layer id=")";
@@ -294,7 +311,7 @@ int main(int argc, char** argv) {
         mapfile << ",";
       }
 
-      unsigned int outChar = tu.id;
+      unsigned int outChar = tu.id + 1;
       if (tu.tflipx) outChar |= 0x80000000;
       if (tu.tflipy) outChar |= 0x40000000;
       mapfile << outChar;
@@ -306,6 +323,7 @@ int main(int argc, char** argv) {
 
   mapfile << R"(</map>)" << std::endl;
 
+  // Render map to image.
   for (int layer=itemised.size()-1; layer>=0; layer--) {
     for (int mapy = 0; mapy < height; mapy++) {
       for (int mapx = 0; mapx < width; mapx++) {
@@ -319,27 +337,7 @@ int main(int argc, char** argv) {
   image.magick("png");
   image.write("out.png");
 
-  constexpr int TILES_PER_ROW = 10;
-  int sheetWidth;
-  int sheetHeight;
-
-  if (metatiles.size() < TILES_PER_ROW) {
-    sheetWidth = metatiles.size() * 16;
-    sheetHeight = 16;
-  } else {
-    sheetWidth = TILES_PER_ROW * 16;
-    sheetHeight = (metatiles.size() / TILES_PER_ROW + 1) * 16;
-  }
-
-  std::ofstream tilesetfile("out.tsx");
-  tilesetfile << R"(<tileset name="fromRom" tilewidth="16" tileheight="16" tilecount=")";
-  tilesetfile << metatiles.size();
-  tilesetfile << R"(" columns=")";
-  tilesetfile << TILES_PER_ROW;
-  tilesetfile << R"(">)" << std::endl;
-  tilesetfile << R"(  <image source="tiles.png" />)" << std::endl;
-  tilesetfile << R"(</tileset>)" << std::endl;
-
+  // Render tileset image.
   Magick::Image tilesetImage(Magick::Geometry(sheetWidth, sheetHeight), "transparent");
   for (int i=0; i<metatiles.size(); i++) {
     Magick::Image tileRender = renderTile(metatiles.get(i), false, false, palettes, mapTiles, tilesets);