From 77a4d1b38832652ec447257fba49413165acb9ae Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Sun, 12 Dec 2021 21:04:15 -0800
Subject: [PATCH] mp_fraglimit and mp_timelimit are now aliases to the original
 Quake cvars to avoid confusion from anyone wondering why there's two of them

---
 src/server/client.qc                |  2 +-
 src/server/gamerules_multiplayer.qc | 10 +++++-----
 zpak001.pk3dir/default.cfg          |  4 ++++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/server/client.qc b/src/server/client.qc
index 2d2363f..e6085bd 100644
--- a/src/server/client.qc
+++ b/src/server/client.qc
@@ -53,7 +53,7 @@ Game_ParseClientCommand(string cmd)
 		string msg;
 		string timestring;
 		float timeleft;
-		timeleft = cvar("mp_timelimit") - (time / 60);
+		timeleft = cvar("timelimit") - (time / 60);
 		timestring = Util_TimeToString(timeleft);
 		msg = sprintf("we have %s minutes remaining", timestring);
 		bprint(PRINT_CHAT, msg);
diff --git a/src/server/gamerules_multiplayer.qc b/src/server/gamerules_multiplayer.qc
index ab0bdb4..8b465ae 100644
--- a/src/server/gamerules_multiplayer.qc
+++ b/src/server/gamerules_multiplayer.qc
@@ -17,8 +17,8 @@
 void
 HLMultiplayerRules::FrameStart(void)
 {
-	if (cvar("mp_timelimit"))
-	if (time >= (cvar("mp_timelimit") * 60)) {
+	if (cvar("timelimit"))
+	if (time >= (cvar("timelimit") * 60)) {
 		IntermissionStart();
 	}
 
@@ -29,7 +29,7 @@ void
 HLMultiplayerRules::CheckRules(void)
 {
 	/* last person who killed somebody has hit the limit */
-	if (g_dmg_eAttacker.frags >= cvar("mp_fraglimit"))
+	if (g_dmg_eAttacker.frags >= cvar("fraglimit"))
 		IntermissionStart();
 }
 
@@ -186,6 +186,6 @@ void
 HLMultiplayerRules::HLMultiplayerRules(void)
 {
 	/* these lines do nothing but tell the server to register those cvars */
-	autocvar(mp_timelimit, 15, "Timelimit for multiplayer rounds");
-	autocvar(mp_fraglimit, 15, "Points limit for multiplayer rounds");
+	autocvar(timelimit, 15, "Timelimit for multiplayer rounds");
+	autocvar(fraglimit, 15, "Points limit for multiplayer rounds");
 }
diff --git a/zpak001.pk3dir/default.cfg b/zpak001.pk3dir/default.cfg
index 1aaebc3..890ba4a 100755
--- a/zpak001.pk3dir/default.cfg
+++ b/zpak001.pk3dir/default.cfg
@@ -43,3 +43,7 @@ seta "maxplayers" "8"
 seta "con_color" "255 150 0"
 seta "vgui_color" "255 170 0"
 seta "cross_color" "0 255 0"
+
+// config compat
+alias mp_timelimit timelimit
+alias mp_fraglimit fraglimit