X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2F16_ca.c;h=8b9aab83be9c2ccb1d922938dfe50657ce47b2a9;hb=7c35eb648613504ac47e5605d79f93112f569134;hp=7298ca3f6639ae93daa497da0a3419d8dbe68b25;hpb=0a20122c69db40134055fec030af5a468eb266a3;p=16.git

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 7298ca3f..8b9aab83 100755
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -221,7 +221,7 @@ void CAL_GetGrChunkLength (int chunk)
 ==========================
 */
 
-boolean CA_FarRead(int handle, byte huge *dest, dword length, global_game_variables_t *gvar)
+boolean CA_FarRead(int handle, byte far *dest, dword length, global_game_variables_t *gvar)
 {
 	boolean flag=0;
 	//dword fat=0;
@@ -293,7 +293,7 @@ End:
 ==========================
 */
 
-boolean CA_FarWrite(int handle, byte huge *source, dword length, global_game_variables_t *gvar)
+boolean CA_FarWrite(int handle, byte far *source, dword length, global_game_variables_t *gvar)
 {
 	boolean flag=0;
 	//dword fat=0;
@@ -498,7 +498,7 @@ void CAL_OptimizeNodes(huffnode *table)
 ======================
 */
 
-void CAL_HuffExpand (byte huge *source, byte huge *dest,
+void CAL_HuffExpand (byte far *source, byte far *dest,
   long length,huffnode *hufftable)
 {
 //  unsigned bit,byte,node,code;
@@ -795,12 +795,12 @@ void CAL_CarmackExpand (unsigned far *source, unsigned far *dest, unsigned lengt
 ======================
 */
 
-long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,
+long CA_RLEWCompress (unsigned far *source, long length, unsigned far *dest,
   unsigned rlewtag)
 {
   long complength;
   unsigned value,count,i;
-  unsigned huge *start,huge *end;
+  unsigned far *start,far *end;
 
   start = dest;
 
@@ -852,11 +852,11 @@ long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,
 ======================
 */
 
-void CA_RLEWexpand (unsigned huge *source, unsigned huge *dest,long length,
+void CA_RLEWexpand (unsigned far *source, unsigned far *dest,long length,
   unsigned rlewtag)
 {
 //  unsigned value,count,i;
-  unsigned huge *end;
+  unsigned far *end;
   unsigned sourceseg,sourceoff,destseg,destoff,endseg,endoff;
 
 
@@ -1028,7 +1028,7 @@ dinorm:
 
 	if ((handle = open(GREXT"DICT."EXT,
 		 O_RDONLY | O_BINARY, S_IREAD)) == -1)
-		Quit ("Can't open "GREXT"DICT."EXT"!");
+		Quit (gvar, "Can't open "GREXT"DICT."EXT"!");
 
 	read(handle, &grhuffman, sizeof(grhuffman));
 	close(handle);
@@ -1040,7 +1040,7 @@ dinorm:
 
 	if ((handle = open(GREXT"HEAD."EXT,
 		 O_RDONLY | O_BINARY, S_IREAD)) == -1)
-		Quit ("Can't open "GREXT"HEAD."EXT"!");
+		Quit (gvar, "Can't open "GREXT"HEAD."EXT"!");
 
 	CA_FarRead(handle, (memptr)grstarts, (NUMCHUNKS+1)*FILEPOSSIZE);
 
@@ -1054,7 +1054,7 @@ dinorm:
 //
 	grhandle = open(GREXT"GRAPH."EXT, O_RDONLY | O_BINARY);
 	if (grhandle == -1)
-		Quit ("Cannot open "GREXT"GRAPH."EXT"!");
+		Quit (gvar, "Cannot open "GREXT"GRAPH."EXT"!");
 
 
 //
@@ -1065,7 +1065,7 @@ dinorm:
 	CAL_GetGrChunkLength(STRUCTPIC);		// position file pointer
 	MM_GetPtr(&compseg,chunkcomplen);
 	CA_FarRead (grhandle,compseg,chunkcomplen);
-	CAL_HuffExpand (compseg, (byte huge *)pictable,NUMPICS*sizeof(pictabletype),grhuffman);
+	CAL_HuffExpand (compseg, (byte far *)pictable,NUMPICS*sizeof(pictabletype),grhuffman);
 	MM_FreePtr(&compseg);
 #endif
 
@@ -1074,7 +1074,7 @@ dinorm:
 	CAL_GetGrChunkLength(STRUCTPICM);		// position file pointer
 	MM_GetPtr(&compseg,chunkcomplen);
 	CA_FarRead (grhandle,compseg,chunkcomplen);
-	CAL_HuffExpand (compseg, (byte huge *)picmtable,NUMPICS*sizeof(pictabletype),grhuffman);
+	CAL_HuffExpand (compseg, (byte far *)picmtable,NUMPICS*sizeof(pictabletype),grhuffman);
 	MM_FreePtr(&compseg);
 #endif
 
@@ -1083,7 +1083,7 @@ dinorm:
 	CAL_GetGrChunkLength(STRUCTSPRITE);	// position file pointer
 	MM_GetPtr(&compseg,chunkcomplen);
 	CA_FarRead (grhandle,compseg,chunkcomplen);
-	CAL_HuffExpand (compseg, (byte huge *)spritetable,NUMSPRITES*sizeof(spritetabletype),grhuffman);
+	CAL_HuffExpand (compseg, (byte far *)spritetable,NUMSPRITES*sizeof(spritetabletype),grhuffman);
 	MM_FreePtr(&compseg);
 #endif
 
@@ -1134,11 +1134,11 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
 // #ifdef MAPHEADERLINKED
 // 	if ((maphandle = open("GAMEMAPS."EXT,
 // 		 O_RDONLY | O_BINARY, S_IREAD)) == -1)
-// 		Quit ("Can't open GAMEMAPS."EXT"!");
+// 		Quit (gvar, "Can't open GAMEMAPS."EXT"!");
 // //#else
 // 	if ((maphandle = open("MAPTEMP."EXT,
 // 		 O_RDONLY | O_BINARY, S_IREAD)) == -1)
-// 		Quit ("Can't open MAPTEMP."EXT"!");
+// 		Quit (gvar, "Can't open MAPTEMP."EXT"!");
 // #endif
 }
 
@@ -1164,7 +1164,7 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
 #ifndef AUDIOHEADERLINKED
 	if ((handle = open("AUDIOHED."EXT,
 		 O_RDONLY | O_BINARY, S_IREAD)) == -1)
-		Quit ("Can't open AUDIOHED."EXT"!");
+		Quit (gvar, "Can't open AUDIOHED."EXT"!");
 	length = filelength(handle);
 	MM_GetPtr (&(memptr)audiostarts,length);
 	CA_FarRead(handle, (byte far *)audiostarts, length);
@@ -1181,11 +1181,11 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
 #ifndef AUDIOHEADERLINKED
 	if ((audiohandle = open("AUDIOT."EXT,
 		 O_RDONLY | O_BINARY, S_IREAD)) == -1)
-		Quit ("Can't open AUDIOT."EXT"!");
+		Quit (gvar, "Can't open AUDIOT."EXT"!");
 #else
 	if ((audiohandle = open("AUDIO."EXT,
 		 O_RDONLY | O_BINARY, S_IREAD)) == -1)
-		Quit ("Can't open AUDIO."EXT"!");
+		Quit (gvar, "Can't open AUDIO."EXT"!");
 #endif
 }*/
 
@@ -1291,7 +1291,7 @@ void CA_CacheAudioChunk (int chunk)
 // MDM begin - (GAMERS EDGE)
 //
 	if (!FindFile("AUDIO."EXT,NULL,2))
-		Quit("CA_CacheAudioChunk(): Can't find audio files.");
+		Quit (gvar, "CA_CacheAudioChunk(): Can't find audio files.");
 //
 // MDM end
 
@@ -1630,7 +1630,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
@@ -1789,7 +1789,7 @@ void CA_CacheGrChunk (int chunk)
 // MDM begin - (GAMERS EDGE)
 //
 	if (!FindFile("EGAGRAPH."EXT,NULL,2))
-		Quit("CA_CacheGrChunk(): Can't find graphics files.");
+		Quit (gvar, "CA_CacheGrChunk(): Can't find graphics files.");
 //
 // MDM end
 
@@ -2255,7 +2255,7 @@ void CA_CacheMarks (char *title)
 // MDM begin - (GAMERS EDGE)
 //
 	if (!FindFile("EGAGRAPH."EXT,NULL,2))
-		Quit("CA_CacheMarks(): Can't find graphics files.");
+		Quit (gvar, "CA_CacheMarks(): Can't find graphics files.");
 //
 // MDM end