Merge branch 'master' of github.com:sparky4/16

[16.git] / src / vgacamm.c

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