X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_ca.c;h=ccab39ba8c97e10a7b11703e903d5522ac6f207e;hb=767a51ba929d4110350572d014665644fa2288d5;hp=d69989c32b1102853c861a77417c2aa1cb8d262d;hpb=050d28da3358d5c1434fda542ec11adbee182ea5;p=16.git

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