diff --git a/src/sv_client.c b/src/sv_client.c index 18b5aa4e..d3586c11 100644 --- a/src/sv_client.c +++ b/src/sv_client.c @@ -245,9 +245,17 @@ __optimize3 __regparm1 void SV_DirectConnect( netadr_t *from ) { "This is a beta server. Sorry, but you can not connect to it with a release build of CoD4X.\n", sv_protocol->integer); #else - NET_OutOfBandPrint( NS_SERVER, from, "error\nThis server requires protocol version: %d\n" - "Please restart CoD4 and see on the main-menu if a new update is available\n" - "{OOBErrorParser protocolmismatch CoD4X" Q3_VERSION " %d}", sv_protocol->integer, sv_protocol->integer); + if(version >= 21) + { + NET_OutOfBandPrint( NS_SERVER, from, "error\nThis server requires protocol version: %d\n" + "Please restart CoD4 and see on the main-menu if a new update is available\n" + "{OOBErrorParser protocolmismatch CoD4X" Q3_VERSION " %d}", sv_protocol->integer, sv_protocol->integer); + }else{ + NET_OutOfBandPrint( NS_SERVER, from, "error\nThis server requires protocol version: %d\n" + "To update to protocol version 21 please look in CoD4X serverlist (ingame server browser) for an updating-server\n" + "or install the new client update manually from https://cod4x.ovh\n" + "Note: Ingame autoupdate will not work", sv_protocol->integer); + } #endif } Com_Printf(CON_CHANNEL_SERVER,"rejected connect from version %i\n", version); diff --git a/src/version/version.c b/src/version/version.c index 67568c51..c141d445 100644 --- a/src/version/version.c +++ b/src/version/version.c @@ -1,6 +1,6 @@ #include "version.h" -#define SYS_COMMONVERSION 20.2 +#define SYS_COMMONVERSION 21.0 #define _STRINGIFY(s) #s #define STRINGIFY(s) _STRINGIFY(s) diff --git a/src/win32/win_syscon.c b/src/win32/win_syscon.c index 5492b38e..5db402e6 100644 --- a/src/win32/win_syscon.c +++ b/src/win32/win_syscon.c @@ -39,6 +39,7 @@ #define SYSCON_DEFAULT_HEIGHT 450 #define COPY_ID 1 +#define QUIT_ID 2 #define CLEAR_ID 3 #define ERRORBOX_ID 10 @@ -80,7 +81,6 @@ typedef struct HBITMAP hbmClearBitmap; HBRUSH hbrEditBackground; - HBRUSH hbrErrorBackground; HFONT hfBufferFont; HFONT hfButtonFont; @@ -195,8 +195,7 @@ static LONG WINAPI ConWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara case WM_CREATE: // s_wcd.hbmLogo = LoadBitmap( g_wv.hInstance, MAKEINTRESOURCE( IDB_BITMAP1 ) ); // s_wcd.hbmClearBitmap = LoadBitmap( g_wv.hInstance, MAKEINTRESOURCE( IDB_BITMAP2 ) ); - s_wcd.hbrEditBackground = CreateSolidBrush( RGB( 0x33, 0x33, 0x33 ) ); - s_wcd.hbrErrorBackground = CreateSolidBrush( RGB( 0x80, 0x80, 0x80 ) ); + s_wcd.hbrEditBackground = CreateSolidBrush( RGB( 0, 0, 0 ) ); SetTimer( hWnd, 1, 1000, NULL ); break; case WM_ERASEBKGND: