From bec61db61b86fc7dd183a06fe71160d0f75e5354 Mon Sep 17 00:00:00 2001
From: Richard Allen <ra@ra.is>
Date: Fri, 26 Jul 2002 06:46:31 +0000
Subject: [PATCH] Added a map_restart after successful callvote g_gametype
 votes.

---
 reaction/ChangeLog     |  8 ++++++++
 reaction/game/g_main.c | 16 ++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/reaction/ChangeLog b/reaction/ChangeLog
index 0b6673b4..939f2484 100644
--- a/reaction/ChangeLog
+++ b/reaction/ChangeLog
@@ -4,6 +4,14 @@
 * added g_RQ3_ctb_respawndelay for delayed CTB respawns.
 * Fixed initial spawning in teammates for CTB
 * Changed rq3ctf to rq3ctb in .arena parsing code.
+* Fixed the MM settings menu to also work wnem connected to a remote server.
+* Removed colors from the nicks in MM commands
+* Added a map_restart after successful g_gametype votes.
+* UI now supports CTB as a valid gametype
+* Fixed the missing weapon/item menu in the player menu
+* Added g_RQ3_version and g_RQ3_showOwnKills to the about server menu
+* Fixed missing shader errors in the UI on numerous places.
+
 
 
 # List fixes here for the 2.1 release
diff --git a/reaction/game/g_main.c b/reaction/game/g_main.c
index 97336a98..48c078c4 100644
--- a/reaction/game/g_main.c
+++ b/reaction/game/g_main.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.104  2002/07/26 06:46:31  jbravo
+// Added a map_restart after successful callvote g_gametype votes.
+//
 // Revision 1.103  2002/07/24 02:17:38  jbravo
 // Added a respawn delay for CTB
 //
@@ -2177,16 +2180,17 @@ void CheckVote(void)
 {
 	if (level.voteExecuteTime && level.voteExecuteTime < level.time) {
 		level.voteExecuteTime = 0;
-		if( Q_stricmp(level.voteString, "cyclemap") == 0)
+		if (Q_stricmp(level.voteString, "cyclemap") == 0)
  			BeginIntermission();
-		else
-			if( Q_stricmp(level.voteString, "map") == 0){
+		else if (Q_stricmp(level.voteString, "map") == 0) {
 				trap_Cvar_Set("g_RQ3_ValidIniFile", "2");  // check this latter. This trap may not be necessary 
 				g_RQ3_ValidIniFile.integer = 2;
 				BeginIntermission();
-			}
-			else
-				trap_SendConsoleCommand(EXEC_APPEND, va("%s\n", level.voteString));
+		} else if (Q_stricmp(level.voteString, "g_gametype") == 0) {
+			trap_SendConsoleCommand(EXEC_APPEND, va("%s\n", level.voteString));
+			trap_SendConsoleCommand(EXEC_APPEND, "map_restart 0\n");
+		} else
+			trap_SendConsoleCommand(EXEC_APPEND, va("%s\n", level.voteString));
 	}
 	if (!level.voteTime) {
 		return;