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

diff --git a/src/vrstest.c b/src/vrstest.c
index 1037b7c9..166a10e0 100755
--- a/src/vrstest.c
+++ b/src/vrstest.c
@@ -91,16 +91,16 @@ 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;
@@ -124,11 +124,11 @@ void main()
 	//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);
 	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);
 	}
 
@@ -144,23 +144,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(IN_KeyDown(sc_F7)){ VL_ShowPage(&gvar.video.page[0], 1, 1);							IN_UserInput(1, &gvar); }
+		if(IN_KeyDown(sc_F6)){ VL_ShowPage(&gvar.video.page[0], 1, 0);							IN_UserInput(1, &gvar); }
+		if(IN_KeyDown(25)){ modexpdump(&gvar.video.page[0]);  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);