==== bcexmm.exe works again! yay! ==== wwww

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

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 5621be818b2ccc31088f20f719028ff966e8dce0..dbda778a0b9fa4f49dbd188377d5be301c08ba75 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -376,7 +376,7 @@ typedef struct
        boolean         mmstarted, bombonerror, mmerror;\r
        void far        *farheap;\r
 #ifdef __BORLANDC__\r
-       void    *nearheap;\r
+       void            *nearheap;\r
 #endif\r
 #ifdef __WATCOMC__\r
        void __near     *nearheap;\r
@@ -493,7 +493,7 @@ typedef struct
                                        PMNumBlocks;\r
        long                    PMFrameCount;\r
        PageListStruct  far *PMPages;\r
-       __SEGA *PMSegPages;\r
+       memptr/*__SEGA*/ *PMSegPages;\r
        pm_mmi_t        mm;\r
        pm_emmi_t       emm;\r
        pm_xmmi_t       xmm;\r
@@ -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