X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_ca.c;h=4373ad005ad93b3df9ab4c51fa82ee6817296d99;hb=a565be31ce92d6168ae6983042da75b0b683e52b;hp=3204865fa554010cd4006d63017000798ec669db;hpb=96992fdbb5f922729fde92dc43051fe082e0b47e;p=16.git
diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 3204865f..4373ad00 100755
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -1,19 +1,23 @@
-/* Catacomb Apocalypse Source Code
- * Copyright (C) 1993-2014 Flat Rock Software
+/* Project 16 Source Code~
+ * Copyright (C) 2012-2019 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
*
- * This program is free software; you can redistribute it and/or modify
+ * This file is part of Project 16.
+ *
+ * Project 16 is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * Project 16 is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see , or
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA 02110-1301 USA.
+ *
*/
// ID_CA.C
@@ -163,7 +167,7 @@ CASVT GRFILEPOS(int c, global_game_variables_t *gvar)
}
#endif
-#define EXTENSION "hb1"
+//#define EXTENSION "hp1"
/*
=============================================================================
@@ -1041,7 +1045,7 @@ void CAL_SetupGrFile (global_game_variables_t *gvar)
//
strcpy(fname,GDICTNAME);
- strcat(fname,EXTENSION);
+ strcat(fname,"hp1");
if ((handle = open(fname,
O_RDONLY | O_BINARY, S_IREAD)) == -1)
@@ -1056,7 +1060,7 @@ void CAL_SetupGrFile (global_game_variables_t *gvar)
MM_GetPtr (MEMPTRCONV gvar->ca.grstarts,(NUMCHUNKS+1)*FILEPOSSIZE, gvar);
strcpy(fname,GHEADNAME);
- strcat(fname,EXTENSION);
+ strcat(fname,"hp1");
if ((handle = open(fname,
O_RDONLY | O_BINARY, S_IREAD)) == -1)
@@ -1073,7 +1077,7 @@ void CAL_SetupGrFile (global_game_variables_t *gvar)
// Open the graphics file, leaving it open until the game is finished
//
strcpy(fname,GFILENAME);
- strcat(fname,EXTENSION);
+ strcat(fname,"hp1");
gvar->ca.file.grhandle = open(fname, O_RDONLY | O_BINARY);
if (gvar->ca.file.grhandle == -1)
@@ -1088,23 +1092,23 @@ void CAL_SetupGrFile (global_game_variables_t *gvar)
CAL_GetGrChunkLength(STRUCTPIC,gvar); // position file pointer
printf("CAL_SetupGrFile:\n");
printf(" gvar->ca.chunkcomplen size is %lu\n", gvar->ca.chunkcomplen);
- MM_GetPtr(&compseg,gvar->ca.chunkcomplen,gvar);
- IN_Ack(gvar);
+ MM_GetPtr(MEMPTRANDPERCONV compseg,gvar->ca.chunkcomplen,gvar); IN_Ack(gvar);
CA_FarRead (gvar->ca.file.grhandle,compseg,gvar->ca.chunkcomplen,gvar);
CAL_HuffExpand (compseg, (byte far *)gvar->video.pictable,NUMPICS*sizeof(pictabletype),gvar->ca.grhuffman);
- MM_FreePtr(&compseg,gvar);
+ MM_FreePtr(MEMPTRANDPERCONV compseg,gvar);
#endif
-#if NUMPICM>0
+#if 0
+ //NUMPICM>0
MM_GetPtr(MEMPTRCONV picmtable,NUMPICM*sizeof(pictabletype));
CAL_GetGrChunkLength(STRUCTPICM); // position file pointer
MM_GetPtr(&compseg,gvar->ca.chunkcomplen);
CA_FarRead (gvar->ca.file.grhandle,compseg,gvar->ca.chunkcomplen);
CAL_HuffExpand (compseg, (byte far *)picmtable,NUMPICS*sizeof(pictabletype),gvar->ca.grhuffman);
MM_FreePtr(&compseg);
-#endif
+//#endif
-#if NUMSPRITES>0
+//#if NUMSPRITES>0
MM_GetPtr(MEMPTRCONV spritetable,NUMSPRITES*sizeof(spritetabletype));
CAL_GetGrChunkLength(STRUCTSPRITE); // position file pointer
MM_GetPtr(&compseg,gvar->ca.chunkcomplen);
@@ -1241,6 +1245,7 @@ void CA_Startup(global_game_variables_t *gvar)
#endif
#endif//profile
+#ifdef SHOWMEMINFO
#ifdef __BORLANDC__
unlink("meminfo.16b");
gvar->handle.showmemhandle = open("meminfo.16b", O_CREAT | O_WRONLY | O_TEXT);
@@ -1249,6 +1254,7 @@ void CA_Startup(global_game_variables_t *gvar)
unlink("meminfo.16w");
gvar->handle.showmemhandle = open("meminfo.16w", O_CREAT | O_WRONLY | O_TEXT);
#endif
+#endif
#ifndef NOMAPS
@@ -1288,7 +1294,9 @@ void CA_Shutdown(global_game_variables_t *gvar)
#ifdef PROFILE
close(gvar->handle.profilehandle);
#endif
+#ifdef SHOWMEMINFO
close(gvar->handle.showmemhandle);
+#endif
close(gvar->ca.file.maphandle);
close(gvar->ca.file.grhandle);
@@ -1881,7 +1889,7 @@ void CA_CacheGrChunk (int chunk)
CAL_ExpandGrChunk (chunk,source);
if (compressed>BUFFERSIZE)
- MM_FreePtr(&bigbufferseg);
+ MM_FreePtr (MEMPTRCONV bigbufferseg);
}
*/
@@ -1974,8 +1982,8 @@ void CA_CacheMap (global_game_variables_t *gvar)
source = gvar->mm.bufferseg;
else
{
- MM_GetPtr(&bigbufferseg,compressed, gvar);
- MM_SetLock (&bigbufferseg,true, gvar);
+ MM_GetPtr(MEMPTRCONV bigbufferseg,compressed, gvar);
+ MM_SetLock (MEMPTRCONV bigbufferseg,true, gvar);
source = bigbufferseg;
}
@@ -2004,7 +2012,7 @@ void CA_CacheMap (global_game_variables_t *gvar)
#endif
if (compressed>BUFFERSIZE)
- MM_FreePtr(&bigbufferseg, gvar);
+ MM_FreePtr(MEMPTRCONV bigbufferseg, gvar);
}
}
@@ -2112,7 +2120,7 @@ void CA_SetGrPurge (global_game_variables_t *gvar)
for (i=0;ica.grsegs[i])
- MM_SetPurge (gvar->ca.grsegs[i],3, gvar);
+ MM_SetPurge (MEMPTRCONV gvar->ca.grsegs[i],3, gvar);
}
@@ -2284,9 +2292,9 @@ void CAL_DialogFinish (void)
= CA_CacheMarks
=
======================
-*//*++++
+*/
#define MAXEMPTYREAD 1024
-
+/*++++ segments
void CAL_CacheMarks (char *title, global_game_variables_t *gvar)
{
boolean dialog;
@@ -2321,8 +2329,8 @@ void CAL_CacheMarks (char *title, global_game_variables_t *gvar)
// MDM begin - (GAMERS EDGE)
//
-// if (!FindFile("EGAGRAPH.16",NULL,2))
-// Quit (gvar, "CA_CacheMarks(): Can't find graphics files.");
+//???? if (!FindFile("EGAGRAPH.16",NULL,2))
+//???? Quit (gvar, "CA_CacheMarks(): Can't find graphics files.");
//
// MDM end
@@ -2425,7 +2433,7 @@ void CAL_CacheMarks (char *title, global_game_variables_t *gvar)
//
if (dialog && finishcachebox)
finishcachebox();
-}*/
+}//*/
void CA_CannotOpen(char *string, global_game_variables_t *gvar)
{