X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fvrstest.c;h=743fe4aff9bdbd8421db40f61c3a0150651e02c8;hb=d337fd88c992c80c68263f66a2d22f3ce2ffefa1;hp=05db59e14de7dfc9f976a1f617b2509e8e0f36e8;hpb=4423bda56aab2192f037bec035a3412153b2b3a7;p=16.git

diff --git a/src/vrstest.c b/src/vrstest.c
index 05db59e1..743fe4af 100755
--- a/src/vrstest.c
+++ b/src/vrstest.c
@@ -20,24 +20,28 @@
  *
  */
 
-#include "src/lib/modex16.h"
+//#include "src/lib/16_head.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"
 
+static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
+
 void main() {
-	global_game_variables_t gvar;
-	__segment sega;
+	static global_game_variables_t gvar;
+	//__segment sega;
 	memptr bigbuffer;
 	int i;
 	word start;
-	int plane;
 	float t1, t2;
 	boolean baka;
-	byte *pal;
-	int size, size1;
+	byte *pal=0;
+	int size=0;
 	struct sprite spri;
-	vrl1_vgax_offset_t * off, *off1;
+	//vrl1_vgax_offset_t * off, *off1;
 	struct vrs_container vrs;
 	vrl1_vgax_offset_t **vrl_line_offsets;
 	uint32_t huge *vrl_headers_offsets;
@@ -45,9 +49,11 @@ void main() {
 	uint32_t vrl_size;
 	int num_of_vrl;
 	struct vrl1_vgax_header huge *curr_vrl;
-	struct vrl_container *vrl;
 	word w=0;
 
+	gvar.mm.mmstarted=0;
+	dbg_debugpm=1;
+
 	// DOSLIB: check our environment
 	probe_dos();
 
@@ -71,8 +77,9 @@ void main() {
 
 	//gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
 
-	gvar.mm.mmstarted=0;
 	MM_Startup(&gvar);
+	PM_Startup(&gvar);
+	PM_UnlockMainMem(&gvar);
 	CA_Startup(&gvar);
 	// What should be done by read_vrs:
 	//sega = (mm.bufferseg);
@@ -137,7 +144,7 @@ void main() {
 	t2 = (*clockw-start)/18.2;
 
 	for (i = 0; i < 5; i++){
-	spri.delay = 1; animate_spri(&spri); spri.x += 20; sleep(1); }
+	spri.delay = 1; animate_spri(&spri); spri.x += 20; /*sleep(1);*/ }
 
 	while(!kbhit())
 	{
@@ -154,9 +161,11 @@ void main() {
 	VGAmodeX(0, 1, &gvar);
 	MM_ShowMemory(&gvar);
 	MM_DumpData(&gvar);
+	MM_Report_(&gvar);
 	free(spri.sprite_vrl_cont);
 	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);
@@ -166,8 +175,8 @@ void main() {
 	printf("version %s\n", VERSION);
 	printf("t1: %f\n", t1);
 	printf("t2: %f\n", t2);
-	printf("gvar.video.page[0].width: %u\n", gvar.video.page[0].width);
-	printf("gvar.video.page[0].height: %u\n", gvar.video.page[0].height);
+//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");