From d46d62bf0325c52191377b76ff4abdbc179a761c Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Wed, 29 Jun 2022 18:57:10 +0300 Subject: [PATCH] engine: client: drop loading plaque on second signon, remove servercount check --- engine/client/cl_main.c | 3 +-- engine/client/cl_scrn.c | 1 - engine/client/client.h | 3 --- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c index 225172aa..46782aef 100644 --- a/engine/client/cl_main.c +++ b/engine/client/cl_main.c @@ -195,8 +195,6 @@ void CL_CheckClientState( void ) Netchan_ReportFlow( &cls.netchan ); Con_DPrintf( "client connected at %.2f sec\n", Sys_DoubleTime() - cls.timestart ); - if(( cls.demoplayback || cls.disable_servercount != cl.servercount ) && cl.video_prepped ) - SCR_EndLoadingPlaque(); // get rid of loading plaque } } @@ -234,6 +232,7 @@ void CL_SignonReply( void ) Mem_PrintStats(); break; case 2: + SCR_EndLoadingPlaque(); if( cl.proxy_redirect && !cls.spectator ) CL_Disconnect(); cl.proxy_redirect = false; diff --git a/engine/client/cl_scrn.c b/engine/client/cl_scrn.c index 62a42047..ee212d46 100644 --- a/engine/client/cl_scrn.c +++ b/engine/client/cl_scrn.c @@ -418,7 +418,6 @@ void SCR_BeginLoadingPlaque( qboolean is_background ) cls.draw_changelevel = !is_background; SCR_UpdateScreen(); cls.disable_screen = host.realtime; - cls.disable_servercount = cl.servercount; cl.background = is_background; // set right state before svc_serverdata is came if( !Host_IsDedicated() ) diff --git a/engine/client/client.h b/engine/client/client.h index 129caca6..07bb0c57 100644 --- a/engine/client/client.h +++ b/engine/client/client.h @@ -527,9 +527,6 @@ typedef struct float disable_screen; // showing loading plaque between levels // or changing rendering dlls // if time gets > 30 seconds ahead, break it - int disable_servercount; // when we receive a frame and cl.servercount - // > cls.disable_servercount, clear disable_screen - qboolean draw_changelevel; // draw changelevel image 'Loading...' keydest_t key_dest;