having the palette in the game code may help. also i added wolf3d's palette for exama...

[16.git] / src / tesuto.h

diff --git a/src/tesuto.h b/src/tesuto.h
index 6ada8a7befd22d1e6765c42f8b43bb61c1f4eea1..29a09d1770f096b3ea61f062bfdc5fa2b1f9d6a1 100755 (executable)
--- a/src/tesuto.h
+++ b/src/tesuto.h
@@ -1,76 +1,17 @@
 #ifndef __TESUTO_H__\r
 #define __TESUTO_H__\r
 \r
+#include "src/lib/testpatt.h"\r
 #include "src/lib/16_head.h"\r
 #include "src/lib/16_vl.h"\r
 #include "src/lib/16_in.h"\r
 #include "src/lib/scroll16.h"\r
+#include "src/lib/16_spri.h"\r
 #include <hw/cpu/cpu.h>\r
 #include <hw/dos/dos.h>\r
 #include <hw/vga/vga.h>\r
 #include <hw/vga/vrl.h>\r
 \r
-#define PANKEY0EXE \\r
-                       panpagemanual(mv, player, 0); \\r
-                       if(IN_KeyDown(1+1)){ pan.pn=0; modexShowPage(&(gvar.video.page[pan.pn])); } \\r
-                       if(IN_KeyDown(2+1)){ pan.pn=1; modexShowPage(&(gvar.video.page[pan.pn])); } \\r
-                       if(IN_KeyDown(3+1)){ pan.pn=2; modexShowPage(&(gvar.video.page[pan.pn])); } \\r
-                       if(IN_KeyDown(4+1)){ pan.pn=3; modexShowPage(&(gvar.video.page[pan.pn])); } \\r
-                       if(IN_KeyDown(25)){ modexpdump(mv[1].page); modexShowPage(&(gvar.video.page[1])); IN_UserInput(1,1); }\r
-\r
-////corner markers\r
-#define GVPO gvar.video.page[0]\r
-#define GVPI gvar.video.page[1]\r
-#define OW     GVPO.width-16\r
-#define OH     GVPO.height-16\r
-#define OE     GVPO.sw\r
-#define OJ     GVPO.sh\r
-#define IW     GVPI.width-16\r
-#define IH     GVPI.height-16\r
-#define IE     GVPI.sw\r
-#define IJ     GVPI.sh\r
-#define DCBO modexClearRegion(&GVPO\r
-#define DCBI modexClearRegion(&GVPI\r
-\r
-#define DRAWOTHERCORNERBOX_TOPLEFT \\r
-DCBO,  0,      0,      16, 16, 0); \\r
-DCBO,  16,     16,     16, 16, 2); \\r
-DCBI,          0,      0,      16, 16, 0); \\r
-DCBI,          16,     16,     16, 16, 2);\r
-\r
-#define DRAWOTHERCORNERBOX_TOPRIGHT \\r
-DCBO,  OW,     0,      16, 16, 0); \\r
-DCBO,  OE,     16,     16, 16, 2); \\r
-DCBI,          IW,     0,      16, 16, 0); \\r
-DCBI,          IE,     16,     16, 16, 2);\r
-\r
-#define DRAWOTHERCORNERBOX_BOTTOMLEFT \\r
-DCBO,  0,      OH,     16, 16, 0); \\r
-DCBO,  16,     OJ,     16, 16, 2); \\r
-DCBI,          0,      IH,     16, 16, 0); \\r
-DCBI,          16,     IJ,     16, 16, 2);\r
-\r
-#define DRAWOTHERCORNERBOX_BOTTOMRIGHT \\r
-DCBO,  OE,     OJ,     16, 16, 2); \\r
-DCBO,  OW,     OH,     16, 16, 0); \\r
-DCBI,          IE,     IJ,     16, 16, 2);\\r
-DCBI,          IW,     IH,     16, 16, 0);\r
-\r
-#define DRAWCORNERBOXES \\r
-DRAWOTHERCORNERBOX_TOPLEFT; \\r
-DRAWOTHERCORNERBOX_TOPRIGHT; \\r
-DRAWOTHERCORNERBOX_BOTTOMLEFT; \\r
-DRAWOTHERCORNERBOX_BOTTOMRIGHT; \\r
-\r
-#define TESTBG \\r
-       modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 15); \\r
-       modexClearRegion(&gvar.video.page[0], 16, 16, gvar.video.page[0].sw, gvar.video.page[0].sh, 128); \\r
-       modexClearRegion(&gvar.video.page[0], 32, 32, gvar.video.page[0].sw-32, gvar.video.page[0].sh-32, 42); \\r
-       modexClearRegion(&gvar.video.page[0], 48, 48, gvar.video.page[0].sw-64, gvar.video.page[0].sh-64, 128); \\r
-       modexCopyPageRegion(&gvar.video.page[1], &gvar.video.page[0], 0, 0, 0, 0, gvar.video.page[0].width, gvar.video.page[0].height); \\r
-       modexClearRegion(&gvar.video.page[2], 0, 0, gvar.video.page[2].sw, gvar.video.page[2].sh, 47); \\r
-       modexClearRegion(&gvar.video.page[3], 0, 0, gvar.video.page[3].sw, gvar.video.page[3].sh, 45);\r
-\r
 typedef unsigned char far *VGA_RAM_PTR;\r
 //VGA_RAM_PTR vga_graphics_ram = (VGA_RAM_PTR)MK_FP(0xA000,0x0000);\r
 //unsigned char vga_stride = 80; // 80 x 4 = 320 for 320-pixel wide modes\r