From 1458014a295e29a921d266c75811df0b9014dcdf Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Wed, 10 Jul 2024 10:23:59 +0300
Subject: [PATCH] engine: remove unused CL_IsInMenu, don't check for
 Host_IsDedicated in SCR_BeginLoadingPlaque, it's useless

---
 engine/client/cl_main.c   |  7 +------
 engine/client/cl_scrn.c   | 13 ++++---------
 engine/client/s_main.c    |  2 +-
 engine/common/common.h    |  1 -
 engine/common/dedicated.c |  5 -----
 5 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c
index 782305a6..aecf95ca 100644
--- a/engine/client/cl_main.c
+++ b/engine/client/cl_main.c
@@ -122,11 +122,6 @@ qboolean CL_IsInGame( void )
 	return ( cls.key_dest == key_game ); // active if not menu or console
 }
 
-qboolean CL_IsInMenu( void )
-{
-	return ( cls.key_dest == key_menu );
-}
-
 qboolean CL_IsInConsole( void )
 {
 	return ( cls.key_dest == key_console );
@@ -1569,7 +1564,7 @@ void CL_Disconnect( void )
 	cls.signon = 0;
 
 	// back to menu in non-developer mode
-	if( host_developer.value || CL_IsInMenu( ))
+	if( host_developer.value || cls.key_dest == key_menu )
 		return;
 
 	UI_SetActiveMenu( true );
diff --git a/engine/client/cl_scrn.c b/engine/client/cl_scrn.c
index c8b046bc..0ccf8f16 100644
--- a/engine/client/cl_scrn.c
+++ b/engine/client/cl_scrn.c
@@ -431,10 +431,9 @@ void SCR_BeginLoadingPlaque( qboolean is_background )
 	cl.audio_prepped = false;			// don't play ambients
 	cl.video_prepped = false;
 
-	if( !Host_IsDedicated() )
-		oldclear = gl_clear.value;
+	oldclear = gl_clear.value;
 
-	if( CL_IsInMenu( ) && !cls.changedemo && !is_background )
+	if( cls.key_dest == key_menu && !cls.changedemo && !is_background )
 	{
 		UI_SetActiveMenu( false );
 		if( cls.state == ca_disconnected && !(GameState->curstate == STATE_RUNFRAME && GameState->nextstate != STATE_RUNFRAME) )
@@ -447,17 +446,13 @@ void SCR_BeginLoadingPlaque( qboolean is_background )
 	if( cls.key_dest == key_console )
 		return;
 
-	if( !Host_IsDedicated() )
-		gl_clear.value = 0.0f;
-
+	gl_clear.value = 0.0f;
 	if( is_background ) IN_MouseSavePos( );
 	cls.draw_changelevel = !is_background;
 	SCR_UpdateScreen();
 	cls.disable_screen = host.realtime;
 	cl.background = is_background;		// set right state before svc_serverdata is came
-
-	if( !Host_IsDedicated() )
-		gl_clear.value = oldclear;
+	gl_clear.value = oldclear;
 
 //	SNDDMA_LockSound();
 }
diff --git a/engine/client/s_main.c b/engine/client/s_main.c
index f0d8c85d..e39c8d6b 100644
--- a/engine/client/s_main.c
+++ b/engine/client/s_main.c
@@ -1602,7 +1602,7 @@ void SND_UpdateSound( void )
 	s_listener.frametime = (cl.time - cl.oldtime);
 	s_listener.waterlevel = cl.local.waterlevel;
 	s_listener.active = CL_IsInGame();
-	s_listener.inmenu = CL_IsInMenu();
+	s_listener.inmenu = cls.key_dest == key_menu;
 	s_listener.paused = cl.paused;
 
 	// update general area ambient sound sources
diff --git a/engine/common/common.h b/engine/common/common.h
index b2c743b1..ea57f7f0 100644
--- a/engine/common/common.h
+++ b/engine/common/common.h
@@ -651,7 +651,6 @@ struct physent_s;
 struct sv_client_s;
 typedef struct sizebuf_s sizebuf_t;
 qboolean CL_IsInGame( void );
-qboolean CL_IsInMenu( void );
 qboolean CL_IsInConsole( void );
 qboolean CL_IsThirdPerson( void );
 qboolean CL_IsIntermission( void );
diff --git a/engine/common/dedicated.c b/engine/common/dedicated.c
index bf845db4..9d57e89f 100644
--- a/engine/common/dedicated.c
+++ b/engine/common/dedicated.c
@@ -39,11 +39,6 @@ qboolean CL_IsInGame( void )
 	return true;	// always active for dedicated servers
 }
 
-qboolean CL_IsInMenu( void )
-{
-	return false;
-}
-
 qboolean CL_IsInConsole( void )
 {
 	return false;