ohh OHHH WWWWWWWWWWW

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

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 61838010e59eee4de606050e7d5df7b6ef7f431a..dcdcaa1c3bc65b262a78fc6439bcd36eacc7f9ad 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -221,7 +221,7 @@ void CAL_GetGrChunkLength (int chunk)
 ==========================\r
 */\r
 \r
-boolean CA_FarRead(int handle, byte huge *dest, dword length, global_game_variables_t *gvar)\r
+boolean CA_FarRead(int handle, byte far *dest, dword length, global_game_variables_t *gvar)\r
 {\r
        boolean flag=0;\r
        //dword fat=0;\r
@@ -293,7 +293,7 @@ End:
 ==========================\r
 */\r
 \r
-boolean CA_FarWrite(int handle, byte huge *source, dword length, global_game_variables_t *gvar)\r
+boolean CA_FarWrite(int handle, byte far *source, dword length, global_game_variables_t *gvar)\r
 {\r
        boolean flag=0;\r
        //dword fat=0;\r
@@ -498,7 +498,7 @@ void CAL_OptimizeNodes(huffnode *table)
 ======================\r
 */\r
 \r
-void CAL_HuffExpand (byte huge *source, byte huge *dest,\r
+void CAL_HuffExpand (byte far *source, byte far *dest,\r
   long length,huffnode *hufftable)\r
 {\r
 //  unsigned bit,byte,node,code;\r
@@ -795,12 +795,12 @@ void CAL_CarmackExpand (unsigned far *source, unsigned far *dest, unsigned lengt
 ======================\r
 */\r
 \r
-long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,\r
+long CA_RLEWCompress (unsigned far *source, long length, unsigned far *dest,\r
   unsigned rlewtag)\r
 {\r
   long complength;\r
   unsigned value,count,i;\r
-  unsigned huge *start,huge *end;\r
+  unsigned far *start,far *end;\r
 \r
   start = dest;\r
 \r
@@ -852,11 +852,11 @@ long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,
 ======================\r
 */\r
 \r
-void CA_RLEWexpand (unsigned huge *source, unsigned huge *dest,long length,\r
+void CA_RLEWexpand (unsigned far *source, unsigned far *dest,long length,\r
   unsigned rlewtag)\r
 {\r
 //  unsigned value,count,i;\r
-  unsigned huge *end;\r
+  unsigned far *end;\r
   unsigned sourceseg,sourceoff,destseg,destoff,endseg,endoff;\r
 \r
 \r
@@ -1065,7 +1065,7 @@ dinorm:
        CAL_GetGrChunkLength(STRUCTPIC);                // position file pointer\r
        MM_GetPtr(&compseg,chunkcomplen);\r
        CA_FarRead (grhandle,compseg,chunkcomplen);\r
-       CAL_HuffExpand (compseg, (byte huge *)pictable,NUMPICS*sizeof(pictabletype),grhuffman);\r
+       CAL_HuffExpand (compseg, (byte far *)pictable,NUMPICS*sizeof(pictabletype),grhuffman);\r
        MM_FreePtr(&compseg);\r
 #endif\r
 \r
@@ -1074,7 +1074,7 @@ dinorm:
        CAL_GetGrChunkLength(STRUCTPICM);               // position file pointer\r
        MM_GetPtr(&compseg,chunkcomplen);\r
        CA_FarRead (grhandle,compseg,chunkcomplen);\r
-       CAL_HuffExpand (compseg, (byte huge *)picmtable,NUMPICS*sizeof(pictabletype),grhuffman);\r
+       CAL_HuffExpand (compseg, (byte far *)picmtable,NUMPICS*sizeof(pictabletype),grhuffman);\r
        MM_FreePtr(&compseg);\r
 #endif\r
 \r
@@ -1083,7 +1083,7 @@ dinorm:
        CAL_GetGrChunkLength(STRUCTSPRITE);     // position file pointer\r
        MM_GetPtr(&compseg,chunkcomplen);\r
        CA_FarRead (grhandle,compseg,chunkcomplen);\r
-       CAL_HuffExpand (compseg, (byte huge *)spritetable,NUMSPRITES*sizeof(spritetabletype),grhuffman);\r
+       CAL_HuffExpand (compseg, (byte far *)spritetable,NUMSPRITES*sizeof(spritetabletype),grhuffman);\r
        MM_FreePtr(&compseg);\r
 #endif\r
 \r
@@ -1102,25 +1102,25 @@ dinorm:
 \r
 void CAL_SetupMapFile (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 MAPHEADERLINKED\r
-//     if ((handle = open("MAPHEAD."EXT,\r
-//              O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
-//             printf("Can't open MAPHEAD."EXT"!");\r
-//     length = filelength(handle);\r
-//     MM_GetPtr (&(memptr)tinf,length);\r
-//     CA_FarRead(handle, tinf, length);\r
-//     close(handle);\r
-// //#else\r
-//\r
-//     tinf = (byte _seg *)FP_SEG(&maphead);\r
-//\r
-// #endif\r
+#ifndef MAPHEADERLINKED\r
+       if ((handle = open("MAPHEAD."EXT,\r
+                O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
+               printf("Can't open MAPHEAD."EXT"!");\r
+       length = filelength(handle);\r
+       MM_GetPtr (&(memptr)tinf,length);\r
+       CA_FarRead(handle, tinf, length);\r
+       close(handle);\r
+//#else\r
+\r
+       tinf = (byte _seg *)FP_SEG(&maphead);\r
+\r
+#endif*/\r
 \r
 //\r
 // open the data file\r
@@ -1856,32 +1856,33 @@ void CA_CacheMap (global_game_variables_t *gvar)
 //\r
 // free up memory from last map\r
 //\r
-       if (gvar->ca.map.mapon>-1 && gvar->ca.map.mapheaderseg[gvar->ca.map.mapon])\r
-               MM_SetPurge (&((memptr)gvar->ca.map.mapheaderseg[(gvar->ca.map.mapon)]), 3, &(gvar->mm));\r
+       if (gvar->ca.camap.mapon>-1 && gvar->ca.camap.mapheaderseg[gvar->ca.camap.mapon])\r
+               MM_SetPurge (((memptr)gvar->ca.camap.mapheaderseg[(gvar->ca.camap.mapon)]), 3, gvar);\r
        for (plane=0;plane<MAPPLANES;plane++)\r
-               if (gvar->ca.map.mapsegs[plane])\r
-                       MM_FreePtr (&(memptr)gvar->ca.map.mapsegs[plane], &(gvar->mm));\r
+               if (gvar->ca.camap.mapsegs[plane])\r
+                       MM_FreePtr ((memptr)gvar->ca.camap.mapsegs[plane], gvar);\r
 \r
-       gvar->ca.map.mapon = gvar->ca.map.mapnum;\r
+       gvar->ca.camap.mapon = gvar->ca.camap.mapnum;\r
 \r
 \r
 //\r
 // load map header\r
 // The header will be cached if it is still around\r
 //\r
-       if (!gvar->ca.map.mapheaderseg[gvar->ca.map.mapnum])\r
-       {\r
-               //pos = ((mapfiletype   _seg *)tinf)->headeroffsets[mapnum];\r
-               pos = ((_seg *)gvar->ca.map.tinf)->headeroffsets[gvar->ca.map.mapnum];\r
-               if (pos<0)                                              // $FFFFFFFF start is a sparse map\r
-                 printf("CA_CacheMap: Tried to load a non existent map!");\r
+//     if (!gvar->ca.camap.mapheaderseg[gvar->ca.camap.mapnum])\r
+//     {\r
+//             //pos = ((mapfiletype   _seg *)tinf)->headeroffsets[mapnum];\r
+//             //pos = ((_seg *)gvar->ca.camap.tinf)->headeroffsets[gvar->ca.camap.mapnum];\r
+//             pos = ((memptr)gvar->ca.camap.tinf)->headeroffsets[gvar->ca.camap.mapnum];\r
+//             if (pos<0)                                              // $FFFFFFFF start is a sparse map\r
+//               printf("CA_CacheMap: Tried to load a non existent map!");\r
 \r
-               MM_GetPtr(&(memptr)gvar->ca.mapheaderseg[mapnum],sizeof(maptype));\r
-               lseek(maphandle,pos,SEEK_SET);\r
-               CA_FarRead (maphandle,(memptr)mapheaderseg[mapnum],sizeof(maptype));\r
-       }\r
-       else\r
-               MM_SetPurge (&(memptr)mapheaderseg[mapnum], 0, &(gvar->mm));\r
+//             MM_GetPtr(&(memptr)gvar->ca.camapheaderseg[mapnum],sizeof(maptype));\r
+//             lseek(maphandle,pos,SEEK_SET);\r
+//             CA_FarRead (maphandle,(memptr)mapheaderseg[mapnum],sizeof(maptype));\r
+//     }\r
+//     else\r
+//             MM_SetPurge (&(memptr)mapheaderseg[mapnum], 0, &(gvar->mm));\r
 \r
 //\r
 // load the planes in\r
@@ -1893,8 +1894,8 @@ void CA_CacheMap (global_game_variables_t *gvar)
 \r
        for (plane = 0; plane<MAPPLANES; plane++)\r
        {\r
-               pos = mapheaderseg[mapnum]->planestart[plane];\r
-               compressed = mapheaderseg[mapnum]->planelength[plane];\r
+               //pos = mapheaderseg[mapnum]->planestart[plane];\r
+               //compressed = mapheaderseg[mapnum]->planelength[plane];\r
 \r
                if (!compressed)\r
                        continue;               // the plane is not used in this game\r