-/* Project 16 Source Code~\r
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+/* Catacomb Apocalypse Source Code\r
+ * Copyright (C) 1993-2014 Flat Rock Software\r
*\r
- * This file is part of Project 16.\r
- *\r
- * Project 16 is free software; you can redistribute it and/or modify\r
+ * This program is free software; you can redistribute it and/or modify\r
* it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation; either version 3 of the License, or\r
+ * the Free Software Foundation; either version 2 of the License, or\r
* (at your option) any later version.\r
*\r
- * Project 16 is distributed in the hope that it will be useful,\r
+ * This program is distributed in the hope that it will be useful,\r
* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
* GNU General Public License for more details.\r
*\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program. If not, see <http://www.gnu.org/licenses/>, or\r
- * write to the Free Software Foundation, Inc., 51 Franklin Street,\r
- * Fifth Floor, Boston, MA 02110-1301 USA.\r
- *\r
+ * You should have received a copy of the GNU General Public License along\r
+ * with this program; if not, write to the Free Software Foundation, Inc.,\r
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
*/\r
\r
// ID_CA.C\r
#pragma warn -pro\r
#pragma warn -use\r
\r
-#define THREEBYTEGRSTARTS\r
+//#define THREEBYTEGRSTARTS\r
//https://github.com/open-watcom/open-watcom-v2/issues/279#issuecomment-244587566 for _seg\r
//http://www.shikadi.net/moddingwiki/GameMaps_Format for info on the code\r
/*\r
int grhandle; // handle to EGAGRAPH\r
int maphandle; // handle to MAPTEMP / GAMEMAPS\r
int audiohandle; // handle to AUDIOT / AUDIO\r
-*/\r
-long chunkcomplen,chunkexplen;\r
-/*\r
+\r
+long c hunkcomplen,c hunkexplen;\r
+\r
SDMode oldsoundmode;\r
\r
\r
#ifdef THREEBYTEGRSTARTS\r
#define FILEPOSSIZE 3\r
//#define GRFILEPOS(c) (*(long far *)(((byte far *)grstarts)+(c)*3)&0xffffff)\r
-CASVT GRFILEPOS(int c, global_game_variables_t *gvar)\r
+long GRFILEPOS(int c, global_game_variables_t *gvar)\r
{\r
- CASVT value;\r
+ long value;\r
int offset;\r
\r
offset = c*3;\r
\r
- value = *(CASVT far *)(((byte far *)gvar->ca.grstarts)+offset);\r
+ value = *(long far *)(((byte far *)gvar->ca.grstarts)+offset);\r
\r
value &= 0x00ffffffl;\r
\r
};\r
#else\r
#define FILEPOSSIZE 4\r
-//#define GRFILEPOS(c) (gvar->ca.grstarts[c])\r
-CASVT GRFILEPOS(int c, global_game_variables_t *gvar)\r
-{\r
- return gvar->ca.grstarts[c];\r
-}\r
+#define GRFILEPOS(c) (gvar->ca.grstarts[c])\r
#endif\r
\r
/*\r
\r
void CAL_GetGrChunkLength (int chunk,global_game_variables_t *gvar)\r
{\r
- lseek(gvar->ca.file.grhandle,GRFILEPOS(chunk,gvar),SEEK_SET);\r
+ lseek(gvar->ca.file.grhandle,GRFILEPOS(chunk),SEEK_SET);\r
read(gvar->ca.file.grhandle,&gvar->ca.chunkexplen,sizeof(gvar->ca.chunkexplen));\r
- gvar->ca.chunkcomplen = GRFILEPOS(chunk+1,gvar)-GRFILEPOS(chunk,gvar)-4;\r
+ gvar->ca.chunkcomplen = GRFILEPOS(chunk+1)-GRFILEPOS(chunk)-4;\r
}\r
\r
\r
{\r
char fname[13];\r
int handle;\r
+#if NUMPICS>0\r
memptr compseg;\r
+#endif\r
\r
#ifdef GRHEADERLINKED\r
\r
#if NUMPICS>0\r
MM_GetPtr(MEMPTRCONV gvar->video.pictable,NUMPICS*sizeof(pictabletype),gvar);\r
CAL_GetGrChunkLength(STRUCTPIC,gvar); // position file pointer\r
- printf("CAL_SetupGrFile:\n");\r
- printf(" gvar->ca.chunkcomplen size is %lu\n", gvar->ca.chunkcomplen);\r
- MM_GetPtr(&compseg,gvar->ca.chunkcomplen,gvar);\r
- IN_Ack(gvar);\r
+ MM_GetPtr(&compseg,gvar->ca.chunkcomplen, gvar);\r
CA_FarRead (gvar->ca.file.grhandle,compseg,gvar->ca.chunkcomplen,gvar);\r
CAL_HuffExpand (compseg, (byte far *)gvar->video.pictable,NUMPICS*sizeof(pictabletype),gvar->ca.grhuffman);\r
MM_FreePtr(&compseg,gvar);\r
// load the chunk into a buffer, either the miscbuffer if it fits, or allocate\r
// a larger buffer\r
//\r
- pos = GRFILEPOS(chunk,gvar);\r
+ pos = GRFILEPOS(chunk);\r
if (pos<0) // $FFFFFFFF start is a sparse tile\r
return;\r
\r
next = chunk +1;\r
- while (GRFILEPOS(next,gvar) == -1) // skip past any sparse tiles\r
+ while (GRFILEPOS(next) == -1) // skip past any sparse tiles\r
next++;\r
\r
- compressed = GRFILEPOS(next,gvar)-pos;\r
+ compressed = GRFILEPOS(next)-pos;\r
\r
lseek(gvar->ca.file.grhandle,pos,SEEK_SET);\r
\r
// load the chunk into a buffer, either the miscbuffer if it fits, or allocate\r
// a larger buffer\r
//\r
- pos = GRFILEPOS(chunk,gvar);\r
+ pos = GRFILEPOS(chunk);\r
if (pos<0) // $FFFFFFFF start is a sparse tile\r
return;\r
\r
while (GRFILEPOS(next) == -1) // skip past any sparse tiles\r
next++;\r
\r
- compressed = GRFILEPOS(next,gvar)-pos;\r
+ compressed = GRFILEPOS(next)-pos;\r
\r
lseek(gvar->ca.file.grhandle,pos,SEEK_SET);\r
\r
if (dialog && updatecachebox)\r
updatecachebox ();\r
\r
- pos = GRFILEPOS(i,gvar);\r
+ pos = GRFILEPOS(i);\r
if (pos<0)\r
continue;\r
\r
while (GRFILEPOS(next) == -1) // skip past any sparse tiles\r
next++;\r
\r
- compressed = GRFILEPOS(next,gvar)-pos;\r
+ compressed = GRFILEPOS(next)-pos;\r
endpos = pos+compressed;\r
\r
if (compressed<=BUFFERSIZE)\r
if (next == NUMCHUNKS)\r
continue;\r
\r
- nextpos = GRFILEPOS(next,gvar);\r
- while (GRFILEPOS(++next,gvar) == -1) // skip past any sparse tiles\r
+ nextpos = GRFILEPOS(next);\r
+ while (GRFILEPOS(++next) == -1) // skip past any sparse tiles\r
;\r
- nextendpos = GRFILEPOS(next,gvar);\r
+ nextendpos = GRFILEPOS(next);\r
if (nextpos - endpos <= MAXEMPTYREAD\r
&& nextendpos-pos <= BUFFERSIZE)\r
endpos = nextendpos;\r
projects / 16.git / blobdiff