X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fvgacamm.c;h=3c856f30f7a50605a94e6f15601b2fb76809dc1a;hb=c11666ac6f605f561e9c6c6f2bba3bccea4a7b18;hp=39d9280375a97ddbb4bcb78ff64f6dc3b034fa36;hpb=44054b89cca68a614961b37f5263c91efea1e686;p=16.git

diff --git a/src/vgacamm.c b/src/vgacamm.c
index 39d92803..3c856f30 100755
--- a/src/vgacamm.c
+++ b/src/vgacamm.c
@@ -20,16 +20,17 @@
  *
  */
 
-#include "src/lib/modex16.h"
+#include "src/lib/16_vl.h"
 #include "src/lib/16_sprit.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;
-	//mminfo_t mm; mminfotype mmi;
+	static global_game_variables_t gvar;
 	__segment sega;
-	void __based(sega)* bigbuffer;
+	memptr bigbuffer;
 	int i;
 	word start;
 	int plane;
@@ -43,7 +44,7 @@ void main() {
 	MM_Startup(&gvar.mm, &gvar.mmi);
 	CA_Startup(&gvar);
 	printf("loading\n");
-	if(CA_LoadFile("data/spri/chikyuu.vrs", &bigbuffer, &gvar.mm, &gvar.mmi)) baka=1; else baka=0;
+	if(CA_LoadFile("data/spri/chikyuu.vrs", &bigbuffer, &gvar)) baka=1; else baka=0;
 
 	// DOSLIB: check our environment
 	probe_dos();
@@ -66,11 +67,8 @@ void main() {
 		return;
 	}
 
-	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
-
 	VGAmodeX(1, 1, &gvar);
-	modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].sw, gvar.video.page[0].sh, 1);
-	//modexHiganbanaPageSetup(&gvar.video);
+	modexHiganbanaPageSetup(&gvar.video);
 
 	/* non sprite comparison */
 	start = *clockw;
@@ -96,13 +94,15 @@ void main() {
 	VGAmodeX(0, 1, &gvar);
 	MM_ShowMemory(&gvar, &gvar.mm);
 	MM_DumpData(&gvar.mm);
+	//
 	MM_FreePtr(&bigbuffer, &gvar.mm);
+	//
 	CA_Shutdown(&gvar);
 	MM_Shutdown(&gvar.mm);
 	//printf("CPU to VGA: %f\n", t1);
 	//printf("VGA to VGA: %f\n", t2);
 	heapdump(&gvar);
-	printf("Project 16 emmtest.exe. This is just a test file!\n");
+	printf("Project 16 vgacamm.exe. This is just a test file!\n");
 	printf("version %s\n", VERSION);
 	printf("t1: %f\n", t1);
 	printf("t2: %f\n", t2);