From: sparky4 Date: Thu, 5 Nov 2015 21:24:16 +0000 (-0600) Subject: yay./w.sh X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=29050ce6a22ce3d6c47183d6946e81ea25b6b5c7;p=16.git yay./w.sh --- diff --git a/16.exe b/16.exe new file mode 100755 index 00000000..f126476b Binary files /dev/null and b/16.exe differ diff --git a/bakapi.exe b/bakapi.exe new file mode 100755 index 00000000..8bc8d336 Binary files /dev/null and b/bakapi.exe differ diff --git a/exmmtest.exe b/exmmtest.exe new file mode 100755 index 00000000..4e30ad35 Binary files /dev/null and b/exmmtest.exe differ diff --git a/fmemtest.exe b/fmemtest.exe new file mode 100755 index 00000000..5b900e67 Binary files /dev/null and b/fmemtest.exe differ diff --git a/fontgfx.exe b/fontgfx.exe new file mode 100755 index 00000000..ebcea9a2 Binary files /dev/null and b/fontgfx.exe differ diff --git a/fonttest.exe b/fonttest.exe new file mode 100755 index 00000000..f92b49a3 Binary files /dev/null and b/fonttest.exe differ diff --git a/inputest.exe b/inputest.exe new file mode 100755 index 00000000..57ffb9f2 Binary files /dev/null and b/inputest.exe differ diff --git a/makefile b/makefile index 797d320e..f0db071a 100755 --- 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 index 00000000..cb781a89 Binary files /dev/null and b/maptest.exe differ diff --git a/palettec.exe b/palettec.exe new file mode 100755 index 00000000..22bbb34a Binary files /dev/null and b/palettec.exe differ diff --git a/palettel.exe b/palettel.exe new file mode 100755 index 00000000..125e58f2 Binary files /dev/null and b/palettel.exe differ diff --git a/pcxtest.exe b/pcxtest.exe new file mode 100755 index 00000000..ce969505 Binary files /dev/null and b/pcxtest.exe differ diff --git a/pcxtest2.exe b/pcxtest2.exe new file mode 100755 index 00000000..c5a32e5a Binary files /dev/null and b/pcxtest2.exe differ diff --git a/planrpcx.exe b/planrpcx.exe new file mode 100755 index 00000000..272ea486 Binary files /dev/null and b/planrpcx.exe differ diff --git a/scroll.exe b/scroll.exe new file mode 100755 index 00000000..7bb9e806 Binary files /dev/null and b/scroll.exe differ diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c index b7ba5d14..19af31f5 100755 --- a/src/lib/bitmap.c +++ b/src/lib/bitmap.c @@ -26,6 +26,8 @@ #include "src/lib/bitmap.h" #include "src/lib/modex16.h" +#ifndef PCXHEADER_H +#define PCXHEADER_H static struct pcxHeader { byte id; byte version; @@ -45,6 +47,7 @@ static struct pcxHeader { word vScreenSize; byte padding[54]; } head; +#endif /*PCXHEADER_H*/ static void loadPcxStage1(FILE *file, bitmap_t *result) { diff --git a/src/lib/modex16.h b/src/lib/modex16.h index f8bbb2d1..cbd2ba6f 100755 --- a/src/lib/modex16.h +++ b/src/lib/modex16.h @@ -27,9 +27,10 @@ //#include #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 fca68819..4b2ebcd9 100755 --- a/src/lib/modex16/16render.h +++ b/src/lib/modex16/16render.h @@ -23,7 +23,6 @@ #ifndef __RENDER_H__ #define __RENDER_H__ -#include "src/lib/planar.h" #include "src/lib/modex16.h" void modexDrawPBufRegion(page_t *page, int x, int y, int rx, int ry, int rw, int rh, planar_buf_t *p, boolean sprite); diff --git a/src/lib/modex16/planar16.c b/src/lib/modex16/planar16.c index 55bbb473..89e164fa 100755 --- a/src/lib/modex16/planar16.c +++ b/src/lib/modex16/planar16.c @@ -24,8 +24,9 @@ #include #include #include "src/lib/modex16/planar16.h" -#include "src/lib/modex16.h" +#ifndef PCXHEADER_H +#define PCXHEADER_H static struct pcxHeader { byte id; byte version; @@ -45,7 +46,7 @@ static struct pcxHeader { word vScreenSize; byte padding[54]; } head; - +#endif /*PCXHEADER_H*/ static void loadPcxpbufStage1(FILE *file, planar_buf_t *result) { int index; @@ -168,7 +169,7 @@ planarLoadPcxTiles(char *filename, word twidth, word theight) { } /* load the first part of the pcx file */ - loadPcxStage1(file, &result); + loadPcxpbufStage1(file, &result); /* get the number of tiles and set up the result structure */ ts.twidth = twidth; @@ -184,7 +185,7 @@ planarLoadPcxTiles(char *filename, word twidth, word theight) { }*/ /* finish off the file */ - loadPcxPalette(file, &result); + //++++loadPcxPalette(file, &result); fclose(file); diff --git a/src/lib/modex16/planar16.h b/src/lib/modex16/planar16.h index 8f2de898..b412fd9b 100755 --- a/src/lib/modex16/planar16.h +++ b/src/lib/modex16/planar16.h @@ -28,6 +28,7 @@ #ifndef PLANW_H #define PLANW_H +#include "src/lib/planar.h" #include "src/lib/modex16.h" planar_buf_t planarLoadPcx(char *filename); diff --git a/src/lib/planar.c b/src/lib/planar.c index 41a3182e..52055cf4 100755 --- a/src/lib/planar.c +++ b/src/lib/planar.c @@ -22,9 +22,14 @@ /* * Implimentation of the planar buffer files. */ +#include #include +#include + #include "src/lib/planar.h" +extern byte *modexNewPal(); + /* creates a planar buffer from the bitmap data. The planar buffer is dynamically allocated, and should be destroyed with the planar_buf_free function when no longer diff --git a/src/lib/planar.h b/src/lib/planar.h index 6e3da953..09f07c69 100755 --- 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 index 00000000..5f242a76 Binary files /dev/null and b/test.exe differ diff --git a/test2.exe b/test2.exe new file mode 100755 index 00000000..527a1589 Binary files /dev/null and b/test2.exe differ diff --git a/tesuto.exe b/tesuto.exe new file mode 100755 index 00000000..6dbf027e Binary files /dev/null and b/tesuto.exe differ diff --git a/vgmtest.exe b/vgmtest.exe new file mode 100755 index 00000000..b63d956e Binary files /dev/null and b/vgmtest.exe differ