Merge branch 'master' of https://github.com/FWGS/xash3d-fwgs into switch_newer

engine/platform/sdl/in_sdl.c

@@ -343,12 +343,10 @@ void Platform_SetCursorType( VGUI_DefaultCursor type )
 	{
 		SDL_SetCursor( cursors.cursors[type] );
 		SDL_ShowCursor( true );
-		Key_EnableTextInput( true, false );
 	}
 	else
 	{
 		SDL_ShowCursor( false );
-		Key_EnableTextInput( false, false );
 	}
 #else
 	if( host.mouse_visible )

engine/server/sv_main.c

@@ -60,7 +60,7 @@ CVAR_DEFINE_AUTO( sv_log_singleplayer, "0", FCVAR_ARCHIVE, "allows logging in si
 CVAR_DEFINE_AUTO( sv_log_onefile, "0", FCVAR_ARCHIVE, "logs server information to only one file" );
 CVAR_DEFINE_AUTO( sv_trace_messages, "0", FCVAR_LATCH, "enable server usermessages tracing (good for developers)" );
 CVAR_DEFINE_AUTO( sv_master_response_timeout, "4", FCVAR_ARCHIVE, "master server heartbeat response timeout in seconds" );
-CVAR_DEFINE_AUTO( sv_autosave, "1", FCVAR_ARCHIVE|FCVAR_SERVER, "enable autosave command" );
+CVAR_DEFINE_AUTO( sv_autosave, "1", FCVAR_ARCHIVE|FCVAR_SERVER|FCVAR_PRIVILEGED, "enable autosaving" );
 
 // game-related cvars
 CVAR_DEFINE_AUTO( mapcyclefile, "mapcycle.txt", 0, "name of multiplayer map cycle configuration file" );
@@ -968,6 +968,7 @@ void SV_Init( void )
 	Cvar_RegisterVariable( &sv_master_response_timeout );
 
 	Cvar_RegisterVariable( &sv_background_freeze );
+	Cvar_RegisterVariable( &sv_autosave );
 
 	Cvar_RegisterVariable( &mapcyclefile );
 	Cvar_RegisterVariable( &motdfile );