updating copy left. i am super fuckin busy with school, and trying to get life back...

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

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index d48a46df0209adb979868a5d469edbf6e374523b..4373ad005ad93b3df9ab4c51fa82ee6817296d99 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2019 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -167,7 +167,7 @@ CASVT GRFILEPOS(int c, global_game_variables_t *gvar)
 }\r
 #endif\r
 \r
-//#define EXTENSION    "hb1"\r
+//#define EXTENSION    "hp1"\r
 \r
 /*\r
 =============================================================================\r
@@ -1045,7 +1045,7 @@ void CAL_SetupGrFile (global_game_variables_t *gvar)
 //\r
 \r
        strcpy(fname,GDICTNAME);\r
-       strcat(fname,"hb1");\r
+       strcat(fname,"hp1");\r
 \r
        if ((handle = open(fname,\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
@@ -1060,7 +1060,7 @@ void CAL_SetupGrFile (global_game_variables_t *gvar)
        MM_GetPtr (MEMPTRCONV gvar->ca.grstarts,(NUMCHUNKS+1)*FILEPOSSIZE, gvar);\r
 \r
        strcpy(fname,GHEADNAME);\r
-       strcat(fname,"hb1");\r
+       strcat(fname,"hp1");\r
 \r
        if ((handle = open(fname,\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
@@ -1077,7 +1077,7 @@ void CAL_SetupGrFile (global_game_variables_t *gvar)
 // Open the graphics file, leaving it open until the game is finished\r
 //\r
        strcpy(fname,GFILENAME);\r
-       strcat(fname,"hb1");\r
+       strcat(fname,"hp1");\r
 \r
        gvar->ca.file.grhandle = open(fname, O_RDONLY | O_BINARY);\r
        if (gvar->ca.file.grhandle == -1)\r
@@ -1889,7 +1889,7 @@ void CA_CacheGrChunk (int chunk)
        CAL_ExpandGrChunk (chunk,source);\r
 \r
        if (compressed>BUFFERSIZE)\r
-               MM_FreePtr(&bigbufferseg);\r
+               MM_FreePtr (MEMPTRCONV bigbufferseg);\r
 }\r
 */\r
 \r
@@ -1982,8 +1982,8 @@ void CA_CacheMap (global_game_variables_t *gvar)
                        source = gvar->mm.bufferseg;\r
                else\r
                {\r
-                       MM_GetPtr(&bigbufferseg,compressed, gvar);\r
-                       MM_SetLock (&bigbufferseg,true, gvar);\r
+                       MM_GetPtr(MEMPTRCONV bigbufferseg,compressed, gvar);\r
+                       MM_SetLock (MEMPTRCONV bigbufferseg,true, gvar);\r
                        source = bigbufferseg;\r
                }\r
 \r
@@ -2012,7 +2012,7 @@ void CA_CacheMap (global_game_variables_t *gvar)
 #endif\r
 \r
                if (compressed>BUFFERSIZE)\r
-                       MM_FreePtr(&bigbufferseg, gvar);\r
+                       MM_FreePtr(MEMPTRCONV bigbufferseg, gvar);\r
        }\r
 }\r
 \r