X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fvrstest.c;h=8e2a4c417afa52df013ced2f80cd38fff9bfa996;hb=6021fc3f27b895d382fbd30488ead35657e39196;hp=1037b7c92c43b1be25891adc9e3f8cf00cd0b625;hpb=02ebe5d276d33d55b9d46fef19a8ef939b7c9743;p=16.git

diff --git a/src/vrstest.c b/src/vrstest.c
index 1037b7c9..8e2a4c41 100755
--- a/src/vrstest.c
+++ b/src/vrstest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2018 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -28,7 +28,9 @@
 #include "src/lib/16_ca.h"
 #include "src/lib/16_mm.h"
 
+#ifdef __DEBUG_InputMgr__
 extern boolean dbg_nointest;
+#endif
 boolean panswitch;
 
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
@@ -53,7 +55,9 @@ void main()
 	int size=0;
 */
 
+#ifdef __DEBUG_InputMgr__
 	dbg_nointest=0;
+#endif
 	Startup16(&gvar);
 
 /*	CA_LoadFile("data/spri/chikyuu.vrs", &bigbuffer, &gvar);
@@ -91,23 +95,23 @@ void main()
 //	read_vrs(&gvar, "data/spri/chikyuu.vrs", &vrs);
 
 
-	enti.spri->spritesheet = &vrs;
-	enti.spri->sprite_vrl_cont = malloc(sizeof(struct vrl_container));*/
+	enti.spri.spritesheet = &vrs;
+	enti.spri.sprite_vrl_cont = malloc(sizeof(struct vrl_container));*/
 	VRS_LoadVRS("data/spri/chikyuu.vrs", &enti, &gvar);
-	i = set_anim_by_id((enti.spri), 31);
+	i = set_anim_by_id(&(enti.spri), 31);
 	if (i == -1)
 	{
 		//Quit(&gvar, "ERROR!! glitch IN FILE!\n");
 	}
-	enti.spri->x = TILEWH-4;
-	enti.spri->y = TILEWH;
+	enti.spri.x = TILEWH-4;
+	enti.spri.y = TILEWH;
 
 //	Uncomment to see broken sprites
 /*	sega = mm.bufferseg;
 	if(CA_LoadFile("data/spri/CHUBACW1.vrl", &bigbuffer, &mm, &mmi)) baka=1; else baka=0;*/
 
 	VGAmodeX(1, 1, &gvar);
-	modexHiganbanaPageSetup(&gvar.video);
+	modexHiganbanaPageSetup(&gvar);
 	VL_ShowPage(&gvar.video.page[0], 1, 0);
 
 	/* non sprite comparison */
@@ -122,17 +126,17 @@ void main()
 	/*modexLoadPalFile("data/spri/chikyuu.pal", &pal);
 	modexPalUpdate(pal);*/
 	//modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 2);
-	VL_LoadPalFile("data/spri/chikyuu.pal", &gvar.video.palette);
+	VL_LoadPalFile("data/spri/chikyuu.pal", &gvar.video.palette, &gvar);
 	for (i = 0; i < 10; i++){
-		enti.spri->delay = 1;
+		enti.spri.delay = 1;
 
-		if(i==5) set_anim_by_id(enti.spri, 21);
+		if(i==5) set_anim_by_id(&enti.spri, 21);
 
-		animate_spri(&enti, &gvar.video);// enti.spri->x += 16;
+		animate_spri(&enti, &gvar.video);// enti.spri.x += 16;
 		delay(500);
 	}
 
-	while(!IN_KeyDown(sc_Escape))
+	while(!gvar.in.inst->Keyboard[sc_Escape])
 	{
 		switch(w)
 		{
@@ -144,23 +148,21 @@ void main()
 //				gvar.video.palette[w]=rand();
 			break;
 		}
-		FUNCTIONKEYDRAWJUNKNOMV
-		if(IN_KeyDown(sc_F7)){ VL_ShowPage(&gvar.video.page[0], 1, 1);							IN_UserInput(1,1); }
-		if(IN_KeyDown(sc_F6)){ VL_ShowPage(&gvar.video.page[0], 1, 0);							IN_UserInput(1,1); }
-		if(IN_KeyDown(25)){ modexpdump(&gvar.video.page[0]);  IN_UserInput(1,1); } //p
+		TAIL_FUNCTIONKEYDRAWJUNKNOMV
+		if(gvar.in.inst->Keyboard[sc_F7]){ VL_ShowPage(&gvar.video.page[0], 1, 1);							IN_UserInput(1, &gvar); }
+		if(gvar.in.inst->Keyboard[sc_F6]){ VL_ShowPage(&gvar.video.page[0], 1, 0);							IN_UserInput(1, &gvar); }
+		if(gvar.in.inst->Keyboard[25]){ modexpdump(0, &gvar);  IN_UserInput(1, &gvar); } //p
 	}
 	VGAmodeX(0, 1, &gvar);
 	MM_ShowMemory(&gvar);
 	MM_DumpData(&gvar);
 	MM_Report_(&gvar);
 	Shutdown16(&gvar);
-	free(enti.spri->sprite_vrl_cont);
-	free(enti.spri->spritesheet->vrl_line_offsets);
 	MM_FreePtr(&bigbuffer, &gvar);
-	//MM_FreePtr(&((void __based(sega)*)enti.spri->spritesheet->buffer), &mm);
+	//MM_FreePtr(&((void __based(sega)*)enti.spri.spritesheet->buffer), &mm);
 	//printf("CPU to VGA: %f\n", t1);
 	//printf("VGA to VGA: %f\n", t2);
-	heapdump(&gvar);
+	//HC_heapdump(&gvar);
 	printf("Project 16 vrstest.exe. This is just a test file!\n");
 	printf("version %s\n", VERSION);
 	printf("t1: %f\n", t1);