diff options
| author | Tim Angus <tim@ngus.net> | 2007-07-15 14:15:41 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2007-07-15 14:15:41 +0000 |
| commit | ffbf946dd63dccf0d6b6553c8bc1c9da4d3c89b3 (patch) | |
| tree | 62b48381afabceca4c2aad7c39e0eeb51e328126 /src/server | |
| parent | 655d4c12eea45edf2041300eccace352a503b690 (diff) | |
* Merge of ioq3-r1112
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/sv_init.c | 3 | ||||
| -rw-r--r-- | src/server/sv_main.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/server/sv_init.c b/src/server/sv_init.c index 293b31c9..2106816c 100644 --- a/src/server/sv_init.c +++ b/src/server/sv_init.c @@ -696,6 +696,7 @@ void SV_Shutdown( char *finalmsg ) { Com_Printf( "---------------------------\n" ); // disconnect any local clients - CL_Disconnect( qfalse ); + if( sv_killserver->integer != 2 ) + CL_Disconnect( qfalse ); } diff --git a/src/server/sv_main.c b/src/server/sv_main.c index 2dc5a778..ad9669b4 100644 --- a/src/server/sv_main.c +++ b/src/server/sv_main.c @@ -474,7 +474,7 @@ void SVC_RemoteCommand( netadr_t from, msg_t *msg ) { // TTimo - https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=534 time = Com_Milliseconds(); - if (time<(lasttime+500)) { + if ( (unsigned)( time - lasttime ) < 500u ) { return; } lasttime = time; |