#pragma warn -use\r
\r
//#define THREEBYTEGRSTARTS\r
-\r
+//https://github.com/open-watcom/open-watcom-v2/issues/279#issuecomment-244587566 for _seg\r
/*\r
=============================================================================\r
\r
=\r
======================\r
*/\r
-/*++++\r
+\r
#define NEARTAG 0xa7\r
#define FARTAG 0xa8\r
\r
count = ch&0xff;\r
if (!count)\r
{ // have to insert a word containing the tag byte\r
- ch |= *((unsigned char far *)inptr)++;\r
+ ch |= *(/*(unsigned char far *)*/inptr)++;\r
*outptr++ = ch;\r
length--;\r
}\r
else\r
{\r
- offset = *((unsigned char far *)inptr)++;\r
+ offset = *(/*(unsigned char far *)*/inptr)++;\r
copyptr = outptr - offset;\r
length -= count;\r
while (count--)\r
count = ch&0xff;\r
if (!count)\r
{ // have to insert a word containing the tag byte\r
- ch |= *((unsigned char far *)inptr)++;\r
+ ch |= *(/*(unsigned char far *)*/inptr)++;\r
*outptr++ = ch;\r
length --;\r
}\r
}\r
}\r
}\r
-*/\r
\r
\r
/*\r
=\r
======================\r
*/\r
-/*++++\r
+\r
long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,\r
unsigned rlewtag)\r
{\r
complength = 2*(dest-start);\r
return complength;\r
}\r
-*/\r
+\r
\r
/*\r
======================\r
=\r
======================\r
*/\r
-/*++++\r
+\r
void CA_RLEWexpand (unsigned huge *source, unsigned huge *dest,long length,\r
unsigned rlewtag)\r
{\r
//\r
// NOTE: A repeat count that produces 0xfff0 bytes can blow this!\r
//\r
-\r
-asm mov bx,rlewtag\r
-asm mov si,sourceoff\r
-asm mov di,destoff\r
-asm mov es,destseg\r
-asm mov ds,sourceseg\r
-\r
+ __asm{\r
+ mov bx,rlewtag\r
+ mov si,sourceoff\r
+ mov di,destoff\r
+ mov es,destseg\r
+ mov ds,sourceseg\r
+#ifdef __BORLANDC__\r
+ }\r
+#endif\r
expand:\r
-asm lodsw\r
-asm cmp ax,bx\r
-asm je repeat\r
-asm stosw\r
-asm jmp next\r
-\r
+#ifdef __BORLANDC__\r
+ __asm {\r
+#endif\r
+ lodsw\r
+ cmp ax,bx\r
+ je repeat\r
+ stosw\r
+ jmp next\r
+#ifdef __BORLANDC__\r
+ }\r
+#endif\r
repeat:\r
-asm lodsw\r
-asm mov cx,ax // repeat count\r
-asm lodsw // repeat value\r
-asm rep stosw\r
-\r
+#ifdef __BORLANDC__\r
+ __asm {\r
+#endif\r
+ lodsw\r
+ mov cx,ax // repeat count\r
+ lodsw // repeat value\r
+ rep stosw\r
+#ifdef __BORLANDC__\r
+ }\r
+#endif\r
next:\r
-\r
-asm cmp si,0x10 // normalize ds:si\r
-asm jb sinorm\r
-asm mov ax,si\r
-asm shr ax,1\r
-asm shr ax,1\r
-asm shr ax,1\r
-asm shr ax,1\r
-asm mov dx,ds\r
-asm add dx,ax\r
-asm mov ds,dx\r
-asm and si,0xf\r
+#ifdef __BORLANDC__\r
+ __asm {\r
+#endif\r
+ cmp si,0x10 // normalize ds:si\r
+ jb sinorm\r
+ mov ax,si\r
+ shr ax,1\r
+ shr ax,1\r
+ shr ax,1\r
+ shr ax,1\r
+ mov dx,ds\r
+ add dx,ax\r
+ mov ds,dx\r
+ and si,0xf\r
+#ifdef __BORLANDC__\r
+ }\r
+#endif\r
sinorm:\r
-asm cmp di,0x10 // normalize es:di\r
-asm jb dinorm\r
-asm mov ax,di\r
-asm shr ax,1\r
-asm shr ax,1\r
-asm shr ax,1\r
-asm shr ax,1\r
-asm mov dx,es\r
-asm add dx,ax\r
-asm mov es,dx\r
-asm and di,0xf\r
+#ifdef __BORLANDC__\r
+ __asm {\r
+#endif\r
+ cmp di,0x10 // normalize es:di\r
+ jb dinorm\r
+ mov ax,di\r
+ shr ax,1\r
+ shr ax,1\r
+ shr ax,1\r
+ shr ax,1\r
+ mov dx,es\r
+ add dx,ax\r
+ mov es,dx\r
+ and di,0xf\r
+#ifdef __BORLANDC__\r
+ }\r
+#endif\r
dinorm:\r
+#ifdef __BORLANDC__\r
+ __asm {\r
+#endif\r
+ cmp di,ss:endoff\r
+ jne expand\r
+ mov ax,es\r
+ cmp ax,ss:endseg\r
+ jb expand\r
\r
-asm cmp di,ss:endoff\r
-asm jne expand\r
-asm mov ax,es\r
-asm cmp ax,ss:endseg\r
-asm jb expand\r
-\r
-asm mov ax,ss\r
-asm mov ds,ax\r
-\r
+ mov ax,ss\r
+ mov ds,ax\r
+ }\r
}\r
-*/\r
\r
\r
/*\r
======================\r
*/\r
\r
-/*void CAL_SetupMapFile (void)\r
+void CAL_SetupMapFile (global_game_variables_t *gvar)\r
{\r
int handle;\r
long length;\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
- Quit ("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
+// Quit ("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
//\r
-#ifdef MAPHEADERLINKED\r
- if ((maphandle = open("GAMEMAPS."EXT,\r
- O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
- Quit ("Can't open GAMEMAPS."EXT"!");\r
-#else\r
- if ((maphandle = open("MAPTEMP."EXT,\r
+//TODO: multiple files\r
+ if ((gvar->ca.file.maphandle[0] = open("data/test.map",\r
O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
- Quit ("Can't open MAPTEMP."EXT"!");\r
-#endif\r
-}*/\r
+ {\r
+ printf("Can't open data/test.map!");\r
+ }\r
+// #ifdef MAPHEADERLINKED\r
+// if ((maphandle = open("GAMEMAPS."EXT,\r
+// O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
+// Quit ("Can't open GAMEMAPS."EXT"!");\r
+// //#else\r
+// if ((maphandle = open("MAPTEMP."EXT,\r
+// O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
+// Quit ("Can't open MAPTEMP."EXT"!");\r
+// #endif\r
+}\r
\r
//==========================================================================\r
\r
unlink("meminfo.16w");\r
gvar->handle.showmemhandle = open("meminfo.16w", O_CREAT | O_WRONLY | O_TEXT);\r
#endif\r
-/* CAL_SetupMapFile ();\r
+/*\r
CAL_SetupGrFile ();\r
CAL_SetupAudioFile ();*/\r
-/*++++\r
-// MDM begin - (GAMERS EDGE)\r
-//\r
- if(!FindFile("AUDIO."EXT,NULL,2))\r
- Quit("CA_Startup(): Can't find audio files.");\r
-//\r
-// MDM end\r
-\r
-#ifndef NOAUDIO\r
- CAL_SetupAudioFile();\r
-#endif\r
\r
-// MDM begin - (GAMERS EDGE)\r
-//\r
- if (!FindFile("GAMEMAPS."EXT,NULL,1))\r
- Quit("CA_Startup(): Can't find level files.");\r
-//\r
-// MDM end\r
+ CAL_SetupMapFile (gvar);\r
\r
-#ifndef NOMAPS\r
- CAL_SetupMapFile ();\r
-#endif\r
-\r
-// MDM begin - (GAMERS EDGE)\r
-//\r
- if (!FindFile("EGAGRAPH."EXT,NULL,2))\r
- Quit("CA_Startup(): Can't find graphics files.");\r
-//\r
-// MDM end\r
-\r
-#ifndef NOGRAPHICS\r
- CAL_SetupGrFile ();\r
-#endif*/\r
-\r
- gvar->ca.mapon = -1;\r
+ gvar->ca.map.mapon = -1;\r
gvar->ca.ca_levelbit = 1;\r
gvar->ca.ca_levelnum = 0;\r
\r
close(gvar->handle.profilehandle);\r
#endif\r
close(gvar->handle.showmemhandle);\r
+\r
+ close(*(gvar->ca.file.maphandle));\r
/*++++\r
- close(maphandle);\r
close(grhandle);\r
close(audiohandle);*/\r
}\r
=\r
======================\r
*/\r
-/*++++\r
-void CA_CacheMap (int mapnum)\r
+/*++++ fuckin segments!\r
+void CA_CacheMap (global_game_variables_t *gvar)\r
{\r
long pos,compressed;\r
int plane;\r
#endif\r
\r
\r
-// MDM begin - (GAMERS EDGE)\r
-//\r
- if (!FindFile("GAMEMAPS."EXT,NULL,1))\r
- Quit("CA_CacheMap(): Can't find level files.");\r
-//\r
-// MDM end\r
-\r
-\r
//\r
// free up memory from last map\r
//\r
- if (mapon>-1 && mapheaderseg[mapon])\r
- MM_SetPurge (&(memptr)mapheaderseg[mapon],3);\r
+ if (gvar->ca.map.mapon>-1 && gvar->ca.map.mapheaderseg[gvar->ca.map.mapon])\r
+ MM_SetPurge (&((memptr)gvar->ca.map.mapheaderseg\r
+ [(gvar->ca.map.mapon)]),\r
+\r
+ 3, &(gvar->mm));\r
for (plane=0;plane<MAPPLANES;plane++)\r
- if (mapsegs[plane])\r
- MM_FreePtr (&(memptr)mapsegs[plane]);\r
+ if (gvar->ca.map.mapsegs[plane])\r
+ MM_FreePtr (&(memptr)gvar->ca.map.mapsegs[plane], &(gvar->mm));\r
\r
- mapon = mapnum;\r
+ gvar->ca.map.mapon = gvar->ca.map.mapnum;\r
\r
\r
//\r
// load map header\r
// The header will be cached if it is still around\r
//\r
- if (!mapheaderseg[mapnum])\r
+ if (!gvar->ca.map.mapheaderseg[gvar->ca.map.mapnum])\r
{\r
- pos = ((mapfiletype _seg *)tinf)->headeroffsets[mapnum];\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
- Quit ("CA_CacheMap: Tried to load a non existent map!");\r
+ printf("CA_CacheMap: Tried to load a non existent map!");\r
\r
- MM_GetPtr(&(memptr)mapheaderseg[mapnum],sizeof(maptype));\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);\r
+ MM_SetPurge (&(memptr)mapheaderseg[mapnum], 0, &(gvar->mm));\r
\r
//\r
// load the planes in\r
if (compressed>BUFFERSIZE)\r
MM_FreePtr(&bigbufferseg);\r
}\r
-}*/\r
+}//*/\r
\r
//===========================================================================\r
\r
=\r
======================\r
*/\r
-/*++++\r
-void CA_UpLevel (void)\r
+\r
+void CA_UpLevel (global_game_variables_t *gvar)\r
{\r
- if (ca_levelnum==7)\r
- Quit ("CA_UpLevel: Up past level 7!");\r
+ if (gvar->ca.ca_levelnum==7)\r
+ printf("CA_UpLevel: Up past level 7!");\r
\r
- ca_levelbit<<=1;\r
- ca_levelnum++;\r
-}*/\r
+ gvar->ca.ca_levelbit<<=1;\r
+ gvar->ca.ca_levelnum++;\r
+}\r
\r
//===========================================================================\r
\r
=\r
======================\r
*/\r
-/*++\r
-void CA_DownLevel (void)\r
+\r
+void CA_DownLevel (global_game_variables_t *gvar)\r
{\r
- if (!ca_levelnum)\r
- Quit ("CA_DownLevel: Down past level 0!");\r
- ca_levelbit>>=1;\r
- ca_levelnum--;\r
- CA_CacheMarks(NULL);\r
-}*/\r
+ if (!gvar->ca.ca_levelnum)\r
+ printf("CA_DownLevel: Down past level 0!");\r
+ gvar->ca.ca_levelbit>>=1;\r
+ gvar->ca.ca_levelnum--;\r
+ ////++++++++++++++++++++++++++++++++++++++++++CA_CacheMarks(NULL);\r
+}\r
\r
//===========================================================================\r
\r
//\r
// free cursor sprite and background save\r
//\r
- VW_FreeCursor ();\r
+ //VW_FreeCursor ();\r
\r
//\r
// free map headers and map planes\r
projects / 16.git / blobdiff