16_ca needs huge amounts of work and I should remember what needs to be done soon...

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

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index d69989c32b1102853c861a77417c2aa1cb8d262d..ccab39ba8c97e10a7b11703e903d5522ac6f207e 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -1045,7 +1045,9 @@ void CAL_SetupGrFile (global_game_variables_t *gvar)
 {\r
        char fname[13];\r
        int handle;\r
+#if NUMPICS>0\r
        memptr compseg;\r
+#endif\r
 \r
 #ifdef GRHEADERLINKED\r
 \r
@@ -1159,7 +1161,7 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
 #ifndef MAPHEADERLINKED\r
        if ((handle = open("maphead.mph",\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
-               Quit ("Can't open maphead.mph");\r
+               Quit (gvar, "Can't open maphead.mph");\r
        length = filelength(handle);\r
        MM_GetPtr (MEMPTRCONV gvar->ca.tinf,length,gvar);\r
        CA_FarRead(handle, gvar->ca.tinf, length,gvar);\r
@@ -1176,15 +1178,15 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
 //TODO: multiple files\r
        if ((gvar->ca.file.maphandle = open("data/test.map",\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
-               Quit ("Can't open data/test.map!");\r
+               Quit (gvar, "Can't open data/test.map!");\r
 /*#ifdef MAPHEADERLINKED\r
        if ((maphandle = open("GAMEMAPS.16"ENSION,\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
-               Quit ("Can't open GAMEMAPS.16"ENSION"!");\r
+               Quit (gvar, "Can't open GAMEMAPS.16"ENSION"!");\r
 #else\r
        if ((maphandle = open("MAPTEMP.16"ENSION,\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
-               Quit ("Can't open MAPTEMP.16"ENSION"!");\r
+               Quit (gvar, "Can't open MAPTEMP.16"ENSION"!");\r
 #endif*/\r
 }\r
 \r
@@ -1210,7 +1212,7 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
 #ifndef AUDIOHEADERLINKED\r
        if ((handle = open("AUDIOHED.16",\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
-               Quit ("Can't open AUDIOHED.16""!");\r
+               Quit (gvar, "Can't open AUDIOHED.16""!");\r
        length = filelength(handle);\r
        MM_GetPtr (MEMPTRCONV audiostarts,length);\r
        CA_FarRead(handle, (byte far *)audiostarts, length);\r
@@ -1227,11 +1229,11 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
 #ifndef AUDIOHEADERLINKED\r
        if ((audiohandle = open("AUDIOT.16",\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
-               Quit ("Can't open AUDIOT.16""!");\r
+               Quit (gvar, "Can't open AUDIOT.16""!");\r
 #else\r
        if ((audiohandle = open("AUDIO.16",\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
-               Quit ("Can't open AUDIO.16""!");\r
+               Quit (gvar, "Can't open AUDIO.16""!");\r
 #endif\r
 }*/\r
 \r
@@ -1343,7 +1345,7 @@ void CA_CacheAudioChunk (int chunk)
 // MDM begin - (GAMERS EDGE)\r
 //\r
        if (!FindFile("AUDIO.16",NULL,2))\r
-               Quit ("CA_CacheAudioChunk(): Can't find audio files.");\r
+               Quit (gvar, "CA_CacheAudioChunk(): Can't find audio files.");\r
 //\r
 // MDM end\r
 \r
@@ -1705,7 +1707,7 @@ void CAL_CacheSprite (int chunk, byte far *compressed)
                break;\r
 \r
        default:\r
-               Quit ("CAL_CacheSprite: Bad shifts number!");\r
+               Quit (gvar, "CAL_CacheSprite: Bad shifts number!");\r
        }\r
 \r
 #endif\r
@@ -1864,7 +1866,7 @@ void CA_CacheGrChunk (int chunk)
 // MDM begin - (GAMERS EDGE)\r
 //\r
        if (!FindFile("EGAGRAPH.16",NULL,2))\r
-               Quit ("CA_CacheGrChunk(): Can't find graphics files.");\r
+               Quit (gvar, "CA_CacheGrChunk(): Can't find graphics files.");\r
 //\r
 // MDM end\r
 \r
@@ -2331,7 +2333,7 @@ void CAL_CacheMarks (char *title, global_game_variables_t *gvar)
 // MDM begin - (GAMERS EDGE)\r
 //\r
 //     if (!FindFile("EGAGRAPH.16",NULL,2))\r
-//             Quit ("CA_CacheMarks(): Can't find graphics files.");\r
+//             Quit (gvar, "CA_CacheMarks(): Can't find graphics files.");\r
 //\r
 // MDM end\r
 \r
@@ -2443,5 +2445,5 @@ void CA_CannotOpen(char *string, global_game_variables_t *gvar)
  strcpy(str,"Can't open ");\r
  strcat(str,string);\r
  strcat(str,"!\n");\r
- Quit (str);\r
+ Quit (gvar, str);\r
 }\r