From 0255833335c61c811e7686fceb25d981d6a429a6 Mon Sep 17 00:00:00 2001
From: Sabian Roberts <31491602+sabianroberts@users.noreply.github.com>
Date: Mon, 21 Jun 2021 21:21:31 +0100
Subject: [PATCH] Stop forcing engine to use server.cfg, even when server is a
 listen server

---
 dlls/gamerules.cpp           | 10 +---------
 dlls/multiplay_gamerules.cpp | 13 ++++++++++---
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/dlls/gamerules.cpp b/dlls/gamerules.cpp
index b6692cca..55d63d10 100644
--- a/dlls/gamerules.cpp
+++ b/dlls/gamerules.cpp
@@ -323,16 +323,8 @@ AgGameRules* InstallGameRules(void)
 	SERVER_COMMAND( "exec game.cfg\n" );
 	SERVER_EXECUTE( );
 
-	//++ BulliT
-	char* servercfgfile = (char*)CVAR_GET_STRING("servercfgfile");
-	if (servercfgfile && servercfgfile[0])
-	{
-		char szCommand[256];
 
-		ALERT(at_console, "Executing dedicated server config file\n");
-		sprintf(szCommand, "exec %s\n", servercfgfile);
-		SERVER_COMMAND(szCommand);
-	}
+
 
 #ifndef AG_NO_CLIENT_DLL
 	//Detect CTF maps.
diff --git a/dlls/multiplay_gamerules.cpp b/dlls/multiplay_gamerules.cpp
index 4862aba1..8a7b0808 100644
--- a/dlls/multiplay_gamerules.cpp
+++ b/dlls/multiplay_gamerules.cpp
@@ -105,10 +105,18 @@ CHalfLifeMultiplay :: CHalfLifeMultiplay()
 	// Added lservercfg file cvar, since listen and dedicated servers should not
 	// share a single config file. (sjb)
 //++ BulliT
-/*
+
 	if ( IS_DEDICATED_SERVER() )
 	{
-		// this code has been moved into engine, to only run server.cfg once
+		//++ BulliT
+		char* servercfgfile = (char*)CVAR_GET_STRING("servercfgfile");
+		if (servercfgfile && servercfgfile[0])
+		{
+			char szCommand[256];
+
+			ALERT(at_console, "Executing dedicated server config file\n");
+			sprintf(szCommand, "exec %s\n", servercfgfile);
+			SERVER_COMMAND(szCommand);
 	}
 	else
 	{
@@ -124,7 +132,6 @@ CHalfLifeMultiplay :: CHalfLifeMultiplay()
 			SERVER_COMMAND( szCommand );
 		}
 	}
-  */
   //-- Martin Webrant
 }