From d37536edf4660f3c46e4876b6d72e9a200549ffe Mon Sep 17 00:00:00 2001 From: tma Date: Wed, 5 Sep 2007 18:17:46 +0000 Subject: * Merge unified-sdl to trunk * Bump Q3_VERSION to 1.35 git-svn-id: svn://svn.icculus.org/quake3/trunk@1161 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/server/sv_bot.c | 6 +----- code/server/sv_ccmds.c | 2 +- code/server/sv_client.c | 6 ------ code/server/sv_game.c | 2 +- code/server/sv_init.c | 5 +++++ code/server/sv_main.c | 24 +++++++----------------- 6 files changed, 15 insertions(+), 30 deletions(-) (limited to 'code/server') diff --git a/code/server/sv_bot.c b/code/server/sv_bot.c index 49ed0c5..2996561 100644 --- a/code/server/sv_bot.c +++ b/code/server/sv_bot.c @@ -518,10 +518,6 @@ SV_BotInitBotLib void SV_BotInitBotLib(void) { botlib_import_t botlib_import; - if ( !Cvar_VariableValue("fs_restrict") && !Sys_CheckCD() ) { - Com_Error( ERR_NEED_CD, "Game CD not in drive" ); - } - if (debugpolygons) Z_Free(debugpolygons); bot_maxdebugpolys = Cvar_VariableIntegerValue("bot_maxdebugpolys"); debugpolygons = Z_Malloc(sizeof(bot_debugpoly_t) * bot_maxdebugpolys); @@ -558,7 +554,7 @@ void SV_BotInitBotLib(void) { botlib_import.DebugPolygonDelete = BotImport_DebugPolygonDelete; botlib_export = (botlib_export_t *)GetBotLibAPI( BOTLIB_API_VERSION, &botlib_import ); - assert(botlib_export); // bk001129 - somehow we end up with a zero import. + assert(botlib_export); // somehow we end up with a zero import. } diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c index 6d83b1d..a580416 100644 --- a/code/server/sv_ccmds.c +++ b/code/server/sv_ccmds.c @@ -321,7 +321,7 @@ static void SV_MapRestart_f( void ) { // this generally shouldn't happen, because the client // was connected before the level change SV_DropClient( client, denied ); - Com_Printf( "SV_MapRestart_f(%d): dropped client %i - denied!\n", delay, i ); // bk010125 + Com_Printf( "SV_MapRestart_f(%d): dropped client %i - denied!\n", delay, i ); continue; } diff --git a/code/server/sv_client.c b/code/server/sv_client.c index 71b0386..cbea6b4 100644 --- a/code/server/sv_client.c +++ b/code/server/sv_client.c @@ -173,12 +173,6 @@ void SV_AuthorizeIpPacket( netadr_t from ) { r = Cmd_Argv( 3 ); // reason if ( !Q_stricmp( s, "demo" ) ) { - if ( Cvar_VariableValue( "fs_restrict" ) ) { - // a demo client connecting to a demo server - NET_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, - "challengeResponse %i", svs.challenges[i].challenge ); - return; - } // they are a demo client trying to connect to a real server NET_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, "print\nServer is not a demo server\n" ); // clear the challenge record so it won't timeout and let them through diff --git a/code/server/sv_game.c b/code/server/sv_game.c index adb345e..adf1f5a 100644 --- a/code/server/sv_game.c +++ b/code/server/sv_game.c @@ -918,7 +918,7 @@ void SV_RestartGameProgs( void ) { // do a restart instead of a free gvm = VM_Restart( gvm ); - if ( !gvm ) { // bk001212 - as done below + if ( !gvm ) { Com_Error( ERR_FATAL, "VM_Restart on game failed" ); } diff --git a/code/server/sv_init.c b/code/server/sv_init.c index d95672a..c941e7d 100644 --- a/code/server/sv_init.c +++ b/code/server/sv_init.c @@ -416,6 +416,11 @@ void SV_SpawnServer( char *server, qboolean killBots ) { // clear the whole hunk because we're (re)loading the server Hunk_Clear(); +#ifndef DEDICATED + // Restart renderer + CL_StartHunkUsers( qtrue ); +#endif + // clear collision map data CM_ClearMap(); diff --git a/code/server/sv_main.c b/code/server/sv_main.c index 8906d00..c8c6a0a 100644 --- a/code/server/sv_main.c +++ b/code/server/sv_main.c @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA serverStatic_t svs; // persistant server info server_t sv; // local server -vm_t *gvm = NULL; // game virtual machine // bk001212 init +vm_t *gvm = NULL; // game virtual machine cvar_t *sv_fps; // time rate for running non-clients cvar_t *sv_timeout; // seconds without any message @@ -335,15 +335,6 @@ void SVC_Status( netadr_t from ) { // to prevent timed spoofed reply packets that add ghost servers Info_SetValueForKey( infostring, "challenge", Cmd_Argv(1) ); - // add "demo" to the sv_keywords if restricted - if ( Cvar_VariableValue( "fs_restrict" ) ) { - char keywords[MAX_INFO_STRING]; - - Com_sprintf( keywords, sizeof( keywords ), "demo %s", - Info_ValueForKey( infostring, "sv_keywords" ) ); - Info_SetValueForKey( infostring, "sv_keywords", keywords ); - } - status[0] = 0; statusLength = 0; @@ -780,13 +771,12 @@ void SV_Frame( int msec ) { if (!com_sv_running->integer) { - if(com_dedicated->integer) - { - // Block indefinitely until something interesting happens - // on STDIN. - NET_Sleep(-1); - } - + // Running as a server, but no map loaded +#ifdef DEDICATED + // Block until something interesting happens + NET_Sleep(-1); +#endif + return; } -- cgit v1.2.3