X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fvrstest.c;h=bd3e1da10e49f0b60a3943c5ab287c6b53094e15;hb=51b492de428068830f36b4ec57168f34c9477dab;hp=d00f627b569a239b019760aca7281e0a43280a2e;hpb=76f1cd56423f31966975040fbef40e70b740c38c;p=16.git

diff --git a/src/vrstest.c b/src/vrstest.c
index d00f627b..bd3e1da1 100755
--- a/src/vrstest.c
+++ b/src/vrstest.c
@@ -20,77 +20,53 @@
  *
  */
 
-//#include "src/lib/16_head.h"
+#include "src/lib/16_head.h"
+#include "src/lib/16_tail.h"
 #include "src/lib/16_vl.h"
 #include "src/lib/16_sprit.h"
-#include "src/lib/16_tail.h"
 #include "src/lib/16_pm.h"
 #include "src/lib/16_ca.h"
 #include "src/lib/16_mm.h"
 
+extern boolean dbg_notest;
+
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
 
-void main() {
+void main()
+{
 	static global_game_variables_t gvar;
 	//__segment sega;
 	memptr bigbuffer;
 	int i;
 	word start;
 	float t1, t2;
-	boolean baka;
-	byte *pal=0;
-	int size=0;
+	//boolean baka;
 	struct sprite spri;
 	//vrl1_vgax_offset_t * off, *off1;
 	struct vrs_container vrs;
 	vrl1_vgax_offset_t **vrl_line_offsets;
-	uint32_t huge *vrl_headers_offsets;
-	uint16_t huge *vrl_id_iter;
+	uint32_t far *vrl_headers_offsets;
+	uint16_t far *vrl_id_iter;
 	uint32_t vrl_size;
 	int num_of_vrl;
-	struct vrl1_vgax_header huge *curr_vrl;
-	//word w=0;
-
-	gvar.mm.mmstarted=0;
-#ifdef __DEBUG_PM__
-	dbg_debugpm=1;
-#endif
-	// DOSLIB: check our environment
-	probe_dos();
-
-	// DOSLIB: what CPU are we using?
-	// NTS: I can see from the makefile Sparky4 intends this to run on 8088 by the -0 switch in CFLAGS.
-	//      So this code by itself shouldn't care too much what CPU it's running on. Except that other
-	//      parts of this project (DOSLIB itself) rely on CPU detection to know what is appropriate for
-	//      the CPU to carry out tasks. --J.C.
-	cpu_probe();
-
-	// DOSLIB: check for VGA
-	if (!probe_vga()) {
-		printf("VGA probe failed\n");
-		return;
-	}
-	// hardware must be VGA or higher!
-	if (!(vga_state.vga_flags & VGA_IS_VGA)) {
-		printf("This program requires VGA or higher graphics hardware\n");
-		return;
-	}
+	struct vrl1_vgax_header far *curr_vrl;
+	byte *pal=0;
+	int size=0;
+	word w=0;
+	dbg_notest=0;
 
-	//gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
+	Startup16(&gvar);
 
-	MM_Startup(&gvar);
-	PM_Startup(&gvar);
-	PM_UnlockMainMem(&gvar);
-	CA_Startup(&gvar);
 	// What should be done by read_vrs:
 	//sega = (mm.bufferseg);
-	if(CA_LoadFile("data/spri/chikyuu.vrs", &bigbuffer, &gvar)) baka=1; else baka=0;
+	//if(
+	CA_LoadFile("data/spri/chikyuu.vrs", &bigbuffer, &gvar);//) baka=1; else baka=0;
 
 	// Insert sanity cheks later
 	vrs.buffer = bigbuffer;
 	vrs.data_size = size - sizeof(struct vrl1_vgax_header);
 	num_of_vrl = 0;
-	vrl_id_iter = (uint16_t huge *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);
+	vrl_id_iter = (uint16_t far *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);
 	while(vrl_id_iter[num_of_vrl]){
 		num_of_vrl++;
 	}
@@ -98,10 +74,10 @@ void main() {
 	// Allocate memory for vrl line offsets table
 	vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);
 
-	vrl_headers_offsets = (uint32_t huge *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);
+	vrl_headers_offsets = (uint32_t far *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);
 	// Calculate line offsets for each vrl
 	for(i = 0; i < num_of_vrl; i++){
-		curr_vrl = (struct vrl1_vgax_header huge *)(vrs.buffer + vrl_headers_offsets[i]);
+		curr_vrl = (struct vrl1_vgax_header far *)(vrs.buffer + vrl_headers_offsets[i]);
 
 		// Calc. vrl size as (next_offset - curr_offset)
 		if (i != num_of_vrl - 1){
@@ -131,9 +107,9 @@ void main() {
 /*	sega = mm.bufferseg;
 	if(CA_LoadFile("data/spri/CHUBACW1.vrl", &bigbuffer, &mm, &mmi)) baka=1; else baka=0;*/
 
-	/* clear and draw one sprite and one bitmap */
 	VGAmodeX(1, 1, &gvar);
 	modexHiganbanaPageSetup(&gvar.video);
+	VL_ShowPage(&gvar.video.page[0], 0, 1);
 
 	/* non sprite comparison */
 	start = *clockw;
@@ -144,14 +120,14 @@ void main() {
 
 	t2 = (*clockw-start)/18.2;
 
-	modexLoadPalFile("data/spri/chikyuu.pal", &pal);
-	modexPalUpdate1(pal);
+	/*modexLoadPalFile("data/spri/chikyuu.pal", &pal);
+	modexPalUpdate1(pal);*/
 	for (i = 0; i < 5; i++){
-	spri.delay = 1; animate_spri(&spri); spri.x += 20; /*sleep(1);*/ }
+	spri.delay = 1; animate_spri(&spri, &gvar); spri.x += 20; /*sleep(1);*/ }
 
-	while(!kbhit())
+	while(!IN_KeyDown(sc_Escape))
 	{
-		/*switch(w)
+		switch(w)
 		{
 			case 1024:
 				modexPalUpdate0(pal);
@@ -159,18 +135,18 @@ void main() {
 			default:
 				w++;
 			break;
-		}*/
+		}
+FUNCTIONKEYFUNCTIONS;
 	}
 	VGAmodeX(0, 1, &gvar);
 	MM_ShowMemory(&gvar);
 	MM_DumpData(&gvar);
 	MM_Report_(&gvar);
+	Shutdown16(&gvar);
 	free(spri.sprite_vrl_cont);
+	free(vrl_line_offsets);
 	MM_FreePtr(&bigbuffer, &gvar);
 	//MM_FreePtr(&((void __based(sega)*)spri.spritesheet->buffer), &mm);
-	PM_Shutdown(&gvar);
-	CA_Shutdown(&gvar);
-	MM_Shutdown(&gvar);
 	//printf("CPU to VGA: %f\n", t1);
 	//printf("VGA to VGA: %f\n", t2);
 	heapdump(&gvar);
@@ -181,6 +157,6 @@ void main() {
 //0000	printf("gvar.video.page[0].width: %u\n", gvar.video.page[0].width);
 //0000	printf("gvar.video.page[0].height: %u\n", gvar.video.page[0].height);
 	printf("Num %d", num_of_vrl);
-	if(baka) printf("\nyay!\n");
-	else printf("\npoo!\n");
+//	if(baka) printf("\nyay!\n");
+//	else printf("\npoo!\n");
 }