* Removed some \n from server connection messages

* Removed nextmap cvar and associated code, replaced with "advanceMapRotation"
  command
* Rework the text displayed during votes to be more verbose
* "destroy" command now only works when cheats are enabled
* Voting UI is now a frontend for "clientkick" instead of plain "kick"

1 files changed, 0 insertions, 11 deletions

diff --git a/src/client/cl_cin.c b/src/client/cl_cin.c
index f97d7712..1d8a5f89 100644
--- a/src/client/cl_cin.c
+++ b/src/client/cl_cin.c
@@ -1260,8 +1260,6 @@ static void RoQ_init( void )
 ******************************************************************************/
 
 static void RoQShutdown( void ) {
-	const char *s;
-
 	if (!cinTable[currentHandle].buf) {
 		return;
 	}
@@ -1280,15 +1278,6 @@ static void RoQShutdown( void ) {
 
 	if (cinTable[currentHandle].alterGameState) {
 		cls.state = CA_DISCONNECTED;
-		// we can't just do a vstr nextmap, because
-		// if we are aborting the intro cinematic with
-		// a devmap command, nextmap would be valid by
-		// the time it was referenced
-		s = Cvar_VariableString( "nextmap" );
-		if ( s[0] ) {
-			Cbuf_ExecuteText( EXEC_APPEND, va("%s\n", s) );
-			Cvar_Set( "nextmap", "" );
-		}
 		CL_handle = -1;
 	}
 	cinTable[currentHandle].fileName[0] = 0;