cpmadevs/cnq3
0
0
Fork 0
mirror of https://bitbucket.org/CPMADevs/cnq3 synced 2024-11-23 12:32:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

fs_reordered is now always set before leaving the FS_ReorderPurePaks function

Browse source
This commit is contained in:
myT 2018-01-29 20:23:17 +01:00
parent d3d4746a6b
commit afe84395c5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/qcommon/files.cpp
View file

@ -2551,12 +2551,12 @@ static void FS_ReorderPurePaks()
searchpath_t **p_insert_index, // for linked list reordering searchpath_t **p_insert_index, // for linked list reordering
**p_previous; // when doing the scan **p_previous; // when doing the scan
fs_reordered = qfalse;
// only relevant when connected to pure server // only relevant when connected to pure server
if ( !fs_numServerPaks ) if ( !fs_numServerPaks )
return; return;
fs_reordered = qfalse;
p_insert_index = &fs_searchpaths; // we insert in order at the beginning of the list p_insert_index = &fs_searchpaths; // we insert in order at the beginning of the list
for ( i = 0 ; i < fs_numServerPaks ; i++ ) { for ( i = 0 ; i < fs_numServerPaks ; i++ ) {
p_previous = p_insert_index; // track the pointer-to-current-item p_previous = p_insert_index; // track the pointer-to-current-item
@ -3089,7 +3089,7 @@ restart if necessary
void FS_ConditionalRestart( int checksumFeed ) { void FS_ConditionalRestart( int checksumFeed ) {
if( fs_gamedirvar->modified || checksumFeed != fs_checksumFeed ) { if( fs_gamedirvar->modified || checksumFeed != fs_checksumFeed ) {
FS_Restart( checksumFeed ); FS_Restart( checksumFeed );
} else if ( fs_numServerPaks ) { } else if ( fs_numServerPaks && !fs_reordered ) {
FS_ReorderPurePaks(); FS_ReorderPurePaks();
} }
} }