pcxtest.exe and pcxtest2.exe compiles but we are unable to test because of compiling...

diff --git a/.gitignore b/.gitignore
index 8fe488a58a526808731d0ba0c9c24c5a343d1439..87dd048ad2b74e2f9cae5edebb7c0becd718bbc9 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ img
 !.git/config\r
 !.gitmodules\r
 pcx2vrl\r
+png2vrl\r
 pcxsscut\r
 vrl2vrs\r
 vrsdump\r

diff --git a/16/vgmtools b/16/vgmtools
index 227be76a9543731cef28e46d2cf690064256515c..9d7a9f4b1c40d26949fa730987f6c3eb9cf3e3ec 160000 (submodule)
--- 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 e6806a36f195ffb443a659ecebba29107116734d..fb905910af6e3aa7ab23386a3c405f73f91c48a6 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -54,6 +54,22 @@ typedef struct {
        byte *palette;\r
 } planar_buf_t;\r
 \r
+typedef struct {\r
+       byte *data;\r
+       word width;\r
+       word height;\r
+       byte *palette;\r
+       word offset;\r
+} bitmap_t;\r
+\r
+typedef struct {\r
+       byte far **data;\r
+       word ntiles;            // the number of tiles\r
+       word twidth;    // width of the tiles\r
+       word theight;   // height of the tiles\r
+       byte *palette;  // palette for the tile set\r
+} tileset_t;\r
+\r
 //from 16_sprit.h\r
 #ifdef __WATCOMC__\r
 #include <hw/vga/vrl.h>\r
@@ -316,8 +332,8 @@ typedef     struct
        //struct sprite *spri;  //supposively the sprite sheet data\r
        //memptr                gr;\r
 #endif\r
-//     bitmap_t        *data;          //supposively the sprite sheet data//old format\r
-//     bitmap_t        bmp;\r
+       bitmap_t        *data;          //supposively the sprite sheet data//old format\r
+       bitmap_t        bmp;\r
 \r
        //input\r
        byte near               pdir;   //previous direction~ used in IN_16 in IN_ReadControl()\r

diff --git a/src/pcxtest.c b/src/pcxtest.c
index bd1a6a6d56a48aed1c143f47b6f673a6cabadf8d..a29c6175488749e906df06ccd7f4044d9235c45c 100755 (executable)
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -24,7 +24,7 @@
 #include <dos.h>\r
 #include <string.h>\r
 #include "src/lib/16_vl.h"\r
-#include "src/lib/bitmap.h"\r
+#include "16/src/lib/bitmap.h"\r
 #include "16/src/lib/16render.h"\r
 #include "src/lib/16_in.h"\r
 \r
@@ -70,7 +70,7 @@ void main() {
 //---- p = planar_buf_from_bitmap(PCXBMPPTR);\r
 \r
        VGAmodeX(1, 1, &gvar);\r
-       gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
+       //--00  gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
 \r
        /* fix up the palette and everything */\r
        modexPalUpdate(&PCXBMP->palette);\r

diff --git a/src/pcxtest2.c b/src/pcxtest2.c
index 25d30141c75a8ad48b81940ae65072887304a4b6..5dd8505ff14becdf898c2888fab65c74e4ac12cc 100755 (executable)
--- a/src/pcxtest2.c
+++ b/src/pcxtest2.c
@@ -24,7 +24,7 @@
 #include <dos.h>\r
 #include <string.h>\r
 #include "src/lib/16_vl.h"\r
-#include "src/lib/bitmap.h"\r
+#include "16/src/lib/bitmap.h"\r
 //----#include "src/lib/planar.h"\r
 \r
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
@@ -90,7 +90,7 @@ void main() {
 //     bmp = bitmapLoadPcx("16/PCX_LIB/chikyuu.pcx");\r
 //---- p = planar_buf_from_bitmap(&bmp);\r
        VGAmodeX(1, 1, &gvar);\r
-       gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
+       //--00  gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
        gvar.video.page[0].sw+=32;\r
        gvar.video.page[0].sh+=32;\r
 \r