okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix auto game-restart when disconnecting from a server that explicitly set fs_game to "baseq3" instead of ""

Browse source
This commit is contained in:
Thilo Schulz 2011-08-24 14:47:57 +00:00
parent abe85940ae
commit de182882f1
4 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
code/qcommon/files.c
View file

@ -3879,13 +3879,13 @@ void FS_Restart( int checksumFeed ) {
/*
=================
FS_ConditionalRestart
restart if necessary
Restart if necessary
Return qtrue if restarting due to game directory changed, qfalse otherwise
=================
*/
qboolean FS_ConditionalRestart(int checksumFeed, qboolean disconnect)
{
int retval;
if(fs_gamedirvar->modified)
{
if(FS_FilenameCompare(lastValidGame, fs_gamedirvar->string) &&
@ -3896,13 +3896,8 @@ qboolean FS_ConditionalRestart(int checksumFeed, qboolean disconnect)
return qtrue;
}
else
{
fs_gamedirvar->modified = qfalse;
retval = qtrue;
}
}
else
retval = qfalse;
if(checksumFeed != fs_checksumFeed)
FS_Restart(checksumFeed);