attempted~

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

diff --git a/bakapi.exe b/bakapi.exe
deleted file mode 100755 (executable)
index 5e82883..0000000
Binary files a/bakapi.exe and /dev/null differ

diff --git a/exmmtest.exe b/exmmtest.exe
deleted file mode 100755 (executable)
index 3e842ea..0000000
Binary files a/exmmtest.exe and /dev/null differ

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

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

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

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

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

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

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

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

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

diff --git a/planrpcx.exe b/planrpcx.exe
deleted file mode 100755 (executable)
index 1a4ceb0..0000000
Binary files a/planrpcx.exe and /dev/null differ

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

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index 16ba90dbcae7c92bee3f13bcef63b1abaee9ab74..f8bbb2d10bfe95921d077e20b623f14ca8539e24 100755 (executable)
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -37,6 +37,7 @@
 #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 4b2ebcd9fea8149d40716621cff58236359b6038..fca688197d2e931f839be7b2e06d89ea5425a6da 100755 (executable)
--- a/src/lib/modex16/16render.h
+++ b/src/lib/modex16/16render.h
@@ -23,6 +23,7 @@
 #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 3ed90c08b088c305ed2f60c04c040320eb960e10..55bbb473e2ca3974aa4b94ae4c8236e15ef865ef 100755 (executable)
--- a/src/lib/modex16/planar16.c
+++ b/src/lib/modex16/planar16.c
@@ -47,7 +47,7 @@ static struct pcxHeader {
 } head;\r
 \r
 \r
-static void loadPcxStage1(FILE *file, planar_buf_t *result) {\r
+static void loadPcxpbufStage1(FILE *file, planar_buf_t *result) {\r
        int index;\r
        byte count, val;\r
        long int pos;\r
@@ -67,7 +67,7 @@ static void loadPcxStage1(FILE *file, planar_buf_t *result) {
        }\r
 }\r
 \r
-static void loadPcxPalette(FILE *file, planar_buf_t *result) {\r
+static void loadPcxpbufPalette(FILE *file, planar_buf_t *result) {\r
        byte val;\r
        int index;\r
 \r
@@ -107,11 +107,11 @@ planar_buf_t planarLoadPcx(char *filename)
        }\r
 \r
        /* load the first part of the pcx file */\r
-       loadPcxStage1(file, &result);\r
+       loadPcxpbufStage1(file, &result);\r
 \r
        /* allocate the buffer */\r
        bufSize = (/*(dword)*/result.width * result.height);\r
-       result = *planar_buf_alloc(result.width, result.height);\r
+       //result = pbuf_alloc(result.width, result.height);\r
        if(!result.plane[0]) {\r
                fprintf(stderr, "Could not allocate memory for bitmap data.");\r
                fclose(file);\r
@@ -146,7 +146,7 @@ planar_buf_t planarLoadPcx(char *filename)
        }\r
        } while(index < bufSize);\r
 \r
-       loadPcxPalette(file, &result);\r
+       //++++loadPcxpbufPalette(file, &result);\r
        fclose(file);\r
        return result;\r
 \r

diff --git a/src/lib/modex16/planar16.h b/src/lib/modex16/planar16.h
index bf8334aede54e18f4a1514e6d64b222beba5a918..8f2de898a7d371c9e5ba4f57ec3b34ce9ccd6fce 100755 (executable)
--- a/src/lib/modex16/planar16.h
+++ b/src/lib/modex16/planar16.h
@@ -25,13 +25,10 @@
  * Functions and types for loading and manipulating bitmaps.\r
  */\r
 \r
-#ifndef PLANARW_H\r
-#define PLANARW_H\r
+#ifndef PLANW_H\r
+#define PLANW_H\r
 \r
-#include "src/lib/16_head.h"\r
-#include "src/lib/planar.h"\r
-\r
-#define     PALSIZE            768\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

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

diff --git a/src/planrpcx.c b/src/planrpcx.c
index fdbc6df30271b8d7b7bd0d946443292650667a71..7a703c2615560f17d5742ebdcabd51901e1b2966 100755 (executable)
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -55,21 +55,21 @@ baka = 1;
 \r
        p = planarLoadPcx(bakapeee);\r
        ptmp = planarLoadPcx("data/ptmp.pcx");\r
-       VGAmodeX(baka, &gvar);\r
+/*     VGAmodeX(baka, &gvar);\r
        gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
 \r
-       /* fix up the palette and everything */\r
+       //fix up the palette and everything\r
        modexPalUpdate1(p.palette);\r
 \r
-       /* clear and draw one sprite and one bitmap */\r
+       //clear and draw one sprite and one bitmap\r
        modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].sw, gvar.video.page[0].sh, 0);\r
 \r
-       /* update display~*/\r
+       //update display~\r
        gvar.video.page[0].dx+=32;\r
        gvar.video.page[0].dy+=32;\r
        modexShowPage(&gvar.video.page[0]);\r
 \r
-       /* non sprite comparison */\r
+       //non sprite comparison\r
        start = *clockw;\r
 //             oldDrawBmp(VGA, 20, 20, &bmp, 0);\r
        for(i=0; i<100 ;i++) {\r
@@ -92,9 +92,9 @@ baka = 1;
        while(!kbhit())\r
        {\r
        }\r
-       VGAmodeX(0, &gvar);\r
+       VGAmodeX(0, &gvar);*/\r
 \r
-       /* print out the contents of each plane */\r
+       //print out the contents of each plane\r
        for(plane=0; plane < 4; plane++) {\r
                i=0;\r
                printf("Plane %d\n", plane);\r

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

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

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

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