RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-09 05:41:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "engine: client: implement connectionprogress partially"

Browse Source 
This reverts commit cb417a3d51.

This commit breaks demo playback. Figure out why, then revert it back.
This commit is contained in:
Alibek Omarov
2019-10-06 07:43:57 +03:00
parent 39ff3b199a
commit d2a8cfe614
6 changed files with 13 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
engine/client/cl_parse.c
View File

@@ -904,7 +904,7 @@ void CL_ParseServerData( sizebuf_t *msg )
if( Con_FixedFont( ))
{
// separate the printfs so the server message can have a color
// seperate the printfs so the server message can have a color
Con_Print( "\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\37\n" );
Con_Print( va( "%c%s\n\n", 2, clgame.maptitle ));
}
@@ -920,9 +920,6 @@ void CL_ParseServerData( sizebuf_t *msg )
if( r_decals->value > mp_decals.value )
Cvar_SetValue( "r_decals", mp_decals.value );
if( !cls.demoplayback )
UI_ConnectionProgress_ParseServerInfo( "server" );
}
else Cvar_Reset( "r_decals" );
@@ -946,9 +943,7 @@ void CL_ParseServerData( sizebuf_t *msg )
}
if( !cls.changedemo )
{
// UI_SetActiveMenu( cl.background );
}
UI_SetActiveMenu( cl.background );
else if( !cls.demoplayback )
Key_SetKeyDest( key_menu );
@@ -2136,7 +2131,6 @@ void CL_ParseServerMessage( sizebuf_t *msg, qboolean normal_message )
else cls.state = ca_connecting;
cl.background = old_background;
cls.connect_time = MAX_HEARTBEAT;
UI_ConnectionProgress_ChangeLevel();
}
break;
case svc_setview:
@@ -2429,9 +2423,6 @@ void CL_ParseLegacyServerData( sizebuf_t *msg )
if( r_decals->value > mp_decals.value )
Cvar_SetValue( "r_decals", mp_decals.value );
if( !cls.demoplayback )
UI_ConnectionProgress_ParseServerInfo( "server" );
}
else Cvar_Reset( "r_decals" );
@@ -2455,9 +2446,7 @@ void CL_ParseLegacyServerData( sizebuf_t *msg )
}
if( !cls.changedemo )
{
// UI_SetActiveMenu( cl.background );
}
UI_SetActiveMenu( cl.background );
else if( !cls.demoplayback )
Key_SetKeyDest( key_menu );
@@ -2893,8 +2882,6 @@ void CL_ParseLegacyServerMessage( sizebuf_t *msg, qboolean normal_message )
else cls.state = ca_connecting;
cl.background = old_background;
cls.connect_time = MAX_HEARTBEAT;
UI_ConnectionProgress_ChangeLevel();
}
break;
case svc_setview:
@@ -3130,8 +3117,6 @@ void CL_LegacyPrecache_f( void )
spawncount = Q_atoi( Cmd_Argv( 1 ));
UI_ConnectionProgress_Precache();
Con_Printf( "Setting up renderer...\n" );
// load tempent sprites (glowshell, muzzleflashes etc)