git.y1.nz

commit 11210e7e936a5c3e349a2b9dfd94454f44796fd2
parent 4afbca170cc1ab0a89536b5b30d2a8312012b76f
Author: bbbbbr <bbbbbr@users.noreply.github.com>
Date:   Mon,  7 Aug 2023 12:28:35 -0700

Merge pull request #564 from dekstop/develop

Bugfix: skip keep_duplicate_tiles logic when using a source_tileset
Diffstat:
M
gbdk-support/png2asset/png2asset.cpp
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gbdk-support/png2asset/png2asset.cpp b/gbdk-support/png2asset/png2asset.cpp
@@ -184,7 +184,7 @@ void GetMetaSprite(int _x, int _y, int _w, int _h, int pivot_x, int pivot_y)
 				unsigned char props;
 				unsigned char pal_idx = image.data[y * image.w + x] >> 2; //We can pick the palette from the first pixel of this tile
 
-				if(keep_duplicate_tiles)
+				if((!use_source_tileset) && keep_duplicate_tiles)
 				{
 					tiles.push_back(tile);
 					idx = tiles.size() - 1;
@@ -233,7 +233,7 @@ void GetMap()
 			size_t idx;
 			unsigned char props;
 
-			if(keep_duplicate_tiles)
+			if((!use_source_tileset) && keep_duplicate_tiles)
 			{
 				tiles.push_back(tile);
 				idx = tiles.size() - 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.