meh

[16.git] / src / lib / 16_tdef.h

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 5621be818b2ccc31088f20f719028ff966e8dce0..10fd1eea58a9ef02f36f113d7666fcedb353d198 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,30 @@ 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
+typedef struct //TODO: USE THIS!!!!\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
+       //misc memptr\r
+       memptr tinf[4];\r
+\r
        huffnode huffnode;\r
 \r
        //TODO: extend! and learn from keen/wolf/catacomb's code wwww\r