cpmadevs/cnq3
0
0
Fork 0
mirror of https://bitbucket.org/CPMADevs/cnq3 synced 2024-11-23 04:12:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

removed the nextmap CVar

Browse source
This commit is contained in:
myT 2022-04-21 04:29:32 +02:00
parent f99c223495
commit 178d91b000
3 changed files with 0 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
code/client/cl_cin.cpp
View file

@ -1237,8 +1237,6 @@ static void RoQ_init( void )
******************************************************************************/
static void RoQShutdown( void ) {
const char *s;
if (!cinTable[currentHandle].buf) {
return;
}
@ -1256,15 +1254,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_AddText( va("%s\n", s) );
Cvar_Set( "nextmap", "" );
}
CL_handle = -1;
}
cinTable[currentHandle].fileName[0] = 0;

2
code/client/cl_main.cpp
View file

@ -674,8 +674,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

6
code/server/sv_init.cpp
View file

@ -366,11 +366,6 @@ void SV_SpawnServer( const char* mapname )
// server has changed
svs.snapFlagServerBit ^= SNAPFLAG_SERVERCOUNT;
// set nextmap to the same map, but it may be overriden
// by the game startup or another console command
//Cvar_Set( "nextmap", "map_restart 0");
Cvar_Set( "nextmap", va("map %s", mapname) );
for (int i=0 ; i<sv_maxclients->integer ; i++) {
// save when the server started for each client already connected
if (svs.clients[i].state >= CS_CONNECTED) {
@ -563,7 +558,6 @@ static const cvarTableItem_t sv_cvars[] =
{ &sv_fps, "sv_fps", "30", CVAR_TEMP, CVART_INTEGER, "10", "40", "snapshot generation frequency" },
{ &sv_timeout, "sv_timeout", "200", CVAR_TEMP, CVART_INTEGER, "0", NULL, "max. seconds allowed without any messages" },
{ &sv_zombietime, "sv_zombietime", "2", CVAR_TEMP, CVART_INTEGER, "0", NULL, "seconds to sink messages after disconnect" },
{ NULL, "nextmap", "", CVAR_TEMP, CVART_STRING, NULL, NULL, "name of the next map in the rotation" },
{ &sv_allowDownload, "sv_allowDownload", "0", CVAR_SERVERINFO, CVART_BOOL, NULL, NULL, "enables slow pk3 downloads directly from the server" },
{ &sv_reconnectlimit, "sv_reconnectlimit", "3", 0, CVART_INTEGER, "0", NULL, "min. seconds between connection attempts" },
{ &sv_padPackets, "sv_padPackets", "0", 0, CVART_BOOL, NULL, NULL, "add nop bytes to messages" },