X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fvrstest.c;h=fe532b84eb6e6a9f5842c3a5f8d198a28497563f;hb=df87f3ca145683309e2ebd3eb186cf6aca2c4e37;hp=e90d10e84df362b138cf0bf2fe848e3c88cdd6c0;hpb=c3b339d60cd761f2034f21078f375d4a3165e742;p=16.git

diff --git a/src/vrstest.c b/src/vrstest.c
index e90d10e8..fe532b84 100755
--- a/src/vrstest.c
+++ b/src/vrstest.c
@@ -55,14 +55,41 @@ void main() {
 	word w=0;
 
 
+
+	// 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;
+	}
+
+	//bmp = bitmapLoadPcx("data/chikyuu.pcx");
+	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
+
 	mm.mmstarted=0;
 	MM_Startup(&mm, &mmi);
 	CA_Startup(&gvar);
+	// What should be done by read_vrs:
+	//sega = (mm.bufferseg);
 	if(CA_LoadFile("data/spri/chikyuu.vrs", &bigbuffer, &mm, &mmi)) baka=1; else baka=0;
-// 	fd = open("data/spri/chikyuu.vrs", O_RDONLY|O_BINARY);
-// 	size = lseek(fd, 0, SEEK_END);
-// 	lseek(fd, 0, SEEK_SET);
-// 	close(fd);
+	fd = open("data/spri/chikyuu.vrs", O_RDONLY|O_BINARY);
+	size = lseek(fd, 0, SEEK_END);
+	lseek(fd, 0, SEEK_SET);
+	close(fd);
 	// Insert sanity cheks later
 	vrs.buffer = bigbuffer;
 	vrs.data_size = size - sizeof(struct vrl1_vgax_header);
@@ -92,6 +119,7 @@ void main() {
 	}
 	vrs.vrl_line_offsets = vrl_line_offsets;
 
+
 	//read_vrs(&gvar, "data/spri/chikyuu.vrs", &vrs);
 	spri.spritesheet = &vrs;
 	spri.sprite_vrl_cont = malloc(sizeof(struct vrl_container));
@@ -104,33 +132,8 @@ void main() {
 	spri.y = 100;
 
 //	Uncomment to see broken sprites
-	//if(CA_ReadFile("data/spri/CHUBACW1.vrl", &bigbuffer, &mm)) baka=1; else baka=0;
-	//if(CA_LoadFile("data/spri/CHUBACW1.vrl", &bbuffer, &mm, &mmi)) baka=1; else baka=0;
-
-	// 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;
-	}
-
-	//bmp = bitmapLoadPcx("data/chikyuu.pcx");
-	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
-
+/*	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);