git.y1.nz

commit 8fa2eb2a26ad7072870bdbbab2f94fafc045e110
parent 95ec5fd532dea6b90a02a98caa64b514d20ee169
Author: Toxa <untoxa@mail.ru>
Date:   Thu, 18 Apr 2024 20:36:00 +0300

include tiles from source tilesets if -use_structs specified

Diffstat:
M
gbdk-support/png2asset/process_arguments.cpp
7
++++++-

1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gbdk-support/png2asset/process_arguments.cpp b/gbdk-support/png2asset/process_arguments.cpp
@@ -289,7 +289,7 @@ int processPNG2AssetArguments(int argc, char* argv[], PNG2AssetArguments* args) 
         }
         else if(!strcmp(argv[i], "-source_tileset"))
         {
-            args->includeTileData = false;
+//            args->includeTileData = false;
             args->source_tilesets.push_back(argv[++i]);
         }
         else if(!strcmp(argv[i], "-entity_tileset"))
@@ -313,6 +313,11 @@ int processPNG2AssetArguments(int argc, char* argv[], PNG2AssetArguments* args) 
         }
     }
 
+    // if not use_structs then always don't include tiledata from the source dataset(s)
+    if ((args->source_tilesets.size()) && (!args->use_structs)) {
+        args->includeTileData = false;        
+    }
+
 
     int slash_pos = (int)args->output_filename.find_last_of('/');
     if(slash_pos == -1)

This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.