mirror of
https://github.com/UberGames/ioef.git
synced 2024-11-27 22:42:09 +00:00
Fix game restart after curl download finished
This commit is contained in:
parent
702c519057
commit
0bc54ab696
1 changed files with 6 additions and 3 deletions
|
@ -146,7 +146,7 @@ int serverStatusCount;
|
||||||
void hA3Dg_ExportRenderGeom (refexport_t *incoming_re);
|
void hA3Dg_ExportRenderGeom (refexport_t *incoming_re);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static int isQuitting = qfalse;
|
static int noGameRestart = qfalse;
|
||||||
|
|
||||||
extern void SV_BotFrame( int time );
|
extern void SV_BotFrame( int time );
|
||||||
void CL_CheckForResend( void );
|
void CL_CheckForResend( void );
|
||||||
|
@ -1477,8 +1477,10 @@ void CL_Disconnect( qboolean showMainMenu ) {
|
||||||
|
|
||||||
CL_UpdateGUID( NULL, 0 );
|
CL_UpdateGUID( NULL, 0 );
|
||||||
|
|
||||||
if(!isQuitting)
|
if(!noGameRestart)
|
||||||
CL_OldGame();
|
CL_OldGame();
|
||||||
|
else
|
||||||
|
noGameRestart = qfalse;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -1732,6 +1734,7 @@ void CL_Connect_f( void ) {
|
||||||
Cvar_Set( "sv_killserver", "1" );
|
Cvar_Set( "sv_killserver", "1" );
|
||||||
SV_Frame( 0 );
|
SV_Frame( 0 );
|
||||||
|
|
||||||
|
noGameRestart = qtrue;
|
||||||
CL_Disconnect( qtrue );
|
CL_Disconnect( qtrue );
|
||||||
Con_Close();
|
Con_Close();
|
||||||
|
|
||||||
|
@ -3652,7 +3655,7 @@ void CL_Shutdown(char *finalmsg, qboolean disconnect, qboolean quit)
|
||||||
}
|
}
|
||||||
recursive = qtrue;
|
recursive = qtrue;
|
||||||
|
|
||||||
isQuitting = quit;
|
noGameRestart = quit;
|
||||||
|
|
||||||
if(disconnect)
|
if(disconnect)
|
||||||
CL_Disconnect(qtrue);
|
CL_Disconnect(qtrue);
|
||||||
|
|
Loading…
Reference in a new issue