Team Arena support

code/qcommon/common.c

@@ -39,7 +39,7 @@ int demo_protocols[] =
 #define MIN_DEDICATED_COMHUNKMEGS 1
 #define MIN_COMHUNKMEGS		56
 #define DEF_COMHUNKMEGS 	128
-#define DEF_COMZONEMEGS		24
+#define DEF_COMZONEMEGS		48
 #define DEF_COMHUNKMEGS_S	XSTRING(DEF_COMHUNKMEGS)
 #define DEF_COMZONEMEGS_S	XSTRING(DEF_COMZONEMEGS)
 

code/server/server.h

@@ -291,6 +291,7 @@ extern	cvar_t	*sv_gametype;
 extern	cvar_t	*sv_pure;
 extern	cvar_t	*sv_floodProtect;
 extern	cvar_t	*sv_lanForceRate;
+extern cvar_t *sv_entityPath;
 #ifndef STANDALONE
 extern	cvar_t	*sv_strictAuth;
 #endif

code/server/sv_game.c

@@ -865,6 +865,37 @@ void SV_ShutdownGameProgs( void ) {
 	gvm = NULL;
 }
 
+/*
+==================
+SV_GetCustomEntityString
+Read custom entity string from entity file for current map if it exists
+Author: Wiz
+==================
+*/
+static char *SV_GetCustomEntityString(void)
+{
+    char filename[MAX_QPATH];
+    union {
+        char *c;
+        void *v;
+    } f;
+
+	if ( sv_entityPath->string[0] != '\0' )
+        Com_sprintf(filename, sizeof(filename), "%s%c%s.ent", sv_entityPath->string, PATH_SEP, sv_mapname->string);
+    else
+        Com_sprintf(filename, sizeof(filename), "%s.ent", sv_mapname->string);
+
+    FS_ReadFile(filename, &f.v);
+
+    if (!f.v)
+        return NULL;
+
+    FS_FreeFile(f.v);
+
+    return f.c;
+}
+
+
 /*
 ==================
 SV_InitGameVM
@@ -876,7 +907,11 @@ static void SV_InitGameVM( qboolean restart ) {
 	int		i;
 
 	// start the entity parsing at the beginning
-	sv.entityParsePoint = CM_EntityString();
+	//sv.entityParsePoint = CM_EntityString();
+
+	// now we can replace all entities on the map with our own
+	if ( !( sv.entityParsePoint = SV_GetCustomEntityString() ) )
+		sv.entityParsePoint = CM_EntityString();
 
 	// clear all gentity pointers that might still be set from
 	// a previous level

code/server/sv_init.c

@@ -669,6 +669,8 @@ void SV_Init (void)
 	sv_zombietime = Cvar_Get ("sv_zombietime", "2", CVAR_TEMP );
 	Cvar_Get ("nextmap", "", CVAR_TEMP );
 
+	sv_entityPath = Cvar_Get("sv_entityPath", "maps", CVAR_ARCHIVE );
+
 	sv_allowDownload = Cvar_Get ("sv_allowDownload", "0", CVAR_SERVERINFO);
 	Cvar_Get ("sv_dlURL", "", CVAR_SERVERINFO | CVAR_ARCHIVE);
 

code/server/sv_main.c

@@ -58,6 +58,8 @@ cvar_t	*sv_gametype;
 cvar_t	*sv_pure;
 cvar_t	*sv_floodProtect;
 cvar_t	*sv_lanForceRate; // dedicated 1 (LAN) server forces local client rates to 99999 (bug #491)
+
+cvar_t *sv_entityPath;
 #ifndef STANDALONE
 cvar_t	*sv_strictAuth;
 #endif