wwww yakuji wwww ca use to load maps w hmmm cachemap wwww

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 762a6bb72da5d6f9a3b8ab598f12e25a506704fc..c85c3a7a3a83653e13367d488def136330b8637b 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -1229,7 +1229,7 @@ void CA_Startup(global_game_variables_t *gvar)
 \r
        CAL_SetupMapFile (gvar);\r
 \r
-       gvar->ca.mapon = -1;\r
+       gvar->ca.map.mapon = -1;\r
        gvar->ca.ca_levelbit = 1;\r
        gvar->ca.ca_levelnum = 0;\r
 \r
@@ -1953,15 +1953,15 @@ void CA_CacheMap (global_game_variables_t *gvar)
 =\r
 ======================\r
 */\r
-/*++++\r
-void CA_UpLevel (void)\r
+\r
+void CA_UpLevel (global_game_variables_t *gvar)\r
 {\r
-       if (ca_levelnum==7)\r
-               Quit ("CA_UpLevel: Up past level 7!");\r
+       if (gvar->ca.ca_levelnum==7)\r
+               printf("CA_UpLevel: Up past level 7!");\r
 \r
-       ca_levelbit<<=1;\r
-       ca_levelnum++;\r
-}*/\r
+       gvar->ca.ca_levelbit<<=1;\r
+       gvar->ca.ca_levelnum++;\r
+}\r
 \r
 //===========================================================================\r
 \r
@@ -1975,15 +1975,15 @@ void CA_UpLevel (void)
 =\r
 ======================\r
 */\r
-/*++\r
-void CA_DownLevel (void)\r
+\r
+void CA_DownLevel (global_game_variables_t *gvar)\r
 {\r
-       if (!ca_levelnum)\r
-               Quit ("CA_DownLevel: Down past level 0!");\r
-       ca_levelbit>>=1;\r
-       ca_levelnum--;\r
-       CA_CacheMarks(NULL);\r
-}*/\r
+       if (!gvar->ca.ca_levelnum)\r
+               printf("CA_DownLevel: Down past level 0!");\r
+       gvar->ca.ca_levelbit>>=1;\r
+       gvar->ca.ca_levelnum--;\r
+       ////++++++++++++++++++++++++++++++++++++++++++CA_CacheMarks(NULL);\r
+}\r
 \r
 //===========================================================================\r
 \r

diff --git a/src/lib/typdefst.h b/src/lib/typdefst.h
index 02c1df1a1186b25b011be42f050a390832289fdd..70012de8fbd730a9320a8f9de054cd86b7bd3c5e 100755 (executable)
--- a/src/lib/typdefst.h
+++ b/src/lib/typdefst.h
@@ -188,8 +188,10 @@ typedef struct
 \r
 typedef struct\r
 {\r
+       int             mapon, mapnum;\r
        __segment       *mapsegs[4];\r
        __segment       *mapheaderseg[NUMMAPS];\r
+       __segment       *tinf;\r
 } mapinfo_t;\r
 \r
 typedef struct\r
@@ -200,7 +202,6 @@ typedef struct
 typedef struct\r
 {\r
        byte            ca_levelbit,ca_levelnum;\r
-       int             mapon, mapnum;\r
        handle_t        file;           //files to open\r
        mapinfo_t       map;\r
        //_seg  *grsegs[NUMCHUNKS];\r