Big fat-off commit.

A few changes. Half-Life support is finally getting committed.
Some unnecessary filesystem code changes.
And there's code for nsapi - meaning we can embed FTE in a browser (firefox and opera on windows work).
A couple of CSQC changes, trying to move towards a final EXT_CSQC_1.
Revised ruleset format finally implemented.
Doesn't compile with msvc6 due to issues with libjpeg not being a clean library.
Presumably its fine in vs2005.
Your mileage may vary.

git-svn-id: https://fteqw.svn.sourceforge.net/svnroot/fteqw/trunk/engine/qclib@3148 fa7d4b81-6910-0410-8d11-a3360c2baa62

Author: acceptthis

hash.c

@@ -15,15 +15,15 @@ void Hash_InitTable(hashtable_t *table, int numbucks, void *mem)
 	table->bucket = (bucket_t **)mem;
 }
 
-int Hash_Key(char *name, int modulus)
+int Hash_Key(const char *name, int modulus)
 {	//fixme: optimize.
 	unsigned int key;
 	for (key=0;*name; name++)
 		key += ((key<<3) + (key>>28) + *name);
 
 	return (int)(key%modulus);
 }
-int Hash_KeyInsensative(char *name, int modulus)
+int Hash_KeyInsensative(const char *name, int modulus)
 {	//fixme: optimize.
 	unsigned int key;
 	for (key=0;*name; name++)
@@ -37,7 +37,7 @@ int Hash_KeyInsensative(char *name, int modulus)
 	return (int)(key%modulus);
 }
 
-void *Hash_Get(hashtable_t *table, char *name)
+void *Hash_Get(hashtable_t *table, const char *name)
 {
 	int bucknum = Hash_Key(name, table->numbuckets);
 	bucket_t *buck;
@@ -53,7 +53,7 @@ void *Hash_Get(hashtable_t *table, char *name)
 	}
 	return NULL;
 }
-void *Hash_GetInsensative(hashtable_t *table, char *name)
+void *Hash_GetInsensative(hashtable_t *table, const char *name)
 {
 	int bucknum = Hash_KeyInsensative(name, table->numbuckets);
 	bucket_t *buck;

hash.h

@@ -2,13 +2,16 @@
 //David's hash tables
 //string based.
 
+#ifndef HASH_H__
+#define HASH_H__
+
 #define Hash_BytesForBuckets(b) (sizeof(bucket_t)*b)
 
 #define STRCMP(s1,s2) (((*s1)!=(*s2)) || strcmp(s1+1,s2+1))	//saves about 2-6 out of 120 - expansion of idea from fastqcc
 typedef struct bucket_s {
 	void *data;
 	union {
-		char *string;
+		const char *string;
 		int value;
 	} key;
 	struct bucket_s *next;
@@ -19,9 +22,9 @@ typedef struct hashtable_s {
 } hashtable_t;
 
 void Hash_InitTable(hashtable_t *table, int numbucks, void *mem);	//mem must be 0 filled. (memset(mem, 0, size))
-int Hash_Key(char *name, int modulus);
-void *Hash_Get(hashtable_t *table, char *name);
-void *Hash_GetInsensative(hashtable_t *table, char *name);
+int Hash_Key(const char *name, int modulus);
+void *Hash_Get(hashtable_t *table, const char *name);
+void *Hash_GetInsensative(hashtable_t *table, const char *name);
 void *Hash_GetKey(hashtable_t *table, int key);
 void *Hash_GetNext(hashtable_t *table, char *name, void *old);
 void *Hash_GetNextInsensative(hashtable_t *table, char *name, void *old);
@@ -31,3 +34,5 @@ void Hash_Remove(hashtable_t *table, char *name);
 void Hash_RemoveData(hashtable_t *table, char *name, void *data);
 void Hash_RemoveKey(hashtable_t *table, int key);
 void *Hash_AddKey(hashtable_t *table, int key, void *data, bucket_t *buck);
+
+#endif

initlib.c

@@ -172,6 +172,26 @@ struct entvars_s *PR_entvars (progfuncs_t *progfuncs, struct edict_s *ed)
 	return (struct entvars_s *)edvars(ed);
 }
 
+int PR_GetFuncArgCount(progfuncs_t *progfuncs, func_t func)
+{
+	unsigned int pnum;
+	unsigned int fnum;
+	dfunction_t *f;
+
+	pnum = (func & 0xff000000)>>24;
+	fnum = (func & 0x00ffffff);
+
+	if (pnum >= (unsigned)maxprogs || !pr_progstate[pnum].functions)
+		return -1;
+	else if (fnum >= pr_progstate[pnum].progs->numfunctions)
+		return -1;
+	else
+	{
+		f = pr_progstate[pnum].functions + fnum;
+		return f->numparms;
+	}
+}
+
 func_t PR_FindFunc(progfuncs_t *progfuncs, char *funcname, progsnum_t pnum)
 {
 	dfunction_t *f=NULL;

qccmain.c

@@ -615,6 +615,10 @@ pbool QCC_WriteData (int crc)
 			outputsize = 32;
 		}
 
+		if (qcc_targetformat == QCF_DARKPLACES)
+			compressoutput = 0;
+
+
 		//compression of blocks?
 		if (compressoutput)		progs.blockscompressed |=1;		//statements
 		if (compressoutput)		progs.blockscompressed |=2;		//defs
@@ -1881,14 +1885,39 @@ unsigned short QCC_PR_WriteProgdefs (char *filename)
 		printf("Recognised progs as QuakeWorld\n");
 		break;
 	case 5927:
-		printf("Recognised progs as regular Quake\n");
+		printf("Recognised progs as NetQuake server gamecode\n");
+		break;
+
+	case 26940:
+		printf("Recognised progs as Quake pre-release...\n");
 		break;
+
 	case 38488:
 		printf("Recognised progs as original Hexen2\n");
 		break;
 	case 26905:
 		printf("Recognised progs as Hexen2 Mission Pack\n");
 		break;
+	case 14046:
+		printf("Recognised progs as Hexen2 (demo)\n");
+		break;
+
+	case 32199:
+		printf("Recognised progs as a CSQC module\n");
+		break;
+	case 52195:
+		printf("Recognised progs as outdated CSQC module\n");
+		break;
+	case 10020:
+		printf("Recognised progs as a DP/FTE Menu module\n");
+		break;
+
+	case 32401:
+		printf("Warning: please update your tenebrae system defs.\n");
+		break;
+	default:
+		printf("Warning: progs CRC not recognised from quake nor clones\n");
+		break;
 	}