Browse Source

engine: client: drop loading plaque on second signon, remove servercount check

pull/2/head
Alibek Omarov 3 years ago
parent
commit
d46d62bf03
  1. 3
      engine/client/cl_main.c
  2. 1
      engine/client/cl_scrn.c
  3. 3
      engine/client/client.h

3
engine/client/cl_main.c

@ -195,8 +195,6 @@ void CL_CheckClientState( void )
Netchan_ReportFlow( &cls.netchan ); Netchan_ReportFlow( &cls.netchan );
Con_DPrintf( "client connected at %.2f sec\n", Sys_DoubleTime() - cls.timestart ); 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(); Mem_PrintStats();
break; break;
case 2: case 2:
SCR_EndLoadingPlaque();
if( cl.proxy_redirect && !cls.spectator ) if( cl.proxy_redirect && !cls.spectator )
CL_Disconnect(); CL_Disconnect();
cl.proxy_redirect = false; cl.proxy_redirect = false;

1
engine/client/cl_scrn.c

@ -418,7 +418,6 @@ void SCR_BeginLoadingPlaque( qboolean is_background )
cls.draw_changelevel = !is_background; cls.draw_changelevel = !is_background;
SCR_UpdateScreen(); SCR_UpdateScreen();
cls.disable_screen = host.realtime; cls.disable_screen = host.realtime;
cls.disable_servercount = cl.servercount;
cl.background = is_background; // set right state before svc_serverdata is came cl.background = is_background; // set right state before svc_serverdata is came
if( !Host_IsDedicated() ) if( !Host_IsDedicated() )

3
engine/client/client.h

@ -527,9 +527,6 @@ typedef struct
float disable_screen; // showing loading plaque between levels float disable_screen; // showing loading plaque between levels
// or changing rendering dlls // or changing rendering dlls
// if time gets > 30 seconds ahead, break it // 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...' qboolean draw_changelevel; // draw changelevel image 'Loading...'
keydest_t key_dest; keydest_t key_dest;

Loading…
Cancel
Save