IOQ3 commit 2111

This commit is contained in:
Richard Allen 2011-08-04 18:26:51 +00:00
parent d8e1ca8fa2
commit bad77c913d

View file

@ -3111,12 +3111,12 @@ static void FS_ReorderPurePaks( void )
searchpath_t **p_insert_index, // for linked list reordering
**p_previous; // when doing the scan
fs_reordered = qfalse;
// only relevant when connected to pure server
if ( !fs_numServerPaks )
return;
fs_reordered = qfalse;
p_insert_index = &fs_searchpaths; // we insert in order at the beginning of the list
for ( i = 0 ; i < fs_numServerPaks ; i++ ) {
p_previous = p_insert_index; // track the pointer-to-current-item
@ -3889,9 +3889,10 @@ qboolean FS_ConditionalRestart(int checksumFeed, qboolean disconnect)
Com_GameRestart(checksumFeed, disconnect);
return qtrue;
}
else if(checksumFeed != fs_checksumFeed)
FS_Restart(checksumFeed);
else if(fs_numServerPaks && !fs_reordered)
FS_ReorderPurePaks();
return qfalse;
}