diff options
| author | Tim Angus <tim@ngus.net> | 2007-09-05 22:05:32 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2007-09-05 22:05:32 +0000 |
| commit | c99975c73ae2941751d86d3b8466454c5ad122c0 (patch) | |
| tree | b5bb65655fbdbc22201426046092939bcf696abe /src/server/sv_main.c | |
| parent | 27ad2c0e19891f7f2454c9eedf76878dc1942ba6 (diff) | |
* Merge of ioq3-r1163
+ SDL everywhere
+ New R_LoadImage
+ net_ip.c
+ Window icon
+ GUI based dedicated server support
+ Compile time linked OpenGL
* Remove ui_menuFiles cvar
Diffstat (limited to 'src/server/sv_main.c')
| -rw-r--r-- | src/server/sv_main.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/src/server/sv_main.c b/src/server/sv_main.c index b4552470..62973d9c 100644 --- a/src/server/sv_main.c +++ b/src/server/sv_main.c @@ -25,7 +25,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 @@ -350,15 +350,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; @@ -783,13 +774,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; } |