shithub: duke3d

Download patch

ref: a398442d41ed928c12632909a02fd5f3052b7d27
parent: 664bab86ba561e61c734ca1319c4f74b7e21d76d
author: Fabien Sanglard <fabien.sanglard@gmail.com>
date: Wed Dec 19 13:11:20 EST 2012

Renamed 'cache1d' translation unit to 'cache'

--- /dev/null
+++ b/Engine/src/cache.c
@@ -1,0 +1,861 @@
+/*
+ * "Build Engine & Tools" Copyright (c) 1993-1997 Ken Silverman
+ * Ken Silverman's official web site: "http://www.advsys.net/ken"
+ * See the included license file "BUILDLIC.TXT" for license info.
+ * This file has been modified from Ken Silverman's original release
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "platform.h"
+#include "display.h"
+
+#include "pragmas.h"
+#include "cache.h"
+#include "build.h"
+
+#include "../../Game/src/cvar_defs.h"
+
+#include "types.h"
+
+/*
+ *   This module keeps track of a standard linear cacheing system.
+ *   To use this module, here's all you need to do:
+ *
+ *   Step 1: Allocate a nice BIG buffer, like from 1MB-4MB and
+ *           Call initcache(int32_t cachestart, int32_t cachesize) where
+ *
+ *              cachestart = (int32_t )(pointer to start of BIG buffer)
+ *              cachesize = length of BIG buffer
+ *
+ *   Step 2: Call allocache(int32_t *bufptr, int32_t bufsiz, uint8_t  *lockptr)
+ *              whenever you need to allocate a buffer, where:
+ *
+ *              *bufptr = pointer to 4-byte pointer to buffer
+ *                 Confused?  Using this method, cache2d can remove
+ *                 previously allocated things from the cache safely by
+ *                 setting the 4-byte pointer to 0.
+ *              bufsiz = number of bytes to allocate
+ *              *lockptr = pointer to locking uint8_t  which tells whether
+ *                 the region can be removed or not.  If *lockptr = 0 then
+ *                 the region is not locked else its locked.
+ *
+ *   Step 3: If you need to remove everything from the cache, or every
+ *           unlocked item from the cache, you can call uninitcache();
+ *              Call uninitcache(0) to remove all unlocked items, or
+ *              Call uninitcache(1) to remove everything.
+ *           After calling uninitcache, it is still ok to call allocache
+ *           without first calling initcache.
+ */
+
+#define MAXCACHEOBJECTS 9216
+
+static int32_t cachesize = 0;
+int32_t cachecount = 0;
+uint8_t  zerochar = 0;
+int32_t cachestart = 0, cacnum = 0, agecount = 0;
+typedef struct { int32_t *hand, leng; uint8_t  *lock; } cactype;
+cactype cac[MAXCACHEOBJECTS];
+int32_t lockrecip[200];
+
+// TC game directory
+char  game_dir[512] = { '\0' };
+
+void initcache(int32_t dacachestart, int32_t dacachesize)
+{
+	int32_t i;
+
+	for(i=1;i<200;i++) lockrecip[i] = (1<<28)/(200-i);
+
+	cachestart = dacachestart;
+	cachesize = dacachesize;
+
+	cac[0].leng = cachesize;
+	cac[0].lock = &zerochar;
+	cacnum = 1;
+}
+
+void allocache (int32_t *newhandle, int32_t newbytes, uint8_t  *newlockptr)
+{
+	int32_t i, z, zz, bestz=0, daval, bestval, besto=0, o1, o2, sucklen, suckz;
+
+	newbytes = newbytes+15;
+
+	if ((uint32_t)newbytes > (uint32_t)cachesize)
+	{
+		printf("Cachesize: %d\n",cachesize);
+		printf("*Newhandle: 0x%x, Newbytes: %d, *Newlock: %d\n",(unsigned int)newhandle,newbytes,*newlockptr);
+		reportandexit("BUFFER TOO BIG TO FIT IN CACHE!\n");
+	}
+
+	if (*newlockptr == 0)
+	{
+		reportandexit("ALLOCACHE CALLED WITH LOCK OF 0!\n");
+	}
+
+		/* Find best place */
+	bestval = 0x7fffffff; o1 = cachesize;
+	for(z=cacnum-1;z>=0;z--)
+	{
+		o1 -= cac[z].leng;
+		o2 = o1+newbytes; if (o2 > cachesize) continue;
+
+		daval = 0;
+		for(i=o1,zz=z;i<o2;i+=cac[zz++].leng)
+		{
+			if (*cac[zz].lock == 0) continue;
+			if (*cac[zz].lock >= 200) { daval = 0x7fffffff; break; }
+			daval += (int32_t ) mulscale32(cac[zz].leng+65536,lockrecip[*cac[zz].lock]);
+			if (daval >= bestval) break;
+		}
+		if (daval < bestval)
+		{
+			bestval = daval; besto = o1; bestz = z;
+			if (bestval == 0) break;
+		}
+	}
+
+	/*printf("%ld %ld %ld\n",besto,newbytes,*newlockptr);*/
+
+	if (bestval == 0x7fffffff)
+		reportandexit("CACHE SPACE ALL LOCKED UP!\n");
+
+		/* Suck things out */
+	for(sucklen=-newbytes,suckz=bestz;sucklen<0;sucklen+=cac[suckz++].leng)
+		if (*cac[suckz].lock) *cac[suckz].hand = 0;
+
+		/* Remove all blocks except 1 */
+	suckz -= (bestz+1); cacnum -= suckz;
+	copybufbyte(&cac[bestz+suckz],&cac[bestz],(cacnum-bestz)*sizeof(cactype));
+	cac[bestz].hand = newhandle; *newhandle = cachestart+besto;
+	cac[bestz].leng = newbytes;
+	cac[bestz].lock = newlockptr;
+	cachecount++;
+
+		/* Add new empty block if necessary */
+	if (sucklen <= 0) return;
+
+	bestz++;
+	if (bestz == cacnum)
+	{
+		cacnum++; if (cacnum > MAXCACHEOBJECTS) reportandexit("Too many objects in cache! (cacnum > MAXCACHEOBJECTS)\n");
+		cac[bestz].leng = sucklen;
+		cac[bestz].lock = &zerochar;
+		return;
+	}
+
+	if (*cac[bestz].lock == 0) { cac[bestz].leng += sucklen; return; }
+
+	cacnum++; if (cacnum > MAXCACHEOBJECTS) reportandexit("Too many objects in cache! (cacnum > MAXCACHEOBJECTS)\n");
+	for(z=cacnum-1;z>bestz;z--) cac[z] = cac[z-1];
+	cac[bestz].leng = sucklen;
+	cac[bestz].lock = &zerochar;
+}
+
+void suckcache (int32_t *suckptr)
+{
+	int32_t i;
+
+		/* Can't exit early, because invalid pointer might be same even though lock = 0 */
+	for(i=0;i<cacnum;i++)
+		if ((int32_t )(*cac[i].hand) == (int32_t )suckptr)
+		{
+			if (*cac[i].lock) *cac[i].hand = 0;
+			cac[i].lock = &zerochar;
+			cac[i].hand = 0;
+
+				/* Combine empty blocks */
+			if ((i > 0) && (*cac[i-1].lock == 0))
+			{
+				cac[i-1].leng += cac[i].leng;
+				cacnum--; copybuf(&cac[i+1],&cac[i],(cacnum-i)*sizeof(cactype));
+			}
+			else if ((i < cacnum-1) && (*cac[i+1].lock == 0))
+			{
+				cac[i+1].leng += cac[i].leng;
+				cacnum--; copybuf(&cac[i+1],&cac[i],(cacnum-i)*sizeof(cactype));
+			}
+		}
+}
+
+void agecache(void)
+{
+	int32_t cnt;
+	uint8_t  ch;
+
+	if (agecount >= cacnum) agecount = cacnum-1;
+	assert(agecount >= 0);
+
+	for(cnt=(cacnum>>4);cnt>=0;cnt--)
+	{
+		ch = (*cac[agecount].lock);
+		if (((ch-2)&255) < 198)
+			(*cac[agecount].lock) = (uint8_t ) (ch-1);
+
+		agecount--; if (agecount < 0) agecount = cacnum-1;
+	}
+}
+
+void reportandexit(char  *errormessage)
+{
+	int32_t i, j;
+
+	setvmode(0x3);
+	j = 0;
+	for(i=0;i<cacnum;i++)
+	{
+		printf("%d- ",i);
+		printf("ptr: 0x%x, ",*cac[i].hand);
+		printf("leng: %d, ",cac[i].leng);
+		printf("lock: %d\n",*cac[i].lock);
+		j += cac[i].leng;
+	}
+	printf("Cachesize = %d\n",cachesize);
+	printf("Cacnum = %d\n",cacnum);
+	printf("Cache length sum = %d\n",j);
+	printf("ERROR: %s",errormessage);
+	Error(EXIT_FAILURE, "");
+}
+
+
+uint8_t  toupperlookup[256] =
+{
+	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
+	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,
+	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,
+	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,
+	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,0x5b,0x5c,0x5d,0x5e,0x5f,
+	0x60,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,
+	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,0x7b,0x7c,0x7d,0x7e,0x7f,
+	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,
+	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0x9b,0x9c,0x9d,0x9e,0x9f,
+	0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,
+	0xb0,0xb1,0xb2,0xb3,0xb4,0xb5,0xb6,0xb7,0xb8,0xb9,0xba,0xbb,0xbc,0xbd,0xbe,0xbf,
+	0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,
+	0xd0,0xd1,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xdb,0xdc,0xdd,0xde,0xdf,
+	0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xeb,0xec,0xed,0xee,0xef,
+	0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,0xfe,0xff,
+};
+
+int32_t numgroupfiles = 0;			// number of GRP files actually used.
+int32_t gnumfiles[MAXGROUPFILES];	// number of files on grp
+int32_t groupfil[MAXGROUPFILES] = {-1,-1,-1,-1}; // grp file handles
+int32_t groupfilpos[MAXGROUPFILES];
+uint8_t  *gfilelist[MAXGROUPFILES];	// name list + size list of all the files in grp
+int32_t *gfileoffs[MAXGROUPFILES];	// offset of the files
+uint8_t  *groupfil_memory[MAXGROUPFILES]; // addresses of raw GRP files in memory
+int32_t groupefil_crc32[MAXGROUPFILES];
+
+uint8_t  filegrp[MAXOPENFILES];
+int32_t filepos[MAXOPENFILES];
+int32_t filehan[MAXOPENFILES] =
+{
+	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+};
+
+
+
+int32_t initgroupfile(const char  *filename)
+{
+	uint8_t  buf[16];
+	int32_t i, j, k;
+
+	printf("Loading %s ...\n", filename);
+
+	if (numgroupfiles >= MAXGROUPFILES) return(-1);
+
+	groupfil_memory[numgroupfiles] = NULL; // addresses of raw GRP files in memory
+	groupefil_crc32[numgroupfiles] = 0;
+
+	groupfil[numgroupfiles] = open(filename,O_BINARY|O_RDWR,S_IREAD);
+	if (groupfil[numgroupfiles] >= 0)
+	{
+		groupfilpos[numgroupfiles] = 0;
+		read(groupfil[numgroupfiles],buf,16);
+		if ((buf[0] != 'K') || (buf[1] != 'e') || (buf[2] != 'n') ||
+			 (buf[3] != 'S') || (buf[4] != 'i') || (buf[5] != 'l') ||
+			 (buf[6] != 'v') || (buf[7] != 'e') || (buf[8] != 'r') ||
+			 (buf[9] != 'm') || (buf[10] != 'a') || (buf[11] != 'n'))
+		{
+			close(groupfil[numgroupfiles]);
+			groupfil[numgroupfiles] = -1;
+			return(-1);
+		}
+
+		//FCS: The ".grp" file format is just a collection of a lot of files stored into 1 big one. 
+		//I tried to make the format as simple as possible: The first 12 bytes contains my name, 
+		//"KenSilverman". The next 4 bytes is the number of files that were compacted into the 
+		//group file. Then for each file, there is a 16 byte structure, where the first 12 
+		//bytes are the filename, and the last 4 bytes are the file's size. The rest of the 
+		//group file is just the raw data packed one after the other in the same order as the list 
+		//of files. - ken
+
+		gnumfiles[numgroupfiles] = BUILDSWAP_INTEL32(*((int32_t *)&buf[12]));
+
+		if ((gfilelist[numgroupfiles] = (uint8_t  *)kmalloc(gnumfiles[numgroupfiles]<<4)) == 0)
+			{ Error(EXIT_FAILURE, "Not enough memory for file grouping system\n"); }
+		if ((gfileoffs[numgroupfiles] = (int32_t *)kmalloc((gnumfiles[numgroupfiles]+1)<<2)) == 0)
+			{ Error(EXIT_FAILURE, "Not enough memory for file grouping system\n"); }
+
+		// load index (name+size)
+		read(groupfil[numgroupfiles],gfilelist[numgroupfiles],gnumfiles[numgroupfiles]<<4);
+
+		j = 0;
+		for(i=0;i<gnumfiles[numgroupfiles];i++)
+		{
+			k = BUILDSWAP_INTEL32(*((int32_t *)&gfilelist[numgroupfiles][(i<<4)+12])); // get size
+			gfilelist[numgroupfiles][(i<<4)+12] = 0;
+			gfileoffs[numgroupfiles][i] = j; // absolute offset list of all files. 0 for 1st file
+			j += k;
+		}
+		gfileoffs[numgroupfiles][gnumfiles[numgroupfiles]] = j;
+	}
+    else
+    {
+        printf("Unable to find GRP file %s.\n",filename);
+		//Let user see the message
+		getchar();
+        exit(0);
+    }
+
+	// Compute CRC32 of thw whole grp and implicitely caches the GRP in memory through windows
+	lseek(groupfil[numgroupfiles], 0, SEEK_SET);
+
+	i = 1000000; // FIX_00086: grp loaded by smaller sucessive chunks to avoid overloading low ram computers
+	groupfil_memory[numgroupfiles] = malloc(i);
+	while((j=read(groupfil[numgroupfiles], groupfil_memory[numgroupfiles], i)))
+	{
+		groupefil_crc32[numgroupfiles] = crc32_update((uint8_t *)groupfil_memory[numgroupfiles], j, groupefil_crc32[numgroupfiles]);
+	}
+
+	free(groupfil_memory[numgroupfiles]);  
+	groupfil_memory[numgroupfiles] = 0;
+
+	numgroupfiles++;
+	return(groupfil[numgroupfiles-1]);
+
+}
+
+void uninitgroupfile(void)
+{
+	int32_t i;
+
+	for(i=numgroupfiles-1;i>=0;i--)
+		if (groupfil[i] != -1)
+		{
+			kfree(gfilelist[i]);
+			kfree(gfileoffs[i]);
+			close(groupfil[i]);
+			groupfil[i] = -1;
+		}
+
+}
+
+void crc32_table_gen(unsigned int* crc32_table) /* build CRC32 table */
+{
+    unsigned int crc, poly;
+    int	i, j;
+
+    poly = 0xEDB88320L;
+    for (i = 0; i < 256; i++)
+    {
+		crc = i;
+		for (j = 8; j > 0; j--)
+		{
+			if (crc & 1)
+				crc = (crc >> 1) ^ poly;
+			else
+				crc >>= 1;
+		}
+		crc32_table[i] = crc;
+    }
+}
+
+unsigned int crc32(uint8_t  *buf, unsigned int length)
+{
+	unsigned int initial_crc;
+
+	initial_crc = 0;
+	return(crc32_update(buf, length, initial_crc));
+}
+
+unsigned int crc32_update(uint8_t  *buf, unsigned int length, unsigned int crc_to_update)
+{
+	unsigned int crc32_table[256];
+
+	crc32_table_gen(crc32_table);
+
+	crc_to_update ^= 0xFFFFFFFF;
+
+	while (length--)
+		crc_to_update = crc32_table[(crc_to_update ^ *buf++) & 0xFF] ^ (crc_to_update >> 8);
+	
+	return crc_to_update ^ 0xFFFFFFFF;
+}
+
+
+/*
+ *                                      16   12   5
+ * this is the CCITT CRC 16 polynomial X  + X  + X  + 1.
+ * This is 0x1021 when x is 2, but the way the algorithm works
+ * we use 0x8408 (the reverse of the bit pattern).  The high
+ * bit is always assumed to be set, thus we only use 16 bits to
+ * represent the 17 bit value.
+*/
+
+#define POLY 0x8408   /* 1021H bit reversed */
+
+uint16_t crc16(uint8_t  *data_p, uint16_t length)
+{
+      uint8_t  i;
+      unsigned int data;
+      unsigned int crc = 0xffff;
+
+      if (length == 0)
+            return (~crc);
+      do
+      {
+            for (i=0, data=(unsigned int)0xff & *data_p++;
+                 i < 8; 
+                 i++, data >>= 1)
+            {
+                  if ((crc & 0x0001) ^ (data & 0x0001))
+                        crc = (crc >> 1) ^ POLY;
+                  else  crc >>= 1;
+            }
+      } while (--length);
+
+      crc = ~crc;
+      data = crc;
+      crc = (crc << 8) | (data >> 8 & 0xff);
+
+      return (crc);
+}
+
+int32_t kopen4load(const char  *filename, int readfromGRP)
+{ // FIX_00072: all files are now 1st searched in Duke's root folder and then in the GRP.
+	int32_t i, j, k, fil, newhandle;
+	uint8_t  bad;
+	uint8_t  *gfileptr;
+
+	newhandle = MAXOPENFILES-1;
+	while (filehan[newhandle] != -1)
+	{
+		newhandle--;
+		if (newhandle < 0)
+		{
+			Error(EXIT_FAILURE, "Too Many files open!\n");
+		}
+	}
+
+	if(!readfromGRP)
+		if ((fil = open(filename,O_BINARY|O_RDONLY)) != -1)
+		{
+			filegrp[newhandle] = 255;
+			filehan[newhandle] = fil;
+			filepos[newhandle] = 0;
+			printf("Reading external %s \n", filename);
+			return(newhandle);
+		}
+
+	for(k=numgroupfiles-1;k>=0;k--)
+	{
+		if (groupfil[k] != -1)
+		{
+			for(i=gnumfiles[k]-1;i>=0;i--)
+			{
+				gfileptr = (uint8_t  *)&gfilelist[k][i<<4];
+
+				bad = 0;
+				for(j=0;j<13;j++)
+				{
+					if (!filename[j]) break;
+					if (toupperlookup[(int) filename[j]] != toupperlookup[(int) gfileptr[j]])
+						{ bad = 1; break; }
+				}
+				if (bad) continue;
+
+				filegrp[newhandle] = (uint8_t ) k;
+				filehan[newhandle] = i;
+				filepos[newhandle] = 0;
+				return(newhandle);
+			}
+		}
+	}
+	return(-1);
+
+}
+
+int32_t kread(int32_t handle, void *buffer, int32_t leng)
+{
+	int32_t i, filenum, groupnum;
+
+	filenum = filehan[handle];
+	groupnum = filegrp[handle];
+
+	if (groupnum == 255) // Reading external
+	{
+		return(read(filenum,buffer,leng));
+	}
+
+	if (groupfil[groupnum] != -1)
+	{
+		i = gfileoffs[groupnum][filenum]+filepos[handle];
+		if (i != groupfilpos[groupnum])
+		{
+			lseek(groupfil[groupnum],i+((gnumfiles[groupnum]+1)<<4),SEEK_SET);
+			groupfilpos[groupnum] = i;
+		}
+		leng = min(leng,(gfileoffs[groupnum][filenum+1]-gfileoffs[groupnum][filenum])-filepos[handle]);
+		leng = read(groupfil[groupnum],buffer,leng);
+		filepos[handle] += leng;
+		groupfilpos[groupnum] += leng;
+		return(leng);
+	}
+
+	return(0);
+
+}
+
+int kread16(int32_t handle, short *buffer)
+{
+    if (kread(handle, buffer, 2) != 2)
+        return(0);
+
+    *buffer = BUILDSWAP_INTEL16(*buffer);
+    return(1);
+}
+
+int kread32(int32_t handle, int32_t *buffer)
+{
+    if (kread(handle, buffer, 4) != 4)
+        return(0);
+
+    *buffer = BUILDSWAP_INTEL32(*buffer);
+    return(1);
+}
+
+int kread8(int32_t handle, uint8_t  *buffer)
+{
+    if (kread(handle, buffer, 1) != 1)
+        return(0);
+
+    return(1);
+}
+
+int32_t klseek(int32_t handle, int32_t offset, int32_t whence)
+{
+	int32_t i, groupnum;
+
+	groupnum = filegrp[handle];
+
+	if (groupnum == 255) return((int32_t )lseek(filehan[handle],offset,whence));
+	if (groupfil[groupnum] != -1)
+	{
+		switch(whence)
+		{
+			case SEEK_SET: filepos[handle] = offset; break;
+			case SEEK_END: i = filehan[handle];
+								filepos[handle] = (gfileoffs[groupnum][i+1]-gfileoffs[groupnum][i])+offset;
+								break;
+			case SEEK_CUR: filepos[handle] += offset; break;
+		}
+		return(filepos[handle]);
+	}
+	return(-1);
+
+}
+
+#ifdef __APPLE__
+int32_t filelength(int32_t fd)
+{
+    struct stat stats;
+    fstat(fd, &stats);
+    return (int32_t )stats.st_size;
+}
+#endif
+
+int32_t kfilelength(int32_t handle)
+{
+	int32_t i, groupnum;
+
+	groupnum = filegrp[handle];
+	if (groupnum == 255) return(filelength(filehan[handle]));
+	i = filehan[handle];
+	return(gfileoffs[groupnum][i+1]-gfileoffs[groupnum][i]);
+
+}
+
+void kclose(int32_t handle)
+{
+	if (handle < 0) return;
+	if (filegrp[handle] == 255) close(filehan[handle]);
+	filehan[handle] = -1;
+
+}
+
+
+
+
+	/* Internal LZW variables */
+#define LZWSIZE 16384           /* Watch out for shorts! */
+static uint8_t  *lzwbuf1, *lzwbuf4, *lzwbuf5;
+static uint8_t  lzwbuflock[5];
+static short *lzwbuf2, *lzwbuf3;
+
+void kdfread(void *buffer, size_t dasizeof, size_t count, int32_t fil)
+{
+	size_t i, j;
+	int32_t k, kgoal;
+	short leng;
+	uint8_t  *ptr;
+
+	lzwbuflock[0] = lzwbuflock[1] = lzwbuflock[2] = lzwbuflock[3] = lzwbuflock[4] = 200;
+	if (lzwbuf1 == NULL) allocache((int32_t *)&lzwbuf1,LZWSIZE+(LZWSIZE>>4),&lzwbuflock[0]);
+	if (lzwbuf2 == NULL) allocache((int32_t *)&lzwbuf2,(LZWSIZE+(LZWSIZE>>4))*2,&lzwbuflock[1]);
+	if (lzwbuf3 == NULL) allocache((int32_t *)&lzwbuf3,(LZWSIZE+(LZWSIZE>>4))*2,&lzwbuflock[2]);
+	if (lzwbuf4 == NULL) allocache((int32_t *)&lzwbuf4,LZWSIZE,&lzwbuflock[3]);
+	if (lzwbuf5 == NULL) allocache((int32_t *)&lzwbuf5,LZWSIZE+(LZWSIZE>>4),&lzwbuflock[4]);
+
+	if (dasizeof > LZWSIZE) { count *= dasizeof; dasizeof = 1; }
+	ptr = (uint8_t  *)buffer;
+
+	kread(fil,&leng,2); kread(fil,lzwbuf5,(int32_t )leng);
+	k = 0;
+	kgoal = uncompress(lzwbuf5,(int32_t )leng,lzwbuf4);
+
+	copybufbyte(lzwbuf4,ptr,(int32_t )dasizeof);
+	k += (int32_t )dasizeof;
+
+	for(i=1;i<count;i++)
+	{
+		if (k >= kgoal)
+		{
+			kread(fil,&leng,2); kread(fil,lzwbuf5,(int32_t )leng);
+			k = 0; kgoal = uncompress(lzwbuf5,(int32_t )leng,lzwbuf4);
+		}
+		for(j=0;j<dasizeof;j++) ptr[j+dasizeof] = (uint8_t ) ((ptr[j]+lzwbuf4[j+k])&255);
+		k += dasizeof;
+		ptr += dasizeof;
+	}
+	lzwbuflock[0] = lzwbuflock[1] = lzwbuflock[2] = lzwbuflock[3] = lzwbuflock[4] = 1;
+}
+
+void dfread(void *buffer, size_t dasizeof, size_t count, FILE *fil)
+{
+	size_t i, j;
+	int32_t k, kgoal;
+	short leng;
+	uint8_t  *ptr;
+
+	lzwbuflock[0] = lzwbuflock[1] = lzwbuflock[2] = lzwbuflock[3] = lzwbuflock[4] = 200;
+	if (lzwbuf1 == NULL) allocache((int32_t *)&lzwbuf1,LZWSIZE+(LZWSIZE>>4),&lzwbuflock[0]);
+	if (lzwbuf2 == NULL) allocache((int32_t *)&lzwbuf2,(LZWSIZE+(LZWSIZE>>4))*2,&lzwbuflock[1]);
+	if (lzwbuf3 == NULL) allocache((int32_t *)&lzwbuf3,(LZWSIZE+(LZWSIZE>>4))*2,&lzwbuflock[2]);
+	if (lzwbuf4 == NULL) allocache((int32_t *)&lzwbuf4,LZWSIZE,&lzwbuflock[3]);
+	if (lzwbuf5 == NULL) allocache((int32_t *)&lzwbuf5,LZWSIZE+(LZWSIZE>>4),&lzwbuflock[4]);
+
+	if (dasizeof > LZWSIZE) { count *= dasizeof; dasizeof = 1; }
+	ptr = (uint8_t  *)buffer;
+
+	fread(&leng,2,1,fil); fread(lzwbuf5,(int32_t )leng,1,fil);
+	k = 0; kgoal = uncompress(lzwbuf5,(int32_t )leng,lzwbuf4);
+
+	copybufbyte(lzwbuf4,ptr,(int32_t )dasizeof);
+	k += (int32_t )dasizeof;
+
+	for(i=1;i<count;i++)
+	{
+		if (k >= kgoal)
+		{
+			fread(&leng,2,1,fil); fread(lzwbuf5,(int32_t )leng,1,fil);
+			k = 0; kgoal = uncompress(lzwbuf5,(int32_t )leng,lzwbuf4);
+		}
+		for(j=0;j<dasizeof;j++) ptr[j+dasizeof] = (uint8_t ) ((ptr[j]+lzwbuf4[j+k])&255);
+		k += dasizeof;
+		ptr += dasizeof;
+	}
+	lzwbuflock[0] = lzwbuflock[1] = lzwbuflock[2] = lzwbuflock[3] = lzwbuflock[4] = 1;
+}
+
+void dfwrite(void *buffer, size_t dasizeof, size_t count, FILE *fil)
+{
+	size_t i, j, k;
+	short leng;
+	uint8_t  *ptr;
+
+	lzwbuflock[0] = lzwbuflock[1] = lzwbuflock[2] = lzwbuflock[3] = lzwbuflock[4] = 200;
+	if (lzwbuf1 == NULL) allocache((int32_t *)&lzwbuf1,LZWSIZE+(LZWSIZE>>4),&lzwbuflock[0]);
+	if (lzwbuf2 == NULL) allocache((int32_t *)&lzwbuf2,(LZWSIZE+(LZWSIZE>>4))*2,&lzwbuflock[1]);
+	if (lzwbuf3 == NULL) allocache((int32_t *)&lzwbuf3,(LZWSIZE+(LZWSIZE>>4))*2,&lzwbuflock[2]);
+	if (lzwbuf4 == NULL) allocache((int32_t *)&lzwbuf4,LZWSIZE,&lzwbuflock[3]);
+	if (lzwbuf5 == NULL) allocache((int32_t *)&lzwbuf5,LZWSIZE+(LZWSIZE>>4),&lzwbuflock[4]);
+
+	if (dasizeof > LZWSIZE) { count *= dasizeof; dasizeof = 1; }
+	ptr = (uint8_t  *)buffer;
+
+	copybufbyte(ptr,lzwbuf4,(int32_t )dasizeof);
+	k = dasizeof;
+
+	if (k > LZWSIZE-dasizeof)
+	{
+		leng = (short)compress(lzwbuf4,k,lzwbuf5); k = 0;
+		fwrite(&leng,2,1,fil); fwrite(lzwbuf5,(int32_t )leng,1,fil);
+	}
+
+	for(i=1;i<count;i++)
+	{
+		for(j=0;j<dasizeof;j++) lzwbuf4[j+k] = (uint8_t ) ((ptr[j+dasizeof]-ptr[j])&255);
+		k += dasizeof;
+		if (k > LZWSIZE-dasizeof)
+		{
+			leng = (short)compress(lzwbuf4,k,lzwbuf5); k = 0;
+			fwrite(&leng,2,1,fil); fwrite(lzwbuf5,(int32_t )leng,1,fil);
+		}
+		ptr += dasizeof;
+	}
+	if (k > 0)
+	{
+		leng = (short)compress(lzwbuf4,k,lzwbuf5);
+		fwrite(&leng,2,1,fil); fwrite(lzwbuf5,(int32_t )leng,1,fil);
+	}
+	lzwbuflock[0] = lzwbuflock[1] = lzwbuflock[2] = lzwbuflock[3] = lzwbuflock[4] = 1;
+}
+
+int32_t compress(uint8_t  *lzwinbuf, int32_t uncompleng, uint8_t  *lzwoutbuf)
+{
+	int32_t i, addr, newaddr, addrcnt, zx, *longptr;
+	int32_t bytecnt1, bitcnt, numbits, oneupnumbits;
+	short *shortptr;
+
+	for(i=255;i>=0;i--) { lzwbuf1[i] = (uint8_t ) i; lzwbuf3[i] = (short) ((i+1)&255); }
+	clearbuf((void *) FP_OFF(lzwbuf2),256>>1,0xffffffff);
+	clearbuf((void *) FP_OFF(lzwoutbuf),((uncompleng+15)+3)>>2,0L);
+
+	addrcnt = 256; bytecnt1 = 0; bitcnt = (4<<3);
+	numbits = 8; oneupnumbits = (1<<8);
+	do
+	{
+		addr = lzwinbuf[bytecnt1];
+		do
+		{
+			bytecnt1++;
+			if (bytecnt1 == uncompleng) break;
+			if (lzwbuf2[addr] < 0) {lzwbuf2[addr] = (short) addrcnt; break;}
+			newaddr = lzwbuf2[addr];
+			while (lzwbuf1[newaddr] != lzwinbuf[bytecnt1])
+			{
+				zx = lzwbuf3[newaddr];
+				if (zx < 0) {lzwbuf3[newaddr] = (short) addrcnt; break;}
+				newaddr = zx;
+			}
+			if (lzwbuf3[newaddr] == addrcnt) break;
+			addr = newaddr;
+		} while (addr >= 0);
+		lzwbuf1[addrcnt] = lzwinbuf[bytecnt1];
+		lzwbuf2[addrcnt] = -1;
+		lzwbuf3[addrcnt] = -1;
+
+		longptr = (int32_t *)&lzwoutbuf[bitcnt>>3];
+		longptr[0] |= (addr<<(bitcnt&7));
+		bitcnt += numbits;
+		if ((addr&((oneupnumbits>>1)-1)) > ((addrcnt-1)&((oneupnumbits>>1)-1)))
+			bitcnt--;
+
+		addrcnt++;
+		if (addrcnt > oneupnumbits) { numbits++; oneupnumbits <<= 1; }
+	} while ((bytecnt1 < uncompleng) && (bitcnt < (uncompleng<<3)));
+
+	longptr = (int32_t *)&lzwoutbuf[bitcnt>>3];
+	longptr[0] |= (addr<<(bitcnt&7));
+	bitcnt += numbits;
+	if ((addr&((oneupnumbits>>1)-1)) > ((addrcnt-1)&((oneupnumbits>>1)-1)))
+		bitcnt--;
+
+	shortptr = (short *)lzwoutbuf;
+	shortptr[0] = (short)uncompleng;
+	if (((bitcnt+7)>>3) < uncompleng)
+	{
+		shortptr[1] = (short)addrcnt;
+		return((bitcnt+7)>>3);
+	}
+	shortptr[1] = (short)0;
+	for(i=0;i<uncompleng;i++) lzwoutbuf[i+4] = lzwinbuf[i];
+	return(uncompleng+4);
+}
+
+int32_t uncompress(uint8_t  *lzwinbuf, int32_t compleng, uint8_t  *lzwoutbuf)
+{
+	int32_t strtot, currstr, numbits, oneupnumbits;
+	int32_t i, dat, leng, bitcnt, outbytecnt, *longptr;
+	short *shortptr;
+
+	shortptr = (short *)lzwinbuf;
+	strtot = (int32_t )shortptr[1];
+	if (strtot == 0)
+	{
+		copybuf((void *)(FP_OFF(lzwinbuf)+4),(void *)(FP_OFF(lzwoutbuf)),((compleng-4)+3)>>2);
+		return((int32_t )shortptr[0]); /* uncompleng */
+	}
+	for(i=255;i>=0;i--) { lzwbuf2[i] = (short) i; lzwbuf3[i] = (short) i; }
+	currstr = 256; bitcnt = (4<<3); outbytecnt = 0;
+	numbits = 8; oneupnumbits = (1<<8);
+	do
+	{
+		longptr = (int32_t *)&lzwinbuf[bitcnt>>3];
+		dat = ((longptr[0]>>(bitcnt&7)) & (oneupnumbits-1));
+		bitcnt += numbits;
+		if ((dat&((oneupnumbits>>1)-1)) > ((currstr-1)&((oneupnumbits>>1)-1)))
+			{ dat &= ((oneupnumbits>>1)-1); bitcnt--; }
+
+		lzwbuf3[currstr] = (short) dat;
+
+		for(leng=0;dat>=256;leng++,dat=lzwbuf3[dat])
+			lzwbuf1[leng] = (uint8_t ) lzwbuf2[dat];
+
+		lzwoutbuf[outbytecnt++] = (uint8_t ) dat;
+		for(i=leng-1;i>=0;i--) lzwoutbuf[outbytecnt++] = lzwbuf1[i];
+
+		lzwbuf2[currstr-1] = (short) dat; lzwbuf2[currstr] = (short) dat;
+		currstr++;
+		if (currstr > oneupnumbits) { numbits++; oneupnumbits <<= 1; }
+	} while (currstr < strtot);
+	return((int32_t )shortptr[0]); /* uncompleng */
+}
+
+int SafeFileExists ( const char  * _filename );
+int32_t TCkopen4load(const char  *filename, int readfromGRP)
+{
+	char  fullfilename[512];
+	int32_t result = 0;
+ 
+	if(game_dir[0] != '\0' && !readfromGRP)
+	{
+		sprintf(fullfilename, "%s\\%s", game_dir, filename);		
+		if (!SafeFileExists(fullfilename)) // try root
+			sprintf(fullfilename, "%s", filename);
+	}
+	else
+	{
+		sprintf(fullfilename, "%s", filename);
+	}
+
+	result = kopen4load(fullfilename, readfromGRP);
+
+	if(g_CV_DebugFileAccess != 0)
+	{
+		printf("FILE ACCESS: [read] File: (%s) Result: %d, clock: %d\n", fullfilename, result, totalclock);
+	}
+
+	return result;
+}
--- /dev/null
+++ b/Engine/src/cache.h
@@ -1,0 +1,55 @@
+/*
+ * Cache1d declarations.
+ *
+ *  Written by Ryan C. Gordon. (icculus@clutteredmind.org)
+ *
+ * Please do NOT harrass Ken Silverman about any code modifications
+ *  (including this file) to BUILD.
+ */
+
+/*
+ * "Build Engine & Tools" Copyright (c) 1993-1997 Ken Silverman
+ * Ken Silverman's official web site: "http://www.advsys.net/ken"
+ * See the included license file "BUILDLIC.TXT" for license info.
+ * This file has been modified from Ken Silverman's original release
+ */
+
+#ifndef _INCLUDE_CACHE1D_H_
+#define _INCLUDE_CACHE1D_H_
+
+#define MAXGROUPFILES 4     /* Warning: Fix groupfil if this is changed */
+#define MAXOPENFILES 64     /* Warning: Fix filehan if this is changed  */
+
+void initcache(int32_t dacachestart, int32_t dacachesize);
+void allocache (int32_t *newhandle, int32_t newbytes, uint8_t  *newlockptr);
+void suckcache (int32_t *suckptr);
+void agecache(void);
+
+
+void reportandexit(char  *errormessage);
+
+
+//Filesystem
+int32_t initgroupfile(const char  *filename);
+void uninitgroupfile(void);
+uint16_t crc16(uint8_t  *data_p, uint16_t length);
+unsigned int crc32_update(uint8_t  *buf, unsigned int length, unsigned int crc_to_update);
+int32_t kopen4load(const char  *filename, int readfromGRP);
+int32_t kread(int32_t handle, void *buffer, int32_t leng);
+int kread8(int32_t handle, uint8_t  *buffer);
+int kread16(int32_t handle, short *buffer);
+int kread32(int32_t handle, int32_t *buffer);
+int32_t klseek(int32_t handle, int32_t offset, int32_t whence);
+int32_t kfilelength(int32_t handle);
+void kclose(int32_t handle);
+void kdfread(void *buffer, size_t dasizeof, size_t count, int32_t fil);
+void dfread(void *buffer, size_t dasizeof, size_t count, FILE *fil);
+void dfwrite(void *buffer, size_t dasizeof, size_t count, FILE *fil);
+int32_t compress(uint8_t  *lzwinbuf, int32_t uncompleng, uint8_t  *lzwoutbuf);
+int32_t uncompress(uint8_t  *lzwinbuf, int32_t compleng, uint8_t  *lzwoutbuf);
+
+extern char  game_dir[512];
+extern int32_t TCkopen4load(const char  *filename, int readfromGRP);
+
+
+#endif
\ No newline at end of file
--- a/Engine/src/cache1d.c
+++ /dev/null
@@ -1,861 +1,0 @@
-/*
- * "Build Engine & Tools" Copyright (c) 1993-1997 Ken Silverman
- * Ken Silverman's official web site: "http://www.advsys.net/ken"
- * See the included license file "BUILDLIC.TXT" for license info.
- * This file has been modified from Ken Silverman's original release
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "platform.h"
-#include "display.h"
-
-#include "pragmas.h"
-#include "cache1d.h"
-#include "build.h"
-
-#include "../../Game/src/cvar_defs.h"
-
-#include "types.h"
-
-/*
- *   This module keeps track of a standard linear cacheing system.
- *   To use this module, here's all you need to do:
- *
- *   Step 1: Allocate a nice BIG buffer, like from 1MB-4MB and
- *           Call initcache(int32_t cachestart, int32_t cachesize) where
- *
- *              cachestart = (int32_t )(pointer to start of BIG buffer)
- *              cachesize = length of BIG buffer
- *
- *   Step 2: Call allocache(int32_t *bufptr, int32_t bufsiz, uint8_t  *lockptr)
- *              whenever you need to allocate a buffer, where:
- *
- *              *bufptr = pointer to 4-byte pointer to buffer
- *                 Confused?  Using this method, cache2d can remove
- *                 previously allocated things from the cache safely by
- *                 setting the 4-byte pointer to 0.
- *              bufsiz = number of bytes to allocate
- *              *lockptr = pointer to locking uint8_t  which tells whether
- *                 the region can be removed or not.  If *lockptr = 0 then
- *                 the region is not locked else its locked.
- *
- *   Step 3: If you need to remove everything from the cache, or every
- *           unlocked item from the cache, you can call uninitcache();
- *              Call uninitcache(0) to remove all unlocked items, or
- *              Call uninitcache(1) to remove everything.
- *           After calling uninitcache, it is still ok to call allocache
- *           without first calling initcache.
- */
-
-#define MAXCACHEOBJECTS 9216
-
-static int32_t cachesize = 0;
-int32_t cachecount = 0;
-uint8_t  zerochar = 0;
-int32_t cachestart = 0, cacnum = 0, agecount = 0;
-typedef struct { int32_t *hand, leng; uint8_t  *lock; } cactype;
-cactype cac[MAXCACHEOBJECTS];
-int32_t lockrecip[200];
-
-// TC game directory
-char  game_dir[512] = { '\0' };
-
-void initcache(int32_t dacachestart, int32_t dacachesize)
-{
-	int32_t i;
-
-	for(i=1;i<200;i++) lockrecip[i] = (1<<28)/(200-i);
-
-	cachestart = dacachestart;
-	cachesize = dacachesize;
-
-	cac[0].leng = cachesize;
-	cac[0].lock = &zerochar;
-	cacnum = 1;
-}
-
-void allocache (int32_t *newhandle, int32_t newbytes, uint8_t  *newlockptr)
-{
-	int32_t i, z, zz, bestz=0, daval, bestval, besto=0, o1, o2, sucklen, suckz;
-
-	newbytes = newbytes+15;
-
-	if ((uint32_t)newbytes > (uint32_t)cachesize)
-	{
-		printf("Cachesize: %d\n",cachesize);
-		printf("*Newhandle: 0x%x, Newbytes: %d, *Newlock: %d\n",(unsigned int)newhandle,newbytes,*newlockptr);
-		reportandexit("BUFFER TOO BIG TO FIT IN CACHE!\n");
-	}
-
-	if (*newlockptr == 0)
-	{
-		reportandexit("ALLOCACHE CALLED WITH LOCK OF 0!\n");
-	}
-
-		/* Find best place */
-	bestval = 0x7fffffff; o1 = cachesize;
-	for(z=cacnum-1;z>=0;z--)
-	{
-		o1 -= cac[z].leng;
-		o2 = o1+newbytes; if (o2 > cachesize) continue;
-
-		daval = 0;
-		for(i=o1,zz=z;i<o2;i+=cac[zz++].leng)
-		{
-			if (*cac[zz].lock == 0) continue;
-			if (*cac[zz].lock >= 200) { daval = 0x7fffffff; break; }
-			daval += (int32_t ) mulscale32(cac[zz].leng+65536,lockrecip[*cac[zz].lock]);
-			if (daval >= bestval) break;
-		}
-		if (daval < bestval)
-		{
-			bestval = daval; besto = o1; bestz = z;
-			if (bestval == 0) break;
-		}
-	}
-
-	/*printf("%ld %ld %ld\n",besto,newbytes,*newlockptr);*/
-
-	if (bestval == 0x7fffffff)
-		reportandexit("CACHE SPACE ALL LOCKED UP!\n");
-
-		/* Suck things out */
-	for(sucklen=-newbytes,suckz=bestz;sucklen<0;sucklen+=cac[suckz++].leng)
-		if (*cac[suckz].lock) *cac[suckz].hand = 0;
-
-		/* Remove all blocks except 1 */
-	suckz -= (bestz+1); cacnum -= suckz;
-	copybufbyte(&cac[bestz+suckz],&cac[bestz],(cacnum-bestz)*sizeof(cactype));
-	cac[bestz].hand = newhandle; *newhandle = cachestart+besto;
-	cac[bestz].leng = newbytes;
-	cac[bestz].lock = newlockptr;
-	cachecount++;
-
-		/* Add new empty block if necessary */
-	if (sucklen <= 0) return;
-
-	bestz++;
-	if (bestz == cacnum)
-	{
-		cacnum++; if (cacnum > MAXCACHEOBJECTS) reportandexit("Too many objects in cache! (cacnum > MAXCACHEOBJECTS)\n");
-		cac[bestz].leng = sucklen;
-		cac[bestz].lock = &zerochar;
-		return;
-	}
-
-	if (*cac[bestz].lock == 0) { cac[bestz].leng += sucklen; return; }
-
-	cacnum++; if (cacnum > MAXCACHEOBJECTS) reportandexit("Too many objects in cache! (cacnum > MAXCACHEOBJECTS)\n");
-	for(z=cacnum-1;z>bestz;z--) cac[z] = cac[z-1];
-	cac[bestz].leng = sucklen;
-	cac[bestz].lock = &zerochar;
-}
-
-void suckcache (int32_t *suckptr)
-{
-	int32_t i;
-
-		/* Can't exit early, because invalid pointer might be same even though lock = 0 */
-	for(i=0;i<cacnum;i++)
-		if ((int32_t )(*cac[i].hand) == (int32_t )suckptr)
-		{
-			if (*cac[i].lock) *cac[i].hand = 0;
-			cac[i].lock = &zerochar;
-			cac[i].hand = 0;
-
-				/* Combine empty blocks */
-			if ((i > 0) && (*cac[i-1].lock == 0))
-			{
-				cac[i-1].leng += cac[i].leng;
-				cacnum--; copybuf(&cac[i+1],&cac[i],(cacnum-i)*sizeof(cactype));
-			}
-			else if ((i < cacnum-1) && (*cac[i+1].lock == 0))
-			{
-				cac[i+1].leng += cac[i].leng;
-				cacnum--; copybuf(&cac[i+1],&cac[i],(cacnum-i)*sizeof(cactype));
-			}
-		}
-}
-
-void agecache(void)
-{
-	int32_t cnt;
-	uint8_t  ch;
-
-	if (agecount >= cacnum) agecount = cacnum-1;
-	assert(agecount >= 0);
-
-	for(cnt=(cacnum>>4);cnt>=0;cnt--)
-	{
-		ch = (*cac[agecount].lock);
-		if (((ch-2)&255) < 198)
-			(*cac[agecount].lock) = (uint8_t ) (ch-1);
-
-		agecount--; if (agecount < 0) agecount = cacnum-1;
-	}
-}
-
-void reportandexit(char  *errormessage)
-{
-	int32_t i, j;
-
-	setvmode(0x3);
-	j = 0;
-	for(i=0;i<cacnum;i++)
-	{
-		printf("%d- ",i);
-		printf("ptr: 0x%x, ",*cac[i].hand);
-		printf("leng: %d, ",cac[i].leng);
-		printf("lock: %d\n",*cac[i].lock);
-		j += cac[i].leng;
-	}
-	printf("Cachesize = %d\n",cachesize);
-	printf("Cacnum = %d\n",cacnum);
-	printf("Cache length sum = %d\n",j);
-	printf("ERROR: %s",errormessage);
-	Error(EXIT_FAILURE, "");
-}
-
-
-uint8_t  toupperlookup[256] =
-{
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,0x5b,0x5c,0x5d,0x5e,0x5f,
-	0x60,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,0x7b,0x7c,0x7d,0x7e,0x7f,
-	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,
-	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0x9b,0x9c,0x9d,0x9e,0x9f,
-	0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,
-	0xb0,0xb1,0xb2,0xb3,0xb4,0xb5,0xb6,0xb7,0xb8,0xb9,0xba,0xbb,0xbc,0xbd,0xbe,0xbf,
-	0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,
-	0xd0,0xd1,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xdb,0xdc,0xdd,0xde,0xdf,
-	0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xeb,0xec,0xed,0xee,0xef,
-	0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,0xfe,0xff,
-};
-
-int32_t numgroupfiles = 0;			// number of GRP files actually used.
-int32_t gnumfiles[MAXGROUPFILES];	// number of files on grp
-int32_t groupfil[MAXGROUPFILES] = {-1,-1,-1,-1}; // grp file handles
-int32_t groupfilpos[MAXGROUPFILES];
-uint8_t  *gfilelist[MAXGROUPFILES];	// name list + size list of all the files in grp
-int32_t *gfileoffs[MAXGROUPFILES];	// offset of the files
-uint8_t  *groupfil_memory[MAXGROUPFILES]; // addresses of raw GRP files in memory
-int32_t groupefil_crc32[MAXGROUPFILES];
-
-uint8_t  filegrp[MAXOPENFILES];
-int32_t filepos[MAXOPENFILES];
-int32_t filehan[MAXOPENFILES] =
-{
-	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-};
-
-
-
-int32_t initgroupfile(const char  *filename)
-{
-	uint8_t  buf[16];
-	int32_t i, j, k;
-
-	printf("Loading %s ...\n", filename);
-
-	if (numgroupfiles >= MAXGROUPFILES) return(-1);
-
-	groupfil_memory[numgroupfiles] = NULL; // addresses of raw GRP files in memory
-	groupefil_crc32[numgroupfiles] = 0;
-
-	groupfil[numgroupfiles] = open(filename,O_BINARY|O_RDWR,S_IREAD);
-	if (groupfil[numgroupfiles] >= 0)
-	{
-		groupfilpos[numgroupfiles] = 0;
-		read(groupfil[numgroupfiles],buf,16);
-		if ((buf[0] != 'K') || (buf[1] != 'e') || (buf[2] != 'n') ||
-			 (buf[3] != 'S') || (buf[4] != 'i') || (buf[5] != 'l') ||
-			 (buf[6] != 'v') || (buf[7] != 'e') || (buf[8] != 'r') ||
-			 (buf[9] != 'm') || (buf[10] != 'a') || (buf[11] != 'n'))
-		{
-			close(groupfil[numgroupfiles]);
-			groupfil[numgroupfiles] = -1;
-			return(-1);
-		}
-
-		//FCS: The ".grp" file format is just a collection of a lot of files stored into 1 big one. 
-		//I tried to make the format as simple as possible: The first 12 bytes contains my name, 
-		//"KenSilverman". The next 4 bytes is the number of files that were compacted into the 
-		//group file. Then for each file, there is a 16 byte structure, where the first 12 
-		//bytes are the filename, and the last 4 bytes are the file's size. The rest of the 
-		//group file is just the raw data packed one after the other in the same order as the list 
-		//of files. - ken
-
-		gnumfiles[numgroupfiles] = BUILDSWAP_INTEL32(*((int32_t *)&buf[12]));
-
-		if ((gfilelist[numgroupfiles] = (uint8_t  *)kmalloc(gnumfiles[numgroupfiles]<<4)) == 0)
-			{ Error(EXIT_FAILURE, "Not enough memory for file grouping system\n"); }
-		if ((gfileoffs[numgroupfiles] = (int32_t *)kmalloc((gnumfiles[numgroupfiles]+1)<<2)) == 0)
-			{ Error(EXIT_FAILURE, "Not enough memory for file grouping system\n"); }
-
-		// load index (name+size)
-		read(groupfil[numgroupfiles],gfilelist[numgroupfiles],gnumfiles[numgroupfiles]<<4);
-
-		j = 0;
-		for(i=0;i<gnumfiles[numgroupfiles];i++)
-		{
-			k = BUILDSWAP_INTEL32(*((int32_t *)&gfilelist[numgroupfiles][(i<<4)+12])); // get size
-			gfilelist[numgroupfiles][(i<<4)+12] = 0;
-			gfileoffs[numgroupfiles][i] = j; // absolute offset list of all files. 0 for 1st file
-			j += k;
-		}
-		gfileoffs[numgroupfiles][gnumfiles[numgroupfiles]] = j;
-	}
-    else
-    {
-        printf("Unable to find GRP file %s.\n",filename);
-		//Let user see the message
-		getchar();
-        exit(0);
-    }
-
-	// Compute CRC32 of thw whole grp and implicitely caches the GRP in memory through windows
-	lseek(groupfil[numgroupfiles], 0, SEEK_SET);
-
-	i = 1000000; // FIX_00086: grp loaded by smaller sucessive chunks to avoid overloading low ram computers
-	groupfil_memory[numgroupfiles] = malloc(i);
-	while((j=read(groupfil[numgroupfiles], groupfil_memory[numgroupfiles], i)))
-	{
-		groupefil_crc32[numgroupfiles] = crc32_update((uint8_t *)groupfil_memory[numgroupfiles], j, groupefil_crc32[numgroupfiles]);
-	}
-
-	free(groupfil_memory[numgroupfiles]);  
-	groupfil_memory[numgroupfiles] = 0;
-
-	numgroupfiles++;
-	return(groupfil[numgroupfiles-1]);
-
-}
-
-void uninitgroupfile(void)
-{
-	int32_t i;
-
-	for(i=numgroupfiles-1;i>=0;i--)
-		if (groupfil[i] != -1)
-		{
-			kfree(gfilelist[i]);
-			kfree(gfileoffs[i]);
-			close(groupfil[i]);
-			groupfil[i] = -1;
-		}
-
-}
-
-void crc32_table_gen(unsigned int* crc32_table) /* build CRC32 table */
-{
-    unsigned int crc, poly;
-    int	i, j;
-
-    poly = 0xEDB88320L;
-    for (i = 0; i < 256; i++)
-    {
-		crc = i;
-		for (j = 8; j > 0; j--)
-		{
-			if (crc & 1)
-				crc = (crc >> 1) ^ poly;
-			else
-				crc >>= 1;
-		}
-		crc32_table[i] = crc;
-    }
-}
-
-unsigned int crc32(uint8_t  *buf, unsigned int length)
-{
-	unsigned int initial_crc;
-
-	initial_crc = 0;
-	return(crc32_update(buf, length, initial_crc));
-}
-
-unsigned int crc32_update(uint8_t  *buf, unsigned int length, unsigned int crc_to_update)
-{
-	unsigned int crc32_table[256];
-
-	crc32_table_gen(crc32_table);
-
-	crc_to_update ^= 0xFFFFFFFF;
-
-	while (length--)
-		crc_to_update = crc32_table[(crc_to_update ^ *buf++) & 0xFF] ^ (crc_to_update >> 8);
-	
-	return crc_to_update ^ 0xFFFFFFFF;
-}
-
-
-/*
- *                                      16   12   5
- * this is the CCITT CRC 16 polynomial X  + X  + X  + 1.
- * This is 0x1021 when x is 2, but the way the algorithm works
- * we use 0x8408 (the reverse of the bit pattern).  The high
- * bit is always assumed to be set, thus we only use 16 bits to
- * represent the 17 bit value.
-*/
-
-#define POLY 0x8408   /* 1021H bit reversed */
-
-uint16_t crc16(uint8_t  *data_p, uint16_t length)
-{
-      uint8_t  i;
-      unsigned int data;
-      unsigned int crc = 0xffff;
-
-      if (length == 0)
-            return (~crc);
-      do
-      {
-            for (i=0, data=(unsigned int)0xff & *data_p++;
-                 i < 8; 
-                 i++, data >>= 1)
-            {
-                  if ((crc & 0x0001) ^ (data & 0x0001))
-                        crc = (crc >> 1) ^ POLY;
-                  else  crc >>= 1;
-            }
-      } while (--length);
-
-      crc = ~crc;
-      data = crc;
-      crc = (crc << 8) | (data >> 8 & 0xff);
-
-      return (crc);
-}
-
-int32_t kopen4load(const char  *filename, int readfromGRP)
-{ // FIX_00072: all files are now 1st searched in Duke's root folder and then in the GRP.
-	int32_t i, j, k, fil, newhandle;
-	uint8_t  bad;
-	uint8_t  *gfileptr;
-
-	newhandle = MAXOPENFILES-1;
-	while (filehan[newhandle] != -1)
-	{
-		newhandle--;
-		if (newhandle < 0)
-		{
-			Error(EXIT_FAILURE, "Too Many files open!\n");
-		}
-	}
-
-	if(!readfromGRP)
-		if ((fil = open(filename,O_BINARY|O_RDONLY)) != -1)
-		{
-			filegrp[newhandle] = 255;
-			filehan[newhandle] = fil;
-			filepos[newhandle] = 0;
-			printf("Reading external %s \n", filename);
-			return(newhandle);
-		}
-
-	for(k=numgroupfiles-1;k>=0;k--)
-	{
-		if (groupfil[k] != -1)
-		{
-			for(i=gnumfiles[k]-1;i>=0;i--)
-			{
-				gfileptr = (uint8_t  *)&gfilelist[k][i<<4];
-
-				bad = 0;
-				for(j=0;j<13;j++)
-				{
-					if (!filename[j]) break;
-					if (toupperlookup[(int) filename[j]] != toupperlookup[(int) gfileptr[j]])
-						{ bad = 1; break; }
-				}
-				if (bad) continue;
-
-				filegrp[newhandle] = (uint8_t ) k;
-				filehan[newhandle] = i;
-				filepos[newhandle] = 0;
-				return(newhandle);
-			}
-		}
-	}
-	return(-1);
-
-}
-
-int32_t kread(int32_t handle, void *buffer, int32_t leng)
-{
-	int32_t i, filenum, groupnum;
-
-	filenum = filehan[handle];
-	groupnum = filegrp[handle];
-
-	if (groupnum == 255) // Reading external
-	{
-		return(read(filenum,buffer,leng));
-	}
-
-	if (groupfil[groupnum] != -1)
-	{
-		i = gfileoffs[groupnum][filenum]+filepos[handle];
-		if (i != groupfilpos[groupnum])
-		{
-			lseek(groupfil[groupnum],i+((gnumfiles[groupnum]+1)<<4),SEEK_SET);
-			groupfilpos[groupnum] = i;
-		}
-		leng = min(leng,(gfileoffs[groupnum][filenum+1]-gfileoffs[groupnum][filenum])-filepos[handle]);
-		leng = read(groupfil[groupnum],buffer,leng);
-		filepos[handle] += leng;
-		groupfilpos[groupnum] += leng;
-		return(leng);
-	}
-
-	return(0);
-
-}
-
-int kread16(int32_t handle, short *buffer)
-{
-    if (kread(handle, buffer, 2) != 2)
-        return(0);
-
-    *buffer = BUILDSWAP_INTEL16(*buffer);
-    return(1);
-}
-
-int kread32(int32_t handle, int32_t *buffer)
-{
-    if (kread(handle, buffer, 4) != 4)
-        return(0);
-
-    *buffer = BUILDSWAP_INTEL32(*buffer);
-    return(1);
-}
-
-int kread8(int32_t handle, uint8_t  *buffer)
-{
-    if (kread(handle, buffer, 1) != 1)
-        return(0);
-
-    return(1);
-}
-
-int32_t klseek(int32_t handle, int32_t offset, int32_t whence)
-{
-	int32_t i, groupnum;
-
-	groupnum = filegrp[handle];
-
-	if (groupnum == 255) return((int32_t )lseek(filehan[handle],offset,whence));
-	if (groupfil[groupnum] != -1)
-	{
-		switch(whence)
-		{
-			case SEEK_SET: filepos[handle] = offset; break;
-			case SEEK_END: i = filehan[handle];
-								filepos[handle] = (gfileoffs[groupnum][i+1]-gfileoffs[groupnum][i])+offset;
-								break;
-			case SEEK_CUR: filepos[handle] += offset; break;
-		}
-		return(filepos[handle]);
-	}
-	return(-1);
-
-}
-
-#ifdef __APPLE__
-int32_t filelength(int32_t fd)
-{
-    struct stat stats;
-    fstat(fd, &stats);
-    return (int32_t )stats.st_size;
-}
-#endif
-
-int32_t kfilelength(int32_t handle)
-{
-	int32_t i, groupnum;
-
-	groupnum = filegrp[handle];
-	if (groupnum == 255) return(filelength(filehan[handle]));
-	i = filehan[handle];
-	return(gfileoffs[groupnum][i+1]-gfileoffs[groupnum][i]);
-
-}
-
-void kclose(int32_t handle)
-{
-	if (handle < 0) return;
-	if (filegrp[handle] == 255) close(filehan[handle]);
-	filehan[handle] = -1;
-
-}
-
-
-
-
-	/* Internal LZW variables */
-#define LZWSIZE 16384           /* Watch out for shorts! */
-static uint8_t  *lzwbuf1, *lzwbuf4, *lzwbuf5;
-static uint8_t  lzwbuflock[5];
-static short *lzwbuf2, *lzwbuf3;
-
-void kdfread(void *buffer, size_t dasizeof, size_t count, int32_t fil)
-{
-	size_t i, j;
-	int32_t k, kgoal;
-	short leng;
-	uint8_t  *ptr;
-
-	lzwbuflock[0] = lzwbuflock[1] = lzwbuflock[2] = lzwbuflock[3] = lzwbuflock[4] = 200;
-	if (lzwbuf1 == NULL) allocache((int32_t *)&lzwbuf1,LZWSIZE+(LZWSIZE>>4),&lzwbuflock[0]);
-	if (lzwbuf2 == NULL) allocache((int32_t *)&lzwbuf2,(LZWSIZE+(LZWSIZE>>4))*2,&lzwbuflock[1]);
-	if (lzwbuf3 == NULL) allocache((int32_t *)&lzwbuf3,(LZWSIZE+(LZWSIZE>>4))*2,&lzwbuflock[2]);
-	if (lzwbuf4 == NULL) allocache((int32_t *)&lzwbuf4,LZWSIZE,&lzwbuflock[3]);
-	if (lzwbuf5 == NULL) allocache((int32_t *)&lzwbuf5,LZWSIZE+(LZWSIZE>>4),&lzwbuflock[4]);
-
-	if (dasizeof > LZWSIZE) { count *= dasizeof; dasizeof = 1; }
-	ptr = (uint8_t  *)buffer;
-
-	kread(fil,&leng,2); kread(fil,lzwbuf5,(int32_t )leng);
-	k = 0;
-	kgoal = uncompress(lzwbuf5,(int32_t )leng,lzwbuf4);
-
-	copybufbyte(lzwbuf4,ptr,(int32_t )dasizeof);
-	k += (int32_t )dasizeof;
-
-	for(i=1;i<count;i++)
-	{
-		if (k >= kgoal)
-		{
-			kread(fil,&leng,2); kread(fil,lzwbuf5,(int32_t )leng);
-			k = 0; kgoal = uncompress(lzwbuf5,(int32_t )leng,lzwbuf4);
-		}
-		for(j=0;j<dasizeof;j++) ptr[j+dasizeof] = (uint8_t ) ((ptr[j]+lzwbuf4[j+k])&255);
-		k += dasizeof;
-		ptr += dasizeof;
-	}
-	lzwbuflock[0] = lzwbuflock[1] = lzwbuflock[2] = lzwbuflock[3] = lzwbuflock[4] = 1;
-}
-
-void dfread(void *buffer, size_t dasizeof, size_t count, FILE *fil)
-{
-	size_t i, j;
-	int32_t k, kgoal;
-	short leng;
-	uint8_t  *ptr;
-
-	lzwbuflock[0] = lzwbuflock[1] = lzwbuflock[2] = lzwbuflock[3] = lzwbuflock[4] = 200;
-	if (lzwbuf1 == NULL) allocache((int32_t *)&lzwbuf1,LZWSIZE+(LZWSIZE>>4),&lzwbuflock[0]);
-	if (lzwbuf2 == NULL) allocache((int32_t *)&lzwbuf2,(LZWSIZE+(LZWSIZE>>4))*2,&lzwbuflock[1]);
-	if (lzwbuf3 == NULL) allocache((int32_t *)&lzwbuf3,(LZWSIZE+(LZWSIZE>>4))*2,&lzwbuflock[2]);
-	if (lzwbuf4 == NULL) allocache((int32_t *)&lzwbuf4,LZWSIZE,&lzwbuflock[3]);
-	if (lzwbuf5 == NULL) allocache((int32_t *)&lzwbuf5,LZWSIZE+(LZWSIZE>>4),&lzwbuflock[4]);
-
-	if (dasizeof > LZWSIZE) { count *= dasizeof; dasizeof = 1; }
-	ptr = (uint8_t  *)buffer;
-
-	fread(&leng,2,1,fil); fread(lzwbuf5,(int32_t )leng,1,fil);
-	k = 0; kgoal = uncompress(lzwbuf5,(int32_t )leng,lzwbuf4);
-
-	copybufbyte(lzwbuf4,ptr,(int32_t )dasizeof);
-	k += (int32_t )dasizeof;
-
-	for(i=1;i<count;i++)
-	{
-		if (k >= kgoal)
-		{
-			fread(&leng,2,1,fil); fread(lzwbuf5,(int32_t )leng,1,fil);
-			k = 0; kgoal = uncompress(lzwbuf5,(int32_t )leng,lzwbuf4);
-		}
-		for(j=0;j<dasizeof;j++) ptr[j+dasizeof] = (uint8_t ) ((ptr[j]+lzwbuf4[j+k])&255);
-		k += dasizeof;
-		ptr += dasizeof;
-	}
-	lzwbuflock[0] = lzwbuflock[1] = lzwbuflock[2] = lzwbuflock[3] = lzwbuflock[4] = 1;
-}
-
-void dfwrite(void *buffer, size_t dasizeof, size_t count, FILE *fil)
-{
-	size_t i, j, k;
-	short leng;
-	uint8_t  *ptr;
-
-	lzwbuflock[0] = lzwbuflock[1] = lzwbuflock[2] = lzwbuflock[3] = lzwbuflock[4] = 200;
-	if (lzwbuf1 == NULL) allocache((int32_t *)&lzwbuf1,LZWSIZE+(LZWSIZE>>4),&lzwbuflock[0]);
-	if (lzwbuf2 == NULL) allocache((int32_t *)&lzwbuf2,(LZWSIZE+(LZWSIZE>>4))*2,&lzwbuflock[1]);
-	if (lzwbuf3 == NULL) allocache((int32_t *)&lzwbuf3,(LZWSIZE+(LZWSIZE>>4))*2,&lzwbuflock[2]);
-	if (lzwbuf4 == NULL) allocache((int32_t *)&lzwbuf4,LZWSIZE,&lzwbuflock[3]);
-	if (lzwbuf5 == NULL) allocache((int32_t *)&lzwbuf5,LZWSIZE+(LZWSIZE>>4),&lzwbuflock[4]);
-
-	if (dasizeof > LZWSIZE) { count *= dasizeof; dasizeof = 1; }
-	ptr = (uint8_t  *)buffer;
-
-	copybufbyte(ptr,lzwbuf4,(int32_t )dasizeof);
-	k = dasizeof;
-
-	if (k > LZWSIZE-dasizeof)
-	{
-		leng = (short)compress(lzwbuf4,k,lzwbuf5); k = 0;
-		fwrite(&leng,2,1,fil); fwrite(lzwbuf5,(int32_t )leng,1,fil);
-	}
-
-	for(i=1;i<count;i++)
-	{
-		for(j=0;j<dasizeof;j++) lzwbuf4[j+k] = (uint8_t ) ((ptr[j+dasizeof]-ptr[j])&255);
-		k += dasizeof;
-		if (k > LZWSIZE-dasizeof)
-		{
-			leng = (short)compress(lzwbuf4,k,lzwbuf5); k = 0;
-			fwrite(&leng,2,1,fil); fwrite(lzwbuf5,(int32_t )leng,1,fil);
-		}
-		ptr += dasizeof;
-	}
-	if (k > 0)
-	{
-		leng = (short)compress(lzwbuf4,k,lzwbuf5);
-		fwrite(&leng,2,1,fil); fwrite(lzwbuf5,(int32_t )leng,1,fil);
-	}
-	lzwbuflock[0] = lzwbuflock[1] = lzwbuflock[2] = lzwbuflock[3] = lzwbuflock[4] = 1;
-}
-
-int32_t compress(uint8_t  *lzwinbuf, int32_t uncompleng, uint8_t  *lzwoutbuf)
-{
-	int32_t i, addr, newaddr, addrcnt, zx, *longptr;
-	int32_t bytecnt1, bitcnt, numbits, oneupnumbits;
-	short *shortptr;
-
-	for(i=255;i>=0;i--) { lzwbuf1[i] = (uint8_t ) i; lzwbuf3[i] = (short) ((i+1)&255); }
-	clearbuf((void *) FP_OFF(lzwbuf2),256>>1,0xffffffff);
-	clearbuf((void *) FP_OFF(lzwoutbuf),((uncompleng+15)+3)>>2,0L);
-
-	addrcnt = 256; bytecnt1 = 0; bitcnt = (4<<3);
-	numbits = 8; oneupnumbits = (1<<8);
-	do
-	{
-		addr = lzwinbuf[bytecnt1];
-		do
-		{
-			bytecnt1++;
-			if (bytecnt1 == uncompleng) break;
-			if (lzwbuf2[addr] < 0) {lzwbuf2[addr] = (short) addrcnt; break;}
-			newaddr = lzwbuf2[addr];
-			while (lzwbuf1[newaddr] != lzwinbuf[bytecnt1])
-			{
-				zx = lzwbuf3[newaddr];
-				if (zx < 0) {lzwbuf3[newaddr] = (short) addrcnt; break;}
-				newaddr = zx;
-			}
-			if (lzwbuf3[newaddr] == addrcnt) break;
-			addr = newaddr;
-		} while (addr >= 0);
-		lzwbuf1[addrcnt] = lzwinbuf[bytecnt1];
-		lzwbuf2[addrcnt] = -1;
-		lzwbuf3[addrcnt] = -1;
-
-		longptr = (int32_t *)&lzwoutbuf[bitcnt>>3];
-		longptr[0] |= (addr<<(bitcnt&7));
-		bitcnt += numbits;
-		if ((addr&((oneupnumbits>>1)-1)) > ((addrcnt-1)&((oneupnumbits>>1)-1)))
-			bitcnt--;
-
-		addrcnt++;
-		if (addrcnt > oneupnumbits) { numbits++; oneupnumbits <<= 1; }
-	} while ((bytecnt1 < uncompleng) && (bitcnt < (uncompleng<<3)));
-
-	longptr = (int32_t *)&lzwoutbuf[bitcnt>>3];
-	longptr[0] |= (addr<<(bitcnt&7));
-	bitcnt += numbits;
-	if ((addr&((oneupnumbits>>1)-1)) > ((addrcnt-1)&((oneupnumbits>>1)-1)))
-		bitcnt--;
-
-	shortptr = (short *)lzwoutbuf;
-	shortptr[0] = (short)uncompleng;
-	if (((bitcnt+7)>>3) < uncompleng)
-	{
-		shortptr[1] = (short)addrcnt;
-		return((bitcnt+7)>>3);
-	}
-	shortptr[1] = (short)0;
-	for(i=0;i<uncompleng;i++) lzwoutbuf[i+4] = lzwinbuf[i];
-	return(uncompleng+4);
-}
-
-int32_t uncompress(uint8_t  *lzwinbuf, int32_t compleng, uint8_t  *lzwoutbuf)
-{
-	int32_t strtot, currstr, numbits, oneupnumbits;
-	int32_t i, dat, leng, bitcnt, outbytecnt, *longptr;
-	short *shortptr;
-
-	shortptr = (short *)lzwinbuf;
-	strtot = (int32_t )shortptr[1];
-	if (strtot == 0)
-	{
-		copybuf((void *)(FP_OFF(lzwinbuf)+4),(void *)(FP_OFF(lzwoutbuf)),((compleng-4)+3)>>2);
-		return((int32_t )shortptr[0]); /* uncompleng */
-	}
-	for(i=255;i>=0;i--) { lzwbuf2[i] = (short) i; lzwbuf3[i] = (short) i; }
-	currstr = 256; bitcnt = (4<<3); outbytecnt = 0;
-	numbits = 8; oneupnumbits = (1<<8);
-	do
-	{
-		longptr = (int32_t *)&lzwinbuf[bitcnt>>3];
-		dat = ((longptr[0]>>(bitcnt&7)) & (oneupnumbits-1));
-		bitcnt += numbits;
-		if ((dat&((oneupnumbits>>1)-1)) > ((currstr-1)&((oneupnumbits>>1)-1)))
-			{ dat &= ((oneupnumbits>>1)-1); bitcnt--; }
-
-		lzwbuf3[currstr] = (short) dat;
-
-		for(leng=0;dat>=256;leng++,dat=lzwbuf3[dat])
-			lzwbuf1[leng] = (uint8_t ) lzwbuf2[dat];
-
-		lzwoutbuf[outbytecnt++] = (uint8_t ) dat;
-		for(i=leng-1;i>=0;i--) lzwoutbuf[outbytecnt++] = lzwbuf1[i];
-
-		lzwbuf2[currstr-1] = (short) dat; lzwbuf2[currstr] = (short) dat;
-		currstr++;
-		if (currstr > oneupnumbits) { numbits++; oneupnumbits <<= 1; }
-	} while (currstr < strtot);
-	return((int32_t )shortptr[0]); /* uncompleng */
-}
-
-int SafeFileExists ( const char  * _filename );
-int32_t TCkopen4load(const char  *filename, int readfromGRP)
-{
-	char  fullfilename[512];
-	int32_t result = 0;
- 
-	if(game_dir[0] != '\0' && !readfromGRP)
-	{
-		sprintf(fullfilename, "%s\\%s", game_dir, filename);		
-		if (!SafeFileExists(fullfilename)) // try root
-			sprintf(fullfilename, "%s", filename);
-	}
-	else
-	{
-		sprintf(fullfilename, "%s", filename);
-	}
-
-	result = kopen4load(fullfilename, readfromGRP);
-
-	if(g_CV_DebugFileAccess != 0)
-	{
-		printf("FILE ACCESS: [read] File: (%s) Result: %d, clock: %d\n", fullfilename, result, totalclock);
-	}
-
-	return result;
-}
--- a/Engine/src/cache1d.h
+++ /dev/null
@@ -1,55 +1,0 @@
-/*
- * Cache1d declarations.
- *
- *  Written by Ryan C. Gordon. (icculus@clutteredmind.org)
- *
- * Please do NOT harrass Ken Silverman about any code modifications
- *  (including this file) to BUILD.
- */
-
-/*
- * "Build Engine & Tools" Copyright (c) 1993-1997 Ken Silverman
- * Ken Silverman's official web site: "http://www.advsys.net/ken"
- * See the included license file "BUILDLIC.TXT" for license info.
- * This file has been modified from Ken Silverman's original release
- */
-
-#ifndef _INCLUDE_CACHE1D_H_
-#define _INCLUDE_CACHE1D_H_
-
-#define MAXGROUPFILES 4     /* Warning: Fix groupfil if this is changed */
-#define MAXOPENFILES 64     /* Warning: Fix filehan if this is changed  */
-
-void initcache(int32_t dacachestart, int32_t dacachesize);
-void allocache (int32_t *newhandle, int32_t newbytes, uint8_t  *newlockptr);
-void suckcache (int32_t *suckptr);
-void agecache(void);
-
-
-void reportandexit(char  *errormessage);
-
-
-//Filesystem
-int32_t initgroupfile(const char  *filename);
-void uninitgroupfile(void);
-uint16_t crc16(uint8_t  *data_p, uint16_t length);
-unsigned int crc32_update(uint8_t  *buf, unsigned int length, unsigned int crc_to_update);
-int32_t kopen4load(const char  *filename, int readfromGRP);
-int32_t kread(int32_t handle, void *buffer, int32_t leng);
-int kread8(int32_t handle, uint8_t  *buffer);
-int kread16(int32_t handle, short *buffer);
-int kread32(int32_t handle, int32_t *buffer);
-int32_t klseek(int32_t handle, int32_t offset, int32_t whence);
-int32_t kfilelength(int32_t handle);
-void kclose(int32_t handle);
-void kdfread(void *buffer, size_t dasizeof, size_t count, int32_t fil);
-void dfread(void *buffer, size_t dasizeof, size_t count, FILE *fil);
-void dfwrite(void *buffer, size_t dasizeof, size_t count, FILE *fil);
-int32_t compress(uint8_t  *lzwinbuf, int32_t uncompleng, uint8_t  *lzwoutbuf);
-int32_t uncompress(uint8_t  *lzwinbuf, int32_t compleng, uint8_t  *lzwoutbuf);
-
-extern char  game_dir[512];
-extern int32_t TCkopen4load(const char  *filename, int readfromGRP);
-
-
-#endif
\ No newline at end of file
--- a/Engine/src/draw.c
+++ b/Engine/src/draw.c
@@ -4,6 +4,7 @@
 // This file has been modified from Ken Silverman's original release
 
 /* DDOI - This file is an attempt to reimplement a_nasm.asm in C */
+/* FCS: However did that work: This is far from perfect but you have my eternal respect !!! */
 
 #include "platform.h"
 #include "build.h"
--- a/Engine/src/draw.h
+++ b/Engine/src/draw.h
@@ -14,10 +14,16 @@
    #include <inttypes.h>
 #endif
 
+
+//C++ linker friendly
 #ifdef __cplusplus
-extern "C" {
+    extern "C" {
 #endif
     
+        
+        
+        
+        
 extern uint8_t  *globalpalwritten;
 extern int16_t  globalshiftval;
     
@@ -58,6 +64,8 @@
 void tsethlineshift(int32_t,int32_t);
 void setupslopevlin(int32_t,int32_t,int32_t);
 void slopevlin(int32_t,uint32_t,int32_t,int32_t,int32_t,int32_t);
+    
+    
 #define TRANS_NORMAL  0
 #define TRANS_REVERSE 1
 void settrans(int32_t type);
@@ -64,12 +72,7 @@
 
 
 
-int32_t is_vmware_running(void);
 
-    
-#ifdef __cplusplus
-}
-#endif
 
 //FCS: In order to see how the engine renders different part of the screen you can set the following macros
 //VISUALIZE RENDERER
@@ -89,5 +92,11 @@
    #define CLEAR_FRAMEBUFFER 1
 #endif
 //END VISUALIZE RENDERER
+
+    
+//C++ 
+#ifdef __cplusplus
+    }
+#endif
 
 #endif
\ No newline at end of file
--- a/Engine/src/engine.c
+++ b/Engine/src/engine.c
@@ -9,9 +9,6 @@
 
 #define ENGINE
 
-/* set this to something non-zero to get loadtile() debugging info on stderr. */
-#define BUILD_CACHEDEBUG 0
-
 #include <string.h>
 
 
@@ -32,7 +29,7 @@
 #endif
 
 #include "build.h"
-#include "cache1d.h"
+#include "cache.h"
 
 #include "engine.h"
 
--- a/Engine/src/engine_protos.h
+++ b/Engine/src/engine_protos.h
@@ -24,7 +24,7 @@
 
 /* Prototypes for the build engine */
 
-/* cache1d.c */
+
 extern void initcache(int32_t dacachestart, int32_t dacachesize);
 extern void allocache(int32_t *newhandle, int32_t newbytes, uint8_t  *newlockptr);
 extern void suckcache(int32_t *suckptr);
--- a/Engine/src/macos_compat.h
+++ b/Engine/src/macos_compat.h
@@ -20,6 +20,8 @@
 #undef FP_OFF
 #endif
 
+// Horrible horrible macro: Watcom allowed memory pointer to be cast
+// to a 32bits integer. The code is unfortunately stuffed with this :( !
 #define FP_OFF(x) ((int32_t) (x))
 
 #ifndef max
--- a/Engine/src/platform.h
+++ b/Engine/src/platform.h
@@ -2,23 +2,19 @@
 #define _INCLUDE_PLATFORM_H_
 
 #if (defined PLATFORM_WIN32)
-#include "win32_compat.h"
+    #include "win32_compat.h"
 #elif (defined PLATFORM_UNIX)
-#include "unix_compat.h"
+    #include "unix_compat.h"
 #elif (defined PLATFORM_DOS)
-#include "doscmpat.h"
+    #include "doscmpat.h"
 #elif (defined __APPLE__)
-#include "macos_compat.h"
+    #include "macos_compat.h"
 #else
 #error Define your platform!
 #endif
 
 #if (!defined __EXPORT__)
-#define __EXPORT__
-#endif
-
-#if (defined __WATCOMC__)
-#define snprintf _snprintf
+    #define __EXPORT__
 #endif
 
 uint16_t _swap16(uint16_t D);
--- a/Engine/src/pragmas.h
+++ b/Engine/src/pragmas.h
@@ -22,24 +22,29 @@
     swapchar(p1 + 1, p2 + xsiz);
 }
 
-static __inline int32_t msqrtasm(uint32_t c)
+static __inline int32_t msqrtasm(uint32_t input)
 {
 	uint32_t a,b;
 
 	a = 0x40000000l;		// mov eax, 0x40000000
 	b = 0x20000000l;		// mov ebx, 0x20000000
+    
 	do {				// begit:
-		if (c >= a) {		// cmp ecx, eax	 /  jl skip
-			c -= a;		// sub ecx, eax
+		if (input >= a) {		// cmp ecx, eax	 /  jl skip
+			input -= a;		// sub ecx, eax
 			a += b*4;	// lea eax, [eax+ebx*4]
 		}			// skip:
 		a -= b;			// sub eax, ebx
 		a >>= 1;		// shr eax, 1
 		b >>= 2;		// shr ebx, 2
-	} while (b);			// jnz begit
-	if (c >= a)			// cmp ecx, eax
+	}
+    while (b);			// jnz begit
+    
+	if (input >= a)			// cmp ecx, eax
 		a++;			// sbb eax, -1
+    
 	a >>= 1;			// shr eax, 1
+    
 	return a;
 }
 
--- a/Engine/src/sdl_driver.c
+++ b/Engine/src/sdl_driver.c
@@ -292,7 +292,7 @@
 static sdl_renderer_type renderer = RENDERER_SOFTWARE;
 
 #include "draw.h"
-#include "cache1d.h"
+#include "cache.h"
 
 
 /*
--- a/Game/src/config.c
+++ b/Game/src/config.c
@@ -36,7 +36,7 @@
 #include <time.h>
 #include "duke3d.h"
 #include "scriplib.h"
-#include "cache1d.h"
+#include "cache.h"
 
 // we load this in to get default button and key assignments
 // as well as setting up function mappings
--- a/Game/src/duke3d.h
+++ b/Game/src/duke3d.h
@@ -47,7 +47,7 @@
 #include <time.h>
 #include <ctype.h>
 
-#include "cache1d.h"
+#include "cache.h"
 
 #if (!defined MAX_PATH)
   #if (defined MAXPATHLEN)
@@ -636,7 +636,7 @@
 extern uint8_t  waterpal[768],slimepal[768],titlepal[768],drealms[768],endingpal[768];
 extern char boardfilename[128];
 extern uint8_t  betaname[80];
-extern uint8_t  cachedebug,earthquaketime;
+extern uint8_t  earthquaketime;
 extern uint8_t  networkmode;
 extern uint8_t  lumplockbyte[11];
 
--- a/Game/src/game.c
+++ b/Game/src/game.c
@@ -55,9 +55,7 @@
 
 #include "global.h"
 
-
-// this is So lame
-#include "cache1d.h"
+#include "cache.h"
 
 #define MINITEXT_BLUE	0
 #define MINITEXT_RED	2
--- a/Game/src/gamedef.c
+++ b/Game/src/gamedef.c
@@ -25,7 +25,7 @@
 //-------------------------------------------------------------------------
 
 #include "duke3d.h"
-#include "cache1d.h"
+#include "cache.h"
 
 extern short otherp;
 
--- a/Game/src/global.c
+++ b/Game/src/global.c
@@ -908,11 +908,3 @@
 }
 
 
-/*
- * From Ryan's buildengine CHANGELOG:
- *  Removed global var: cachedebug in engine.c, and put #define
- *  BUILD_CACHEDEBUG 0 at the top of the source. Flip it to 1 if you ever
- *  need to tinker in the cache code.
- */
-uint8_t  cachedebug = 0;
-
--- a/Game/src/menues.c
+++ b/Game/src/menues.c
@@ -28,7 +28,7 @@
 #include "mouse.h"
 #include "animlib.h"
 #include "control.h"
-#include "cache1d.h"
+#include "cache.h"
 #include "SDL.h"
 #include "premap.h"
 
--- a/Game/src/midi/sdl_midi.c
+++ b/Game/src/midi/sdl_midi.c
@@ -10,7 +10,7 @@
 #include "../audiolib/music.h"
 #include "SDL.h"
 #include "SDL_Mixer.h"
-#include "cache1d.h"
+#include "cache.h"
 
 /*
  Because the music is stored in a GRP file that is never fully loaded in RAM
--- a/Game/src/premap.c
+++ b/Game/src/premap.c
@@ -25,7 +25,7 @@
 //-------------------------------------------------------------------------
 
 #include "duke3d.h"
-#include "cache1d.h"
+#include "cache.h"
 #include "game.h"
 
 extern uint8_t  everyothertime;
@@ -1542,7 +1542,7 @@
 		}
 #endif
 
-    cachedebug = 0;
+
     automapping = 0;
 
     if(ud.recstat != 2) MUSIC_StopSong();
--- a/xcode/Duke3D.xcodeproj/project.pbxproj
+++ b/xcode/Duke3D.xcodeproj/project.pbxproj
@@ -9,7 +9,7 @@
 /* Begin PBXBuildFile section */
 		2D4FB6FF167D430F00915887 /* sdl_midi.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D4FB6FE167D430F00915887 /* sdl_midi.c */; };
 		2D7B621D1678885A00E35E54 /* draw.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D7B61F11678885A00E35E54 /* draw.c */; };
-		2D7B621E1678885A00E35E54 /* cache1d.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D7B61F41678885A00E35E54 /* cache1d.c */; };
+		2D7B621E1678885A00E35E54 /* cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D7B61F41678885A00E35E54 /* cache.c */; };
 		2D7B621F1678885A00E35E54 /* host.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D7B61FA1678885A00E35E54 /* host.c */; };
 		2D7B62201678885A00E35E54 /* list.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D7B62061678885A00E35E54 /* list.c */; };
 		2D7B62211678885A00E35E54 /* memory.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D7B62071678885A00E35E54 /* memory.c */; };
@@ -78,11 +78,9 @@
 		2D7B61F11678885A00E35E54 /* draw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = draw.c; path = ../../Engine/src/draw.c; sourceTree = "<group>"; };
 		2D7B61F21678885A00E35E54 /* draw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = draw.h; path = ../../Engine/src/draw.h; sourceTree = "<group>"; };
 		2D7B61F31678885A00E35E54 /* build.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = build.h; path = ../../Engine/src/build.h; sourceTree = "<group>"; };
-		2D7B61F41678885A00E35E54 /* cache1d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cache1d.c; path = ../../Engine/src/cache1d.c; sourceTree = "<group>"; };
-		2D7B61F51678885A00E35E54 /* cache1d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cache1d.h; path = ../../Engine/src/cache1d.h; sourceTree = "<group>"; };
+		2D7B61F41678885A00E35E54 /* cache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cache.c; path = ../../Engine/src/cache.c; sourceTree = "<group>"; };
+		2D7B61F51678885A00E35E54 /* cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cache.h; path = ../../Engine/src/cache.h; sourceTree = "<group>"; };
 		2D7B61F61678885A00E35E54 /* display.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = display.h; path = ../../Engine/src/display.h; sourceTree = "<group>"; };
-		2D7B61F81678885A00E35E54 /* api.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = api.txt; sourceTree = "<group>"; };
-		2D7B61F91678885A00E35E54 /* design.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = design.txt; sourceTree = "<group>"; };
 		2D7B61FA1678885A00E35E54 /* host.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = host.c; sourceTree = "<group>"; };
 		2D7B61FC1678885A00E35E54 /* enet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = enet.h; sourceTree = "<group>"; };
 		2D7B61FD1678885A00E35E54 /* list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = list.h; sourceTree = "<group>"; };
@@ -93,14 +91,11 @@
 		2D7B62021678885A00E35E54 /* unix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unix.h; sourceTree = "<group>"; };
 		2D7B62031678885A00E35E54 /* utility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utility.h; sourceTree = "<group>"; };
 		2D7B62041678885A00E35E54 /* win32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = win32.h; sourceTree = "<group>"; };
-		2D7B62051678885A00E35E54 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
 		2D7B62061678885A00E35E54 /* list.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = list.c; sourceTree = "<group>"; };
 		2D7B62071678885A00E35E54 /* memory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = memory.c; sourceTree = "<group>"; };
 		2D7B62081678885A00E35E54 /* packet.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = packet.c; sourceTree = "<group>"; };
 		2D7B62091678885A00E35E54 /* peer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = peer.c; sourceTree = "<group>"; };
 		2D7B620A1678885A00E35E54 /* protocol.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = protocol.c; sourceTree = "<group>"; };
-		2D7B620B1678885A00E35E54 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
-		2D7B620C1678885A00E35E54 /* tutorial.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tutorial.txt; sourceTree = "<group>"; };
 		2D7B620D1678885A00E35E54 /* unix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = unix.c; sourceTree = "<group>"; };
 		2D7B620E1678885A00E35E54 /* win32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = win32.c; sourceTree = "<group>"; };
 		2D7B620F1678885A00E35E54 /* engine_protos.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = engine_protos.h; path = ../../Engine/src/engine_protos.h; sourceTree = "<group>"; };
@@ -232,8 +227,8 @@
 				2D7B61F21678885A00E35E54 /* draw.h */,
 				2D7B61F11678885A00E35E54 /* draw.c */,
 				2D7B61F31678885A00E35E54 /* build.h */,
-				2D7B61F41678885A00E35E54 /* cache1d.c */,
-				2D7B61F51678885A00E35E54 /* cache1d.h */,
+				2D7B61F41678885A00E35E54 /* cache.c */,
+				2D7B61F51678885A00E35E54 /* cache.h */,
 				2D7B61F61678885A00E35E54 /* display.h */,
 				2D7B61F71678885A00E35E54 /* enet */,
 				2D7B620F1678885A00E35E54 /* engine_protos.h */,
@@ -253,18 +248,13 @@
 		2D7B61F71678885A00E35E54 /* enet */ = {
 			isa = PBXGroup;
 			children = (
-				2D7B61F81678885A00E35E54 /* api.txt */,
-				2D7B61F91678885A00E35E54 /* design.txt */,
 				2D7B61FA1678885A00E35E54 /* host.c */,
 				2D7B61FB1678885A00E35E54 /* include */,
-				2D7B62051678885A00E35E54 /* LICENSE */,
 				2D7B62061678885A00E35E54 /* list.c */,
 				2D7B62071678885A00E35E54 /* memory.c */,
 				2D7B62081678885A00E35E54 /* packet.c */,
 				2D7B62091678885A00E35E54 /* peer.c */,
 				2D7B620A1678885A00E35E54 /* protocol.c */,
-				2D7B620B1678885A00E35E54 /* README */,
-				2D7B620C1678885A00E35E54 /* tutorial.txt */,
 				2D7B620D1678885A00E35E54 /* unix.c */,
 				2D7B620E1678885A00E35E54 /* win32.c */,
 			);
@@ -427,7 +417,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				2D7B621D1678885A00E35E54 /* draw.c in Sources */,
-				2D7B621E1678885A00E35E54 /* cache1d.c in Sources */,
+				2D7B621E1678885A00E35E54 /* cache.c in Sources */,
 				2D7B621F1678885A00E35E54 /* host.c in Sources */,
 				2D7B62201678885A00E35E54 /* list.c in Sources */,
 				2D7B62211678885A00E35E54 /* memory.c in Sources */,