diff options
| author | Tim Angus <tim@ngus.net> | 2006-04-24 21:05:06 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2006-04-24 21:05:06 +0000 |
| commit | f7b88a4ed5a8c9347d9e40e0aee22c5a7011f60e (patch) | |
| tree | 336304b3b0476b92fb11bc6f68d5c93aa261dd46 /src/client | |
| parent | 523411fb188b851ed46e72acfd9bd981abf432fc (diff) | |
* 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"
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/cl_cin.c | 11 | ||||
| -rw-r--r-- | src/client/cl_main.c | 2 |
2 files changed, 0 insertions, 13 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; diff --git a/src/client/cl_main.c b/src/client/cl_main.c index f326632d..28e5021f 100644 --- a/src/client/cl_main.c +++ b/src/client/cl_main.c @@ -730,8 +730,6 @@ void CL_MapLoading( void ) { clc.lastPacketSentTime = -9999; SCR_UpdateScreen(); } else { - // clear nextmap so the cinematic shutdown doesn't execute it - Cvar_Set( "nextmap", "" ); CL_Disconnect( qtrue ); Q_strncpyz( cls.servername, "localhost", sizeof(cls.servername) ); cls.state = CA_CHALLENGING; // so the connect screen is drawn |