From f7e1f6ab256e2efa67d4e01dd15d45c1bcf6ce8f Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Sat, 3 Oct 2009 11:44:45 +0000 Subject: * (bug 3517) connect.menu isn't properly opened on connection * Partially revert 772 * Strip off trailing '\n' from server denial messages --- src/server/sv_client.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/server/sv_client.c') diff --git a/src/server/sv_client.c b/src/server/sv_client.c index 40a3a9f8..6aa7797b 100644 --- a/src/server/sv_client.c +++ b/src/server/sv_client.c @@ -111,7 +111,7 @@ void SV_DirectConnect( netadr_t from ) { version = atoi( Info_ValueForKey( userinfo, "protocol" ) ); if ( version != PROTOCOL_VERSION ) { - NET_OutOfBandPrint( NS_SERVER, from, "print\nServer uses protocol version %i", PROTOCOL_VERSION ); + NET_OutOfBandPrint( NS_SERVER, from, "print\nServer uses protocol version %i\n", PROTOCOL_VERSION ); Com_DPrintf (" rejected connect from version %i\n", version); return; } @@ -161,7 +161,7 @@ void SV_DirectConnect( netadr_t from ) { } } if (i == MAX_CHALLENGES) { - NET_OutOfBandPrint( NS_SERVER, from, "print\nNo or bad challenge for address" ); + NET_OutOfBandPrint( NS_SERVER, from, "print\nNo or bad challenge for address\n" ); return; } @@ -173,7 +173,7 @@ void SV_DirectConnect( netadr_t from ) { if ( !Sys_IsLANAddress( from ) ) { if ( sv_minPing->value && ping < sv_minPing->value ) { // don't let them keep trying until they get a big delay - NET_OutOfBandPrint( NS_SERVER, from, "print\nServer is for high pings only" ); + NET_OutOfBandPrint( NS_SERVER, from, "print\nServer is for high pings only\n" ); Com_DPrintf ("Client %i rejected on a too low ping\n", i); // reset the address otherwise their ping will keep increasing // with each connect message and they'd eventually be able to connect @@ -181,7 +181,7 @@ void SV_DirectConnect( netadr_t from ) { return; } if ( sv_maxPing->value && ping > sv_maxPing->value ) { - NET_OutOfBandPrint( NS_SERVER, from, "print\nServer is for low pings only" ); + NET_OutOfBandPrint( NS_SERVER, from, "print\nServer is for low pings only\n" ); Com_DPrintf ("Client %i rejected on a too high ping\n", i); return; } @@ -246,7 +246,7 @@ void SV_DirectConnect( netadr_t from ) { return; } else { - NET_OutOfBandPrint( NS_SERVER, from, "print\nServer is full" ); + NET_OutOfBandPrint( NS_SERVER, from, "print\nServer is full\n" ); Com_DPrintf ("Rejected a connection.\n"); return; } @@ -282,7 +282,7 @@ gotnewcl: // we can't just use VM_ArgPtr, because that is only valid inside a VM_Call char *str = VM_ExplicitArgPtr( gvm, denied ); - NET_OutOfBandPrint( NS_SERVER, from, "print\n%s", str ); + NET_OutOfBandPrint( NS_SERVER, from, "print\n%s\n", str ); Com_DPrintf ("Game rejected a connection: %s.\n", str); return; } -- cgit