From 555eaebb1b7cb7c4a5e1036892b0effbd62766ae Mon Sep 17 00:00:00 2001 From: Thilo Schulz Date: Tue, 21 Jun 2011 11:18:35 +0000 Subject: - Improve game_restart: * differing screen resolutions and network settings are now honoured when changing fs_game * Fix hunk memory leak on game_restart * Move cls.state and cls.servername to clc so connection state is fully preserved over game_restart * Revert back to previous fs_game after disconnecting from a server that triggered a game_restart * Fix error dialog popping up after every game_restart if an error happened previously (reported by Ensiform) - Fixed that not all commands added by CL_Init() would be removed by CL_Shutdown() --- src/sdl/sdl_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sdl/sdl_input.c') diff --git a/src/sdl/sdl_input.c b/src/sdl/sdl_input.c index a2353490..83b26086 100644 --- a/src/sdl/sdl_input.c +++ b/src/sdl/sdl_input.c @@ -1023,7 +1023,7 @@ void IN_Frame( void ) IN_ProcessEvents( ); // If not DISCONNECTED (main menu) or ACTIVE (in game), we're loading - loading = !!( cls.state != CA_DISCONNECTED && cls.state != CA_ACTIVE ); + loading = !!( clc.state != CA_DISCONNECTED && clc.state != CA_ACTIVE ); cursorShowing = Key_GetCatcher( ) & KEYCATCH_UI; if( !r_fullscreen->integer && ( Key_GetCatcher( ) & KEYCATCH_CONSOLE ) ) -- cgit