From e62d9fad29bbc049320ec69914aefd43c0f62f78 Mon Sep 17 00:00:00 2001
From: sparky4 <sparky4@cock.li>
Date: Thu, 10 Nov 2022 12:56:23 -0600
Subject: [PATCH] pcxtest.exe and pcxtest2.exe compiles but we are unable to
 test because of compiling problems with doslib. no biggie!

---
 .gitignore                   |   1 +
 16/vgmtools                  |   2 +-
 bcexmm.exe => src/bcexmm.exe | Bin
 src/lib/16_tdef.h            |  20 ++++++++++++++++++--
 src/pcxtest.c                |   4 ++--
 src/pcxtest2.c               |   4 ++--
 6 files changed, 24 insertions(+), 7 deletions(-)
 rename bcexmm.exe => src/bcexmm.exe (100%)

diff --git a/.gitignore b/.gitignore
index 8fe488a5..87dd048a 100755
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ img
 !.git/config
 !.gitmodules
 pcx2vrl
+png2vrl
 pcxsscut
 vrl2vrs
 vrsdump
diff --git a/16/vgmtools b/16/vgmtools
index 227be76a..9d7a9f4b 160000
--- a/16/vgmtools
+++ b/16/vgmtools
@@ -1 +1 @@
-Subproject commit 227be76a9543731cef28e46d2cf690064256515c
+Subproject commit 9d7a9f4b1c40d26949fa730987f6c3eb9cf3e3ec
diff --git a/bcexmm.exe b/src/bcexmm.exe
similarity index 100%
rename from bcexmm.exe
rename to src/bcexmm.exe
diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index e6806a36..fb905910 100755
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -54,6 +54,22 @@ typedef struct {
 	byte *palette;
 } planar_buf_t;
 
+typedef struct {
+	byte *data;
+	word width;
+	word height;
+	byte *palette;
+	word offset;
+} bitmap_t;
+
+typedef struct {
+	byte far **data;
+	word ntiles;		// the number of tiles
+	word twidth;	// width of the tiles
+	word theight;	// height of the tiles
+	byte *palette;	// palette for the tile set
+} tileset_t;
+
 //from 16_sprit.h
 #ifdef	__WATCOMC__
 #include <hw/vga/vrl.h>
@@ -316,8 +332,8 @@ typedef	struct
 	//struct sprite	*spri;	//supposively the sprite sheet data
 	//memptr		gr;
 #endif
-//	bitmap_t	*data;		//supposively the sprite sheet data//old format
-//	bitmap_t	bmp;
+	bitmap_t	*data;		//supposively the sprite sheet data//old format
+	bitmap_t	bmp;
 
 	//input
 	byte near		pdir;	//previous direction~ used in IN_16 in IN_ReadControl()
diff --git a/src/pcxtest.c b/src/pcxtest.c
index bd1a6a6d..a29c6175 100755
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -24,7 +24,7 @@
 #include <dos.h>
 #include <string.h>
 #include "src/lib/16_vl.h"
-#include "src/lib/bitmap.h"
+#include "16/src/lib/bitmap.h"
 #include "16/src/lib/16render.h"
 #include "src/lib/16_in.h"
 
@@ -70,7 +70,7 @@ void main() {
 //----	p = planar_buf_from_bitmap(PCXBMPPTR);
 
 	VGAmodeX(1, 1, &gvar);
-	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
+	//--00	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
 
 	/* fix up the palette and everything */
 	modexPalUpdate(&PCXBMP->palette);
diff --git a/src/pcxtest2.c b/src/pcxtest2.c
index 25d30141..5dd8505f 100755
--- a/src/pcxtest2.c
+++ b/src/pcxtest2.c
@@ -24,7 +24,7 @@
 #include <dos.h>
 #include <string.h>
 #include "src/lib/16_vl.h"
-#include "src/lib/bitmap.h"
+#include "16/src/lib/bitmap.h"
 //----#include "src/lib/planar.h"
 
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
@@ -90,7 +90,7 @@ void main() {
 //	bmp = bitmapLoadPcx("16/PCX_LIB/chikyuu.pcx");
 //----	p = planar_buf_from_bitmap(&bmp);
 	VGAmodeX(1, 1, &gvar);
-	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
+	//--00	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
 	gvar.video.page[0].sw+=32;
 	gvar.video.page[0].sh+=32;
 
-- 
2.39.5