vgacamm.exe fixed and vrstest works better~! wwwwwwwwwwwww

diff --git a/DEBUG.16W b/DEBUG.16W
index 8a6a4e7b860548d1ae35d726359d6f7152d8b69d..9c5bba7ca4bdefa206f358446113f3a08dda89a7 100755 (executable)
--- a/DEBUG.16W
+++ b/DEBUG.16W
@@ -1,16 +1,16 @@
-\e[0mSeg:0      Size:9278       Owner:0x0\r
+\e[0mSeg:0      Size:9277       Owner:0x8dfe\r
 \e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m\r
 \e[42;32m0\r
-\e[0m\e[0mSeg:243e       Size:256        Owner:0x618c\r
+\e[0m\e[0mSeg:243d       Size:256        Owner:0x618c\r
 \e[44;34m+++++\e[0m\e[47;37m_\e[0m\r
 \e[42;32m\r
-\e[0m\e[0mSeg:253e       Size:401        Owner:0xa1f0\r
+\e[0m\e[0mSeg:253d       Size:401        Owner:0xa1f2\r
 \e[44;34m++++++\e[0m\e[47;37m_\e[0m\r
 \e[42;32m\r
-\e[0m\e[0mSeg:29db       Size:36 Owner:0x0\r
+\e[0m\e[0mSeg:29da       Size:36 Owner:0x0\r
 \e[41;31m++\e[0m\e[47;37m_\e[0m\r
 \e[42;32m0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\r
-\e[0m\e[0mSeg:b9ff       Size:9729       Owner:0x0\r
+\e[0m\e[0mSeg:b9fe       Size:9730       Owner:0x0\r
 \e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m\r
 \e[42;32m\r
 \e[0m\e[0mSeg:e000       Size:8191       Owner:0x0\r

diff --git a/HEAP.16W b/HEAP.16W
index 7d1bacf729a192396ca678774301a28d7bf1b19d..b90e4007fe7af53dce1410258af0a136b2c43a3c 100755 (executable)
--- a/HEAP.16W
+++ b/HEAP.16W
@@ -1,31 +1,31 @@
 \r
        == default ==\r
 \r
-  FREE block at 29fd0016 of size 18\r
-  USED block at 29fd0028 of size 136\r
-  USED block at 29fd00b0 of size 20\r
-  FREE block at 29fd00c4 of size 7992\r
+  FREE block at 29fc0016 of size 18\r
+  USED block at 29fc0028 of size 136\r
+  USED block at 29fc00b0 of size 20\r
+  FREE block at 29fc00c4 of size 7992\r
 OK - end of heap\r
 \r
        == near ==\r
 \r
-  USED block at 19fca226 of size 12\r
-  USED block at 19fca232 of size 326\r
-  USED block at 19fca378 of size 52\r
-  USED block at 19fca3ac of size 20\r
-  USED block at 19fca3c0 of size 20\r
-  USED block at 19fca3d4 of size 20\r
-  USED block at 19fca3e8 of size 20\r
-  USED block at 19fca3fc of size 20\r
-  USED block at 19fca410 of size 23532\r
+  USED block at 19fba226 of size 12\r
+  USED block at 19fba232 of size 326\r
+  USED block at 19fba378 of size 52\r
+  USED block at 19fba3ac of size 20\r
+  USED block at 19fba3c0 of size 20\r
+  USED block at 19fba3d4 of size 20\r
+  USED block at 19fba3e8 of size 20\r
+  USED block at 19fba3fc of size 20\r
+  USED block at 19fba410 of size 23532\r
 OK - end of heap\r
 \r
        == far ==\r
 \r
-  USED block at 29fd0016 of size 18\r
-  USED block at 29fd0028 of size 136\r
-  USED block at 29fd00b0 of size 20\r
-  USED block at 29fd00c4 of size 7992\r
+  USED block at 29fc0016 of size 18\r
+  USED block at 29fc0028 of size 136\r
+  USED block at 29fc00b0 of size 20\r
+  USED block at 29fc00c4 of size 7992\r
 OK - end of heap\r
 \r
 Memory Type         Total      Used       Free\r

diff --git a/MMDUMP.16W b/MMDUMP.16W
index 67baf89c2503994fc2b3f7a0e3b987763fd9cc3c..68bebea4c092e799e186b80f598c55c1379d476b 100755 (executable)
Binary files a/MMDUMP.16W and b/MMDUMP.16W differ

diff --git a/src/vgacamm.c b/src/vgacamm.c
index 39d9280375a97ddbb4bcb78ff64f6dc3b034fa36..16054b3821d0f300dfa95e4856658be880bd5b7a 100755 (executable)
--- a/src/vgacamm.c
+++ b/src/vgacamm.c
@@ -66,11 +66,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 +93,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

diff --git a/src/vrstest.c b/src/vrstest.c
index 6ffdab39be398600bcaa0f7770236fe40775c7c2..1adf65d03bebe472e60eacd8a822f5fcf5656a3f 100755 (executable)
--- a/src/vrstest.c
+++ b/src/vrstest.c
@@ -28,10 +28,8 @@
 #include "src/lib/16_ca.h"
 #include "src/lib/16_mm.h"
 
-global_game_variables_t gvar;
-
 void main() {
-       mminfo_t mm; mminfotype mmi;
+       global_game_variables_t gvar;
        __segment sega;
        void __based(sega)* bigbuffer;
        int i;
@@ -53,8 +51,6 @@ void main() {
        struct vrl_container *vrl;
        word w=0;
 
-
-
        // DOSLIB: check our environment
        probe_dos();
 
@@ -76,15 +72,14 @@ void main() {
                return;
        }
 
-       //bmp = bitmapLoadPcx("data/chikyuu.pcx");
-       gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
+       //gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
 
-       mm.mmstarted=0;
-       MM_Startup(&mm, &mmi);
+       gvar.mm.mmstarted=0;
+       MM_Startup(&gvar.mm, &gvar.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;
+       if(CA_LoadFile("data/spri/chikyuu.vrs", &bigbuffer, &gvar.mm, &gvar.mmi)) baka=1; else baka=0;
 
        // Insert sanity cheks later
        vrs.buffer = bigbuffer;
@@ -133,7 +128,7 @@ void main() {
 
        /* clear and draw one sprite and one bitmap */
        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);
 
        /* non sprite comparison */
        start = *clockw;
@@ -145,7 +140,7 @@ void main() {
        t2 = (*clockw-start)/18.2;
 
        for (i = 0; i < 5; i++){
-       spri.delay = 1; animate_spri(&spri); spri.x += 20; sleep(2); }
+       spri.delay = 1; animate_spri(&spri); spri.x += 20; sleep(1); }
 
        while(!kbhit())
        {
@@ -160,13 +155,18 @@ void main() {
                }
        }
        VGAmodeX(0, 1, &gvar);
+       MM_ShowMemory(&gvar, &gvar.mm);
+       MM_DumpData(&gvar.mm);
        free(spri.sprite_vrl_cont);
-       MM_FreePtr(&bigbuffer, &mm);
+       MM_FreePtr(&bigbuffer, &gvar.mm);
        //MM_FreePtr(&((void __based(sega)*)spri.spritesheet->buffer), &mm);
-       MM_Shutdown(&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 vrstest.exe. This is just a test file!\n");
+       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);