exmmtest.exe \> exmmtest.l16 == BOOM

[16.git] / src / lib / 16_ca.c

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index ca0ad83748917056141568a104ccd969488511bf..95fa54460becb9526796e0124d327fd9a03d82df 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -1123,15 +1123,13 @@ dinorm:
 \r
 void CAL_SetupMapFile (global_game_variables_t *gvar)\r
 {\r
-#ifndef MAPHEADERLINKED\r
-       int handle;\r
-       long length;\r
-#endif\r
+//++   int handle;\r
+//++   long length;\r
 \r
 //\r
 // load maphead.ext (offsets and tileinfo for map file)\r
 //\r
-#ifndef MAPHEADERLINKED\r
+/*#ifndef MAPHEADERLINKED\r
        if ((handle = open("maphead.mph",\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
                Quit (gvar, "Can't open maphead.mph");\r
@@ -1143,13 +1141,13 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
 \r
        gvar->ca.tinf = (byte _seg *)FP_SEG(&maphead);\r
 \r
-#endif\r
+#endif*/\r
 \r
 //\r
 // open the data file\r
 //\r
 //TODO: multiple files\r
-       if ((gvar->ca.file.maphandle[0] = open("data/test.map",\r
+       if ((gvar->ca.file.maphandle = open("data/test.map",\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
                Quit (gvar, "Can't open data/test.map!");\r
 /*#ifdef MAPHEADERLINKED\r
@@ -1174,18 +1172,18 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
 ======================\r
 */\r
 \r
-/*void CAL_SetupAudioFile (void)\r
+void CAL_SetupAudioFile (global_game_variables_t *gvar)\r
 {\r
-       int handle;\r
-       long length;\r
+//++   int handle;\r
+//++   long length;\r
 \r
 //\r
 // load maphead.ext (offsets and tileinfo for map file)\r
 //\r
-#ifndef AUDIOHEADERLINKED\r
-       if ((handle = open("AUDIOHED."EXT,\r
+/*#ifndef AUDIOHEADERLINKED\r
+       if ((handle = open("audihead.adh,\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
-               Quit (gvar, "Can't open AUDIOHED."EXT"!");\r
+               Quit (gvar, "Can't open audihead.adh!");\r
        length = filelength(handle);\r
        MM_GetPtr (MEMPTR audiostarts,length);\r
        CA_FarRead(handle, (byte far *)audiostarts, length);\r
@@ -1194,21 +1192,25 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
        audiohuffman = (huffnode *)&audiodict;\r
        CAL_OptimizeNodes (audiohuffman);\r
        audiostarts = (long _seg *)FP_SEG(&audiohead);\r
-#endif\r
+#endif*/\r
 \r
 //\r
 // open the data file\r
 //\r
-#ifndef AUDIOHEADERLINKED\r
+//TODO: multiple files\r
+       if ((gvar->ca.file.audiohandle = open("data/02.imf",\r
+                O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
+               Quit (gvar, "Can't open data/02.imf!");\r
+/*#ifndef AUDIOHEADERLINKED\r
        if ((audiohandle = open("AUDIOT."EXT,\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
                Quit (gvar, "Can't open AUDIOT."EXT"!");\r
-#else\r
+//#else\r
        if ((audiohandle = open("AUDIO."EXT,\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
                Quit (gvar, "Can't open AUDIO."EXT"!");\r
-#endif\r
-}*/\r
+#endif*/\r
+}\r
 \r
 //==========================================================================\r
 \r
@@ -1253,7 +1255,7 @@ void CA_Startup(global_game_variables_t *gvar)
        CAL_SetupGrFile (gvar);\r
 #endif\r
 #ifndef NOAUDIO\r
-       CAL_SetupMapFile (gvar);\r
+       CAL_SetupAudioFile (gvar);\r
 #endif\r
 \r
        gvar->ca.camap.mapon = -1;\r
@@ -1285,10 +1287,9 @@ void CA_Shutdown(global_game_variables_t *gvar)
 #endif\r
        close(gvar->handle.showmemhandle);\r
 \r
-       close(*(gvar->ca.file.maphandle));\r
-/*++++\r
-       close(grhandle);\r
-       close(audiohandle);*/\r
+       close(gvar->ca.file.maphandle);\r
+       close(gvar->ca.file.grhandle);\r
+       close(gvar->ca.file.audiohandle);\r
 }\r
 \r
 //===========================================================================\r