p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I...

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

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 95fa54460becb9526796e0124d327fd9a03d82df..1b3020790c144614ee94eff1eaf0b450f0a1cddf 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -375,6 +375,17 @@ boolean CA_ReadFile(char *filename, memptr *ptr, global_game_variables_t *gvar)
                return false;\r
 \r
        size = filelength(handle);\r
+#ifdef __DEBUG_CA__\r
+       if(dbg_debugca>0){\r
+               printf("===============================================================================\n");\r
+               printf("                CA_ReadFile\n");\r
+               printf("===============================================================================\n");\r
+               //%04x\r
+               printf("        ptr=%Fp\n", ptr);\r
+               printf("        *ptr=%Fp\n", *ptr);\r
+               printf("        &ptr=%Fp\n", &ptr);\r
+       }\r
+#endif\r
        if(!CA_FarRead(handle,*ptr,size, gvar))\r
        {\r
                close(handle);\r
@@ -1123,13 +1134,15 @@ dinorm:
 \r
 void CAL_SetupMapFile (global_game_variables_t *gvar)\r
 {\r
-//++   int handle;\r
-//++   long length;\r
+#ifndef MAPHEADERLINKED\r
+       int handle;\r
+       long length;\r
+#endif\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
@@ -1141,7 +1154,7 @@ 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
@@ -1172,18 +1185,18 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
 ======================\r
 */\r
 \r
-void CAL_SetupAudioFile (global_game_variables_t *gvar)\r
+/*void CAL_SetupAudioFile (void)\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("audihead.adh,\r
+#ifndef AUDIOHEADERLINKED\r
+       if ((handle = open("AUDIOHED."EXT,\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
-               Quit (gvar, "Can't open audihead.adh!");\r
+               Quit (gvar, "Can't open AUDIOHED."EXT"!");\r
        length = filelength(handle);\r
        MM_GetPtr (MEMPTR audiostarts,length);\r
        CA_FarRead(handle, (byte far *)audiostarts, length);\r
@@ -1192,25 +1205,21 @@ void CAL_SetupAudioFile (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
-//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
+#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
@@ -1255,7 +1264,7 @@ void CA_Startup(global_game_variables_t *gvar)
        CAL_SetupGrFile (gvar);\r
 #endif\r
 #ifndef NOAUDIO\r
-       CAL_SetupAudioFile (gvar);\r
+       CAL_SetupMapFile (gvar);\r
 #endif\r
 \r
        gvar->ca.camap.mapon = -1;\r