16_ca need to be used more

diff --git a/MEMINFO.16W b/MEMINFO.16W
new file mode 100755 (executable)
index 0000000..e69de29

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index dcdcaa1c3bc65b262a78fc6439bcd36eacc7f9ad..9e98489951b3ba0a1aad5bf1b729330e5eda07f7 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -2034,21 +2034,21 @@ void CA_ClearAllMarks (global_game_variables_t *gvar)
 =\r
 ======================\r
 */\r
-/*++++\r
-void CA_SetGrPurge (void)\r
+\r
+void CA_SetGrPurge (global_game_variables_t *gvar)\r
 {\r
        int i;\r
 \r
 //\r
 // free graphics\r
 //\r
-       CA_ClearMarks ();\r
+       CA_ClearMarks (gvar);\r
 \r
        for (i=0;i<NUMCHUNKS;i++)\r
-               if (grsegs[i])\r
-                       MM_SetPurge (&(memptr)grsegs[i],3);\r
+               if (gvar->ca.grsegs[i])\r
+                       MM_SetPurge (gvar->ca.grsegs[i],3, gvar);\r
 }\r
-*/\r
+\r
 \r
 /*\r
 ======================\r
@@ -2059,12 +2059,12 @@ void CA_SetGrPurge (void)
 =\r
 ======================\r
 */\r
-/*++++++++\r
-void CA_SetAllPurge (void)\r
+\r
+void CA_SetAllPurge (global_game_variables_t *gvar)\r
 {\r
        int i;\r
 \r
-       CA_ClearMarks ();\r
+       CA_ClearMarks (gvar);\r
 \r
 //\r
 // free cursor sprite and background save\r
@@ -2074,26 +2074,26 @@ void CA_SetAllPurge (void)
 //\r
 // free map headers and map planes\r
 //\r
-       for (i=0;i<NUMMAPS;i++)\r
-               if (mapheaderseg[i])\r
-                       MM_SetPurge (&(memptr)mapheaderseg[i],3);\r
+//     for (i=0;i<NUMMAPS;i++)\r
+//             if (gvar->ca.camap.mapheaderseg[i])\r
+//                     MM_SetPurge (gvar->ca.camap.mapheaderseg[i],3, gvar);\r
 \r
        for (i=0;i<3;i++)\r
-               if (mapsegs[i])\r
-                       MM_FreePtr (&(memptr)mapsegs[i]);\r
+               if (gvar->ca.mapsegs[i])\r
+                       MM_FreePtr (gvar->ca.mapsegs[i], gvar);\r
 \r
 //\r
 // free sounds\r
 //\r
        for (i=0;i<NUMSNDCHUNKS;i++)\r
-               if (audiosegs[i])\r
-                       MM_SetPurge (&(memptr)audiosegs[i],3);\r
+               if (gvar->ca.audiosegs[i])\r
+                       MM_SetPurge (gvar->ca.audiosegs[i],3, gvar);\r
 \r
 //\r
 // free graphics\r
 //\r
-       CA_SetGrPurge ();\r
-}*/\r
+       CA_SetGrPurge (gvar);\r
+}\r
 \r
 \r
 //===========================================================================\r

diff --git a/src/lib/16_ca.h b/src/lib/16_ca.h
index 471a4517de1b5e5f2b04a5bb83b479b74f630ab5..6e4933cb947b3cda48fc235b779b24639282f11e 100755 (executable)
--- a/src/lib/16_ca.h
+++ b/src/lib/16_ca.h
@@ -108,10 +108,10 @@ void CA_Shutdown (global_game_variables_t *gvar);
 //void CA_LoadAllSounds (void);\r
 \r
 /*void CA_UpLevel (void);\r
-void CA_DownLevel (void);\r
+void CA_DownLevel (void);*/\r
 \r
-void CA_SetGrPurge (void);\r
-void CA_SetAllPurge (void);*/\r
+void CA_SetGrPurge (global_game_variables_t *gvar);\r
+void CA_SetAllPurge (global_game_variables_t *gvar);\r
 \r
 void CA_ClearMarks (global_game_variables_t *gvar);\r
 void CA_ClearAllMarks (global_game_variables_t *gvar);\r

diff --git a/src/lib/16_map.c b/src/lib/16_map.c
index 2616778109b6b2559e5ff25271e6c7cd049cf225..946c809a58bd8b90d9e74be4371d78509dd407dd 100755 (executable)
--- a/src/lib/16_map.c
+++ b/src/lib/16_map.c
@@ -213,7 +213,7 @@ int newloadmap(char *mn, map_t *map) {
 //======\r
 \r
 \r
-#define MAPBUFINLM (gvar->ca.camap.mapsegs)\r
+#define MAPBUFINLM *(gvar->ca.mapsegs)\r
 int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar)\r
 {\r
        jsmn_parser p;\r

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 5621be818b2ccc31088f20f719028ff966e8dce0..cf5f56eb00a314dae78823a0b1bbaabff588f2e2 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -507,6 +507,7 @@ typedef struct
 \r
 #define NUMMAPS                4//39\r
 #define MAPPLANES              3\r
+#define NUMSNDCHUNKS           84\r
 \r
 typedef struct\r
 {\r
@@ -516,24 +517,27 @@ typedef struct
 typedef struct\r
 {\r
        int             mapon, mapnum;\r
-       //__SEGA        *mapsegs[4];\r
        //__SEGA        *mapheaderseg[NUMMAPS];\r
-       //__SEGA        *tinf;\r
-       memptr  mapsegs;\r
 } ca_mapinfo_t;\r
 \r
 typedef struct\r
 {\r
        int                     maphandle[4];           // handle to MAPTEMP / GAMEMAPS\r
+       int                     grhandle[4];            // handle to EGAGRAPH\r
+       int                     audiohandle[4]; // handle to AUDIOT / AUDIO\r
 } ca_handle_t;\r
 \r
 typedef struct\r
 {\r
-       byte            ca_levelbit,ca_levelnum;\r
-       ca_handle_t     file;           //files to open\r
+       byte    ca_levelbit,ca_levelnum;\r
+       ca_handle_t             file;           //files to open\r
        ca_mapinfo_t    camap;\r
-       __SEGA  *grsegs[NUMCHUNKS];\r
-       byte            far     grneeded[NUMCHUNKS];\r
+\r
+       memptr/*__SEGA*/        mapsegs[MAP_LAYERS];\r
+       memptr/*__SEGA*/        *grsegs[NUMCHUNKS];\r
+       byte            far             grneeded[NUMCHUNKS];\r
+       memptr/*byte _seg*/     *audiosegs[NUMSNDCHUNKS];\r
+\r
        huffnode huffnode;\r
 \r
        //TODO: extend! and learn from keen/wolf/catacomb's code wwww\r

diff --git a/src/maptest.c b/src/maptest.c
index 11097deb6911bb1f1cd6be7a199a7a455f47a97a..e8e2d53c2e27417e90798d5ff725dd0432384b1d 100755 (executable)
--- a/src/maptest.c
+++ b/src/maptest.c
@@ -48,7 +48,7 @@ main(int argc, char *argv[])
 \r
        fprintf(stderr, fmt, _memavl());\r
        fprintf(stderr, fmt0, _memmax());\r
-       fprintf(stderr, "Size of map var = %u\n", _msize(&(gvar.ca.camap.mapsegs)));\r
+       fprintf(stderr, "Size of map var = %u\n", _msize(&(gvar.ca.mapsegs)));\r
        //getch();\r
 \r
        CA_loadmap("data/test.map", &map, &gvar);\r
@@ -74,7 +74,7 @@ main(int argc, char *argv[])
                getch();\r
        }\r
 #else\r
-       //fprintf(stderr, "contents of the buffer\n[\n%s\n]\n", (gvar.ca.camap.mapsegs));\r
+       //fprintf(stderr, "contents of the buffer\n[\n%s\n]\n", (gvar.ca.mapsegs));\r
 #endif\r
        /*fprintf(stdout, "&main()=%Fp\n", *argv[0]);\r
        fprintf(stdout, "&map==%Fp\n", &map);\r
@@ -84,7 +84,7 @@ main(int argc, char *argv[])
        fprintf(stdout, "&map.data==%Fp\n", map.data);*/\r
 #endif\r
        //fprintf(stderr, "here comes dat boi!\n"); getch(); fprintf(stderr, "%s", datboi);\r
-       MM_FreePtr(&(gvar.ca.camap.mapsegs), &gvar);\r
+       MM_FreePtr(&(gvar.ca.mapsegs), &gvar);\r
        PM_Shutdown(&gvar);\r
        CA_Shutdown(&gvar);\r
        MM_Shutdown(&gvar);\r