yay./w.sh

diff --git a/16.exe b/16.exe
new file mode 100755 (executable)
index 0000000..f126476
Binary files /dev/null and b/16.exe differ

diff --git a/bakapi.exe b/bakapi.exe
new file mode 100755 (executable)
index 0000000..8bc8d33
Binary files /dev/null and b/bakapi.exe differ

diff --git a/exmmtest.exe b/exmmtest.exe
new file mode 100755 (executable)
index 0000000..4e30ad3
Binary files /dev/null and b/exmmtest.exe differ

diff --git a/fmemtest.exe b/fmemtest.exe
new file mode 100755 (executable)
index 0000000..5b900e6
Binary files /dev/null and b/fmemtest.exe differ

diff --git a/fontgfx.exe b/fontgfx.exe
new file mode 100755 (executable)
index 0000000..ebcea9a
Binary files /dev/null and b/fontgfx.exe differ

diff --git a/fonttest.exe b/fonttest.exe
new file mode 100755 (executable)
index 0000000..f92b49a
Binary files /dev/null and b/fonttest.exe differ

diff --git a/inputest.exe b/inputest.exe
new file mode 100755 (executable)
index 0000000..57ffb9f
Binary files /dev/null and b/inputest.exe differ

diff --git a/makefile b/makefile
index 797d320e337cb569933e81b9b61e8071be67ba0f..f0db071a7adbc2c388e1ae30f0f826a346667740 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -278,7 +278,7 @@ modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c
 bakapee.$(OBJ): $(SRCLIB)bakapee.h $(SRCLIB)bakapee.c
        wcl $(FLAGS) -c $(SRCLIB)bakapee.c
 
-16render.$(OBJ): $(MODEXLIB)16render.h $(MODEXLIB)16render.c
+16render.$(OBJ): $(MODEXLIB)16render.h $(MODEXLIB)16render.c $(MODEXLIB)planar16.h
        wcl $(FLAGS) -c $(MODEXLIB)16render.c
 
 planar16.$(OBJ): $(MODEXLIB)planar16.h $(MODEXLIB)planar16.c

diff --git a/maptest.exe b/maptest.exe
new file mode 100755 (executable)
index 0000000..cb781a8
Binary files /dev/null and b/maptest.exe differ

diff --git a/palettec.exe b/palettec.exe
new file mode 100755 (executable)
index 0000000..22bbb34
Binary files /dev/null and b/palettec.exe differ

diff --git a/palettel.exe b/palettel.exe
new file mode 100755 (executable)
index 0000000..125e58f
Binary files /dev/null and b/palettel.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
new file mode 100755 (executable)
index 0000000..ce96950
Binary files /dev/null and b/pcxtest.exe differ

diff --git a/pcxtest2.exe b/pcxtest2.exe
new file mode 100755 (executable)
index 0000000..c5a32e5
Binary files /dev/null and b/pcxtest2.exe differ

diff --git a/planrpcx.exe b/planrpcx.exe
new file mode 100755 (executable)
index 0000000..272ea48
Binary files /dev/null and b/planrpcx.exe differ

diff --git a/scroll.exe b/scroll.exe
new file mode 100755 (executable)
index 0000000..7bb9e80
Binary files /dev/null and b/scroll.exe differ

diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c
index b7ba5d1486c9b9dd476ce84b72bcbc0b7ae554cc..19af31f5386846af026278b88df3d0ca94e697b6 100755 (executable)
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -26,6 +26,8 @@
 #include "src/lib/bitmap.h"\r
 #include "src/lib/modex16.h"\r
 \r
+#ifndef PCXHEADER_H\r
+#define PCXHEADER_H\r
 static struct pcxHeader {\r
        byte id;\r
        byte version;\r
@@ -45,6 +47,7 @@ static struct pcxHeader {
        word vScreenSize;\r
        byte padding[54];\r
 } head;\r
+#endif /*PCXHEADER_H*/\r
 \r
 \r
 static void loadPcxStage1(FILE *file, bitmap_t *result) {\r

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index f8bbb2d10bfe95921d077e20b623f14ca8539e24..cbd2ba6f3b29bc19d6722b3da62d3868130f557c 100755 (executable)
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -27,9 +27,10 @@
 //#include <conio.h>
 
 #include "src/lib/types.h"
+#include "src/lib/16_head.h"
 #include "src/lib/bitmap.h"
 #include "src/lib/planar.h"
-#include "src/lib/16_head.h"
+#include "src/lib/modex16/planar16.h"
 #include "src/lib/16text.h"
 #include "src/lib/modex16/16render.h"
 #include "src/lib/modex16/320x240.h"
@@ -37,7 +38,6 @@
 #include "src/lib/modex16/256x192.h"
 #include "src/lib/modex16/192x144_.h"
 #include "src/lib/modex16/160x120.h"
-#include "src/lib/modex16/planar16.h"
 
 //320x240 = 20x15
 //192x144 = 12x9

diff --git a/src/lib/modex16/16render.h b/src/lib/modex16/16render.h
index fca688197d2e931f839be7b2e06d89ea5425a6da..4b2ebcd9fea8149d40716621cff58236359b6038 100755 (executable)
--- a/src/lib/modex16/16render.h
+++ b/src/lib/modex16/16render.h
@@ -23,7 +23,6 @@
 #ifndef __RENDER_H__\r
 #define __RENDER_H__\r
 \r
-#include "src/lib/planar.h"\r
 #include "src/lib/modex16.h"\r
 \r
 void modexDrawPBufRegion(page_t *page, int x, int y, int rx, int ry, int rw, int rh, planar_buf_t *p, boolean sprite);\r

diff --git a/src/lib/modex16/planar16.c b/src/lib/modex16/planar16.c
index 55bbb473e2ca3974aa4b94ae4c8236e15ef865ef..89e164faf5f737d3555cdf24709818d960471a17 100755 (executable)
--- a/src/lib/modex16/planar16.c
+++ b/src/lib/modex16/planar16.c
@@ -24,8 +24,9 @@
 #include <stdlib.h>\r
 #include <malloc.h>\r
 #include "src/lib/modex16/planar16.h"\r
-#include "src/lib/modex16.h"\r
 \r
+#ifndef PCXHEADER_H\r
+#define PCXHEADER_H\r
 static struct pcxHeader {\r
        byte id;\r
        byte version;\r
@@ -45,7 +46,7 @@ static struct pcxHeader {
        word vScreenSize;\r
        byte padding[54];\r
 } head;\r
-\r
+#endif /*PCXHEADER_H*/\r
 \r
 static void loadPcxpbufStage1(FILE *file, planar_buf_t *result) {\r
        int index;\r
@@ -168,7 +169,7 @@ planarLoadPcxTiles(char *filename, word twidth, word theight) {
        }\r
 \r
        /* load the first part of the pcx file */\r
-       loadPcxStage1(file, &result);\r
+       loadPcxpbufStage1(file, &result);\r
 \r
        /* get the number of tiles and set up the result structure */\r
        ts.twidth = twidth;\r
@@ -184,7 +185,7 @@ planarLoadPcxTiles(char *filename, word twidth, word theight) {
        }*/\r
 \r
        /* finish off the file */\r
-       loadPcxPalette(file, &result);\r
+       //++++loadPcxPalette(file, &result);\r
 \r
        fclose(file);\r
 \r

diff --git a/src/lib/modex16/planar16.h b/src/lib/modex16/planar16.h
index 8f2de898a7d371c9e5ba4f57ec3b34ce9ccd6fce..b412fd9bd3e433c5987fa599f0dc563a5b3eae68 100755 (executable)
--- a/src/lib/modex16/planar16.h
+++ b/src/lib/modex16/planar16.h
@@ -28,6 +28,7 @@
 #ifndef PLANW_H\r
 #define PLANW_H\r
 \r
+#include "src/lib/planar.h"\r
 #include "src/lib/modex16.h"\r
 \r
 planar_buf_t planarLoadPcx(char *filename);\r

diff --git a/src/lib/planar.c b/src/lib/planar.c
index 41a3182e4bf062f6eddb39a768c4e1fd19c92f59..52055cf49654960f99ba080d90db8bee070fb22a 100755 (executable)
--- a/src/lib/planar.c
+++ b/src/lib/planar.c
@@ -22,9 +22,14 @@
 /*\r
  * Implimentation of the planar buffer files.\r
  */\r
+#include <stdio.h>\r
 #include <stdlib.h>\r
+#include <malloc.h>\r
+\r
 #include "src/lib/planar.h"\r
 \r
+extern byte *modexNewPal();\r
+\r
 /* creates a planar buffer from the bitmap data.\r
    The planar buffer is dynamically allocated, and should\r
    be destroyed with the planar_buf_free function when no longer\r

diff --git a/src/lib/planar.h b/src/lib/planar.h
index 6e3da953b1c3d70ce7806b7d1f898409162761c8..09f07c69a7d51477a6742bc0777896861e94df06 100755 (executable)
--- a/src/lib/planar.h
+++ b/src/lib/planar.h
@@ -26,7 +26,10 @@
 #ifndef PLANAR_H
 #define PLANAR_H
 
-#include "src/lib/modex16.h"
+#include "src/lib/types.h"
+#include "src/lib/16_head.h"
+#include "src/lib/bitmap.h"
+//#include "src/lib/modex16.h"
 
 typedef struct {
        byte huge *plane[4];     /* 4 planes of image data */

diff --git a/test.exe b/test.exe
new file mode 100755 (executable)
index 0000000..5f242a7
Binary files /dev/null and b/test.exe differ

diff --git a/test2.exe b/test2.exe
new file mode 100755 (executable)
index 0000000..527a158
Binary files /dev/null and b/test2.exe differ

diff --git a/tesuto.exe b/tesuto.exe
new file mode 100755 (executable)
index 0000000..6dbf027
Binary files /dev/null and b/tesuto.exe differ

diff --git a/vgmtest.exe b/vgmtest.exe
new file mode 100755 (executable)
index 0000000..b63d956
Binary files /dev/null and b/vgmtest.exe differ