From d62ac62ff5c4ba540e02f717ac4509ebe8ca8db9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 17 May 2001 21:32:59 +0000
Subject: [PATCH] allow commands other than set to be executed from
 ~/.quakeforgerc

---
 nq/source/host.c    | 5 ++---
 qw/source/cl_main.c | 4 ++--
 qw/source/sv_main.c | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nq/source/host.c b/nq/source/host.c
index 4eb0103a3..d38ef413d 100644
--- a/nq/source/host.c
+++ b/nq/source/host.c
@@ -985,15 +985,14 @@ Host_Init (quakeparms_t *parms)
 		CL_Init ();
 	}
 
+	Cbuf_InsertText ("exec quake.rc\n");
+	Cmd_Exec_File (fs_usercfg->string);
 	// reparse the command line for + commands other than set
 	// (sets still done, but it doesn't matter)
 	if (check_quakerc ()) {
 		Cmd_StuffCmds_f ();
-		Cbuf_Execute ();
 	}
 
-	Cbuf_InsertText ("exec quake.rc\n");
-
 	Hunk_AllocName (0, "-HOST_HUNKLEVEL-");
 	host_hunklevel = Hunk_LowMark ();
 
diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c
index 68ddfb088..6bdc08909 100644
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@@ -1674,14 +1674,14 @@ Host_Init (void)
 	IN_Init ();
 #endif
 
+	Cbuf_InsertText ("exec quake.rc\n");
+	Cmd_Exec_File (fs_usercfg->string);
 	// Reparse the command line for + commands.
 	// (Note, no non-base commands exist yet)
 	if (check_quakerc ()) {
 		Cmd_StuffCmds_f ();
-		Cbuf_Execute ();
 	}
 
-	Cbuf_InsertText ("exec quake.rc\n");
 	Cbuf_AddText
 		("echo Type connect <internet address> or use a server browser to connect to a game.\n");
 	Cbuf_AddText ("cl_warncmd 1\n");
diff --git a/qw/source/sv_main.c b/qw/source/sv_main.c
index 0c656a3b1..bace56276 100644
--- a/qw/source/sv_main.c
+++ b/qw/source/sv_main.c
@@ -1976,6 +1976,7 @@ SV_Init (void)
 	Con_Printf ("<==> %s initialized <==>\n", PROGRAM);
 
 	// process command line arguments
+	Cmd_Exec_File (fs_usercfg->string);
 	Cmd_StuffCmds_f ();
 	Cbuf_Execute ();