From 1cf7845eb1d7fec3fb12341a5c1e1b58c5b11dd5 Mon Sep 17 00:00:00 2001
From: sparky4 <sparky4@cock.li>
Date: Fri, 2 Sep 2016 15:23:04 -0500
Subject: [PATCH] vgacamm.exe fixed and vrstest works better~! wwwwwwwwwwwww

---
 src/lib/16_ca.c    | 30 +++++++++---------------------
 src/lib/typdefst.h |  1 +
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 8acba516..8f86cb2a 100755
--- 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);
 #endif
 #endif
-// 	unlink("debug0.16");
-// 	gvar->handle.showmemhandle = open("debug0.16", O_CREAT | O_WRONLY | O_TEXT);
+/*	CAL_SetupMapFile ();
+	CAL_SetupGrFile ();
+	CAL_SetupAudioFile ();*/
 /*++++
 // MDM begin - (GAMERS EDGE)
 //
@@ -1160,13 +1161,13 @@ void CA_Startup(global_game_variables_t *gvar)
 
 #ifndef NOGRAPHICS
 	CAL_SetupGrFile ();
-#endif
+#endif*/
 
-	mapon = -1;
-	ca_levelbit = 1;
-	ca_levelnum = 0;
+	gvar->ca.mapon = -1;
+	gvar->ca.ca_levelbit = 1;
+	gvar->ca.ca_levelnum = 0;
 
-	drawcachebox	= CAL_DialogDraw;
+/*	drawcachebox	= CAL_DialogDraw;
 	updatecachebox  = CAL_DialogUpdate;
 	finishcachebox	= CAL_DialogFinish;*/
 }
@@ -2031,20 +2032,7 @@ void CA_SetAllPurge (void)
 //
 // free graphics
 //
-	CA_FreeGraphics ();
-}
-
-
-void CA_SetGrPurge (void)
-{
-	int i;
-
-//
-// free graphics
-//
-	for (i=0;i<NUMCHUNKS;i++)
-		if (grsegs[i])
-			MM_SetPurge (&(memptr)grsegs[i],3);
+	CA_SetGrPurge ();
 }*/
 
 
diff --git a/src/lib/typdefst.h b/src/lib/typdefst.h
index 286f675c..5514e779 100755
--- a/src/lib/typdefst.h
+++ b/src/lib/typdefst.h
@@ -187,6 +187,7 @@ typedef struct
 typedef struct
 {
 	byte		ca_levelbit,ca_levelnum;
+	int		mapon;
 	//huffnode huffnode;
 } ca_t;
 
-- 
2.39.2