git.y1.nz

commit c53bfe7f24cdd092d8cbced99f38395095f241fc
parent 61d9834827840685e69e373f57f2b6ef97ae2731
Author: Toxa <untoxa@mail.ru>
Date:   Fri, 29 Jan 2021 20:41:49 +0300

Merge branch 'develop' of https://github.com/Zal0/gbdk-2020 into develop

Diffstat:
M
gbdk-support/png2mtspr/Makefile
3
++-
M
gbdk-support/png2mtspr/png2mtspr.cpp
6
++++--

2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/gbdk-support/png2mtspr/Makefile b/gbdk-support/png2mtspr/Makefile
@@ -3,10 +3,11 @@
  
 CXX = g++
 CXXFLAGS = -Os -Wall -g
-LFLAGS = -g -static
+LFLAGS = -g
 
 ifeq ($(OS),Windows_NT)
 	EXT = .exe
+	LFLAGS += -static 
 endif
  
 # ****************************************************
diff --git a/gbdk-support/png2mtspr/png2mtspr.cpp b/gbdk-support/png2mtspr/png2mtspr.cpp
@@ -64,10 +64,10 @@ struct MTTile
 {
 	char offset_x;
 	char offset_y;
-	char offset_idx;
+	unsigned char offset_idx;
 	unsigned char props;
 
-	MTTile(unsigned char offset_x, unsigned char offset_y, unsigned char offset_idx, unsigned char props) : offset_x(offset_x), offset_y(offset_y), offset_idx(offset_idx), props(props) {}
+	MTTile(char offset_x, char offset_y, unsigned char offset_idx, unsigned char props) : offset_x(offset_x), offset_y(offset_y), offset_idx(offset_idx), props(props) {}
 	MTTile() : offset_x(0), offset_y(0), offset_idx(0), props(0) {}
 };
 
@@ -178,6 +178,8 @@ void GetMetaSprite(int _x, int _y, int _w, int _h)
 			}
 		}
 	}
+	if(mt_sprite.size() == 0)
+		sprites.pop_back();
 }
 
 int main(int argc, char *argv[])

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