vgacamm.exe fixed and vrstest works better~! wwwwwwwwwwwww

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 8acba51635bcaab7dccde33be6da319f3999a6b3..8f86cb2a871245a8e2814ee290d7036b28034f22 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -1126,8 +1126,9 @@ void CA_Startup(global_game_variables_t *gvar)
        gvar->handle.profilehandle = open("profile.16w", O_CREAT | O_WRONLY | O_TEXT);\r
 #endif\r
 #endif\r
-//     unlink("debug0.16");\r
-//     gvar->handle.showmemhandle = open("debug0.16", O_CREAT | O_WRONLY | O_TEXT);\r
+/*     CAL_SetupMapFile ();\r
+       CAL_SetupGrFile ();\r
+       CAL_SetupAudioFile ();*/\r
 /*++++\r
 // MDM begin - (GAMERS EDGE)\r
 //\r
@@ -1160,13 +1161,13 @@ void CA_Startup(global_game_variables_t *gvar)
 \r
 #ifndef NOGRAPHICS\r
        CAL_SetupGrFile ();\r
-#endif\r
+#endif*/\r
 \r
-       mapon = -1;\r
-       ca_levelbit = 1;\r
-       ca_levelnum = 0;\r
+       gvar->ca.mapon = -1;\r
+       gvar->ca.ca_levelbit = 1;\r
+       gvar->ca.ca_levelnum = 0;\r
 \r
-       drawcachebox    = CAL_DialogDraw;\r
+/*     drawcachebox    = CAL_DialogDraw;\r
        updatecachebox  = CAL_DialogUpdate;\r
        finishcachebox  = CAL_DialogFinish;*/\r
 }\r
@@ -2031,20 +2032,7 @@ void CA_SetAllPurge (void)
 //\r
 // free graphics\r
 //\r
-       CA_FreeGraphics ();\r
-}\r
-\r
-\r
-void CA_SetGrPurge (void)\r
-{\r
-       int i;\r
-\r
-//\r
-// free graphics\r
-//\r
-       for (i=0;i<NUMCHUNKS;i++)\r
-               if (grsegs[i])\r
-                       MM_SetPurge (&(memptr)grsegs[i],3);\r
+       CA_SetGrPurge ();\r
 }*/\r
 \r
 \r

diff --git a/src/lib/typdefst.h b/src/lib/typdefst.h
index 286f675cffb6addfb4cf93885b19f13f6f555874..5514e779dddc89c7718cdfe8847736f3b6b83f35 100755 (executable)
--- a/src/lib/typdefst.h
+++ b/src/lib/typdefst.h
@@ -187,6 +187,7 @@ typedef struct
 typedef struct\r
 {\r
        byte            ca_levelbit,ca_levelnum;\r
+       int             mapon;\r
        //huffnode huffnode;\r
 } ca_t;\r
 \r