FWGS
/
xash3d-fwgs
mirror of https://github.com/FWGS/xash3d-fwgs
2
0
Fork 0
Code Issues 2 Projects Releases Wiki Activity

engine: remove unused CL_IsInMenu, don't check for Host_IsDedicated in SCR_BeginLoadingPlaque, it's useless

This commit is contained in:
Alibek Omarov 2024-07-10 10:23:59 +03:00
parent 1c84a5c8ad
commit 1458014a29
5 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engine/client/cl_main.c
View File

@ -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 );

13
engine/client/cl_scrn.c
View File

@ -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();
}

2
engine/client/s_main.c
View File

@ -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

1
engine/common/common.h
View File

@ -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 );

5
engine/common/dedicated.c
View File

@ -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;