X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Ftesuto.h;h=29a09d1770f096b3ea61f062bfdc5fa2b1f9d6a1;hb=256be2f6f35912701d3e3770e49e388f462a6acc;hp=fd93f94385bf4904402eda0ab5316697837b5e95;hpb=a6dac9aacc0353763dc564afda8b57848afc3e0b;p=16.git

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