OK IT COMPILES!

diff --git a/16.exe b/16.exe
index f126476b0baa16c96012689e0781deb07035b265..34b67ab5115a57c78532c34d50d6be6b45323cab 100755 (executable)
Binary files a/16.exe and b/16.exe differ

diff --git a/bakapi.exe b/bakapi.exe
index 8bc8d3360ba08dbcb2ba268643c4ede5cbc4facd..0c3cdab9c74b93587d483a889e139232eefa65cc 100755 (executable)
Binary files a/bakapi.exe and b/bakapi.exe differ

diff --git a/exmmtest.exe b/exmmtest.exe
index 4e30ad3563ffc2f0fe31c34ab66959fcc7ab7c1e..abc812441f39a4ef2afd57276b0fe1b3756ececd 100755 (executable)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/fmemtest.exe b/fmemtest.exe
index 5b900e67ab742ec0f3fe6986c5644af48a2eecab..0129d45304ddd29830eaae2c64379f3ac1438efd 100755 (executable)
Binary files a/fmemtest.exe and b/fmemtest.exe differ

diff --git a/fontgfx.exe b/fontgfx.exe
index ebcea9a2c128916cc7a2cb5b2e54165a7524db46..4efeb74bdee773de2119a3315267e7cc04d659c6 100755 (executable)
Binary files a/fontgfx.exe and b/fontgfx.exe differ

diff --git a/fonttest.exe b/fonttest.exe
index f92b49a38b384a472f70f3849b64e2cae12090cb..cc97491cd8d9539db147fa35004b784ef5dcf6bc 100755 (executable)
Binary files a/fonttest.exe and b/fonttest.exe differ

diff --git a/inputest.exe b/inputest.exe
index 57ffb9f2aed0963e35219053a342cfcb27874637..64acc51933229b4d300612f0ed1e3823c2b334da 100755 (executable)
Binary files a/inputest.exe and b/inputest.exe differ

diff --git a/makefile b/makefile
index f0db071a7adbc2c388e1ae30f0f826a346667740..7135b96588b79e3d3f2a2eee1e52d32f2737694b 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -72,7 +72,7 @@ DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) timer.$(OBJ)
 #
 #3812intf.$(OBJ)
-GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) planar16.$(OBJ)
+GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ)
 
 TESTEXEC = exmmtest.exe test.exe pcxtest.exe pcxtest2.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe scroll.exe vgmtest.exe inputest.exe palettel.exe planrpcx.exe
 # tsthimem.exe
@@ -278,11 +278,11 @@ 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 $(MODEXLIB)planar16.h
+16render.$(OBJ): $(MODEXLIB)16render.h $(MODEXLIB)16render.c
        wcl $(FLAGS) -c $(MODEXLIB)16render.c
 
-planar16.$(OBJ): $(MODEXLIB)planar16.h $(MODEXLIB)planar16.c
-       wcl $(FLAGS) -c $(MODEXLIB)planar16.c
+16planar.$(OBJ): $(MODEXLIB)16planar.h $(MODEXLIB)16planar.c
+       wcl $(FLAGS) -c $(MODEXLIB)16planar.c
 
 bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c
        wcl $(FLAGS) -c $(SRCLIB)bitmap.c

diff --git a/maptest.exe b/maptest.exe
index cb781a89bfa965f7eda13658787ee943fc674c7b..9908b0be0d9e3d3d91a58b4a9efd0b490503e9c2 100755 (executable)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/palettec.exe b/palettec.exe
index 22bbb34a794768d148aa6075850b4319244e69dd..2363132c26ae5ed888559e9cbe35e0314308f191 100755 (executable)
Binary files a/palettec.exe and b/palettec.exe differ

diff --git a/palettel.exe b/palettel.exe
index 125e58f2ea072e3a63c5536288d14556533fc42e..1885f3911e6f5c047b79cc5129d86980e1b8a837 100755 (executable)
Binary files a/palettel.exe and b/palettel.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index ce969505bd0d5958d573cadd7263801662595239..5a3991f11ded0e3e994cb3c9c7bccc3e380df11e 100755 (executable)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/pcxtest2.exe b/pcxtest2.exe
index c5a32e5aae41917a8e6f9533333e4efee44efa68..d704d6fc12f4b8759b7a99f25dc2b5b0c9c986f4 100755 (executable)
Binary files a/pcxtest2.exe and b/pcxtest2.exe differ

diff --git a/planrpcx.exe b/planrpcx.exe
index 272ea4865d4ab4703b8b5c7be8644e8cb3a24b09..c39db0bb72ec8d1d5bfeac6b1d3b4c9309c24f9f 100755 (executable)
Binary files a/planrpcx.exe and b/planrpcx.exe differ

diff --git a/scroll.exe b/scroll.exe
index 7bb9e8061f4cc33267ebcaf845b8564b52c6716e..1d2ed371eb8e97fd1c9617d678cc436090eecd2f 100755 (executable)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/16.h b/src/16.h
index 7b2f9811d5e9c6aa9130a06d4c44f9d7dac7510c..754184b15b6eb8aaf64dbc91738f54a63cbf95c5 100755 (executable)
--- a/src/16.h
+++ b/src/16.h
@@ -33,7 +33,8 @@ typedef enum {
        ENGI_EXIT,\r
        ENGI_QUIT,\r
        ENGI_RUN,\r
-       ENGI_INPUT\r
+       ENGI_INPUT,\r
+       ENGI_PAUSE\r
 } engi_stat_t;\r
 \r
 #endif /*__16_H_*/\r

diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c
index 19af31f5386846af026278b88df3d0ca94e697b6..ae750383b6ce54716648e47c27a4d763ce2c4f2a 100755 (executable)
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>\r
 #include <malloc.h>\r
 #include "src/lib/bitmap.h"\r
-#include "src/lib/modex16.h"\r
 \r
 #ifndef PCXHEADER_H\r
 #define PCXHEADER_H\r
@@ -49,7 +48,6 @@ static struct pcxHeader {
 } head;\r
 #endif /*PCXHEADER_H*/\r
 \r
-\r
 static void loadPcxStage1(FILE *file, bitmap_t *result) {\r
        long bufSize;\r
        int index;\r

diff --git a/src/lib/bitmap.h b/src/lib/bitmap.h
index 4b31c4b481f6d15fdd960f4dff17214dba2f01c0..fd112658910e64970a4c407faf2e25e1c3ed877d 100755 (executable)
--- a/src/lib/bitmap.h
+++ b/src/lib/bitmap.h
@@ -25,27 +25,8 @@
 \r
 #ifndef BITMAP_H\r
 #define BITMAP_H\r
-#include "src/lib/types.h"\r
-#include "src/lib/16_head.h"\r
 \r
-#define     PALSIZE            768\r
-\r
-typedef struct {\r
-       byte huge *data;\r
-       word width;\r
-       word height;\r
-       byte *palette;\r
-       word offset;\r
-//     byte far *font;\r
-} bitmap_t;\r
-\r
-typedef struct {\r
-       byte **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
+#include "src/lib/modex16.h"\r
 \r
 bitmap_t bitmapLoadPcx(char *filename);\r
 tileset_t bitmapLoadPcxTiles(char *filename, word twidth, word theight);\r

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index cbd2ba6f3b29bc19d6722b3da62d3868130f557c..b5ca74b1714c3c546e27dafbb2f145e323ee2900 100755 (executable)
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -30,7 +30,7 @@
 #include "src/lib/16_head.h"
 #include "src/lib/bitmap.h"
 #include "src/lib/planar.h"
-#include "src/lib/modex16/planar16.h"
+#include "src/lib/modex16/16planar.h"
 #include "src/lib/16text.h"
 #include "src/lib/modex16/16render.h"
 #include "src/lib/modex16/320x240.h"
@@ -50,6 +50,7 @@
 #define PAGE_OFFSET(x,y) (((y)<<6)+((y)<<4)+((x)>>2))
 #define PLANE(x) (1<< (x&3))
 #define SELECT_ALL_PLANES() outpw(0x03c4, 0xff02)
+#define     PALSIZE            768
 
 typedef union
 {

diff --git a/src/lib/modex16/planar16.c b/src/lib/modex16/16planar.c
similarity index 95%
rename from src/lib/modex16/planar16.c
rename to src/lib/modex16/16planar.c
index 89e164faf5f737d3555cdf24709818d960471a17..4c5c2578b0b3bf53966bab7a1724ff18c5ee897d 100755 (executable)
--- a/src/lib/modex16/planar16.c
+++ b/src/lib/modex16/16planar.c
@@ -23,7 +23,7 @@
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <malloc.h>\r
-#include "src/lib/modex16/planar16.h"\r
+#include "src/lib/modex16/16planar.h"\r
 \r
 #ifndef PCXHEADER_H\r
 #define PCXHEADER_H\r

diff --git a/src/lib/modex16/planar16.h b/src/lib/modex16/16planar.h
similarity index 95%
rename from src/lib/modex16/planar16.h
rename to src/lib/modex16/16planar.h
index b412fd9bd3e433c5987fa599f0dc563a5b3eae68..bd47e08886cd110279b442ab8a8d6cc7068e1f0b 100755 (executable)
--- a/src/lib/modex16/planar16.h
+++ b/src/lib/modex16/16planar.h
@@ -28,9 +28,9 @@
 #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
 tileset_t planarLoadPcxTiles(char *filename, word twidth, word theight);\r
+\r
 #endif\r

diff --git a/src/lib/planar.c b/src/lib/planar.c
index 52055cf49654960f99ba080d90db8bee070fb22a..38e4eb7bb53d8f8d741ff1dc23196c10aa2c0b6a 100755 (executable)
--- a/src/lib/planar.c
+++ b/src/lib/planar.c
@@ -28,8 +28,6 @@
 \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 09f07c69a7d51477a6742bc0777896861e94df06..821f476305bb420147514d072bbbfffe47fb6460 100755 (executable)
--- a/src/lib/planar.h
+++ b/src/lib/planar.h
@@ -26,18 +26,9 @@
 #ifndef PLANAR_H
 #define PLANAR_H
 
-#include "src/lib/types.h"
-#include "src/lib/16_head.h"
-#include "src/lib/bitmap.h"
-//#include "src/lib/modex16.h"
+#include "src/lib/modex16.h"
 
-typedef struct {
-       byte huge *plane[4];     /* 4 planes of image data */
-       word width;         /* width of the image (spread across 4 planes) */
-       word height;        /* height of the image (spread across 4 planes) */
-       word pwidth;        /* the number of bytes in each plane */
-       byte *palette;
-} planar_buf_t;
+extern byte *modexNewPal();
 
 /* creates a planar buffer from the bitmap data.
    The planar buffer is dynamically allocated, and should

diff --git a/src/lib/typdefst.h b/src/lib/typdefst.h
index 3f53cd7f7b437334f2c28ce6787f604fa58d33df..2e1cd4883a74617ae1afbde2a0e3a37d0e9e52d8 100755 (executable)
--- a/src/lib/typdefst.h
+++ b/src/lib/typdefst.h
@@ -39,6 +39,30 @@
 /*\r
  * typedefs of the game variables!\r
  */\r
+typedef struct {\r
+       byte huge *data;\r
+       word width;\r
+       word height;\r
+       byte *palette;\r
+       word offset;\r
+} bitmap_t;\r
+\r
+typedef struct {\r
+       byte **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
+typedef struct {\r
+       byte huge *plane[4];     /* 4 planes of image data */\r
+       word width;         /* width of the image (spread across 4 planes) */\r
+       word height;        /* height of the image (spread across 4 planes) */\r
+       word pwidth;        /* the number of bytes in each plane */\r
+       byte *palette;\r
+} planar_buf_t;\r
+\r
 typedef struct {\r
        word id;        /* the Identification number of the page~ For layering~ */\r
        byte far* data; /* the data for the page */\r

diff --git a/src/planrpcx.c b/src/planrpcx.c
index 7a703c2615560f17d5742ebdcabd51901e1b2966..11d8d5dd5eb8cccf1a709c4b908aa4418a73427e 100755 (executable)
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -24,7 +24,6 @@
 #include <dos.h>\r
 #include <string.h>\r
 #include "src/lib/modex16.h"\r
-#include "src/lib/modex16/planar16.h"\r
 \r
 global_game_variables_t gvar;\r
 planar_buf_t huge p, ptmp;\r

diff --git a/test.exe b/test.exe
index 5f242a765b832401c509bce003ed38a054d77de5..f0c5f918b765da8985f167aef5ccae9e5f7f1d70 100755 (executable)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 527a1589b51ff8826700dd7e3e284b18a179d69a..3fb7194c7bad996efc579a131699ffbffbba58eb 100755 (executable)
Binary files a/test2.exe and b/test2.exe differ

diff --git a/vgmtest.exe b/vgmtest.exe
index b63d956e5782293a043bb75aa18955d15f26e099..3b870111ac047ece8a08e6f1ec9d2ded51c3c19a 100755 (executable)
Binary files a/vgmtest.exe and b/vgmtest.exe differ