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

re-ordering the pak list when connected to a pure server

Browse source 
this fixes pure listen servers allowing unpure overrides for the owner
This commit is contained in:
myT 2018-01-25 05:25:57 +01:00
parent b4b3482fd2
commit 5ea79f073c
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog.txt
View file

@ -14,6 +14,8 @@ chg: on Windows, a fatal error will move the early console window to the foregro
chg: com_hunkMegs doesn't have a maximum value anymore chg: com_hunkMegs doesn't have a maximum value anymore
a value too high would reset it and the engine might fail to load with the default value a value too high would reset it and the engine might fail to load with the default value
fix: conditional FS restarts will always re-order the pak list when connected to a pure server
fix: lifted the directory scanning restriction that affected pure listen servers fix: lifted the directory scanning restriction that affected pure listen servers
fix: getting stuck on "Awaiting snapshot..." when the server shuts down during client connection fix: getting stuck on "Awaiting snapshot..." when the server shuts down during client connection

6
code/qcommon/files.cpp
View file

@ -3081,12 +3081,12 @@ FS_ConditionalRestart
restart if necessary restart if necessary
================= =================
*/ */
qbool 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 );
return qtrue; } else if ( fs_numServerPaks && !fs_reordered ) {
FS_ReorderPurePaks();
} }
return qfalse;
} }
/* /*

2
code/qcommon/qcommon.h
View file

@ -626,7 +626,7 @@ qbool FS_Initialized();
void FS_InitFilesystem(); void FS_InitFilesystem();
void FS_Shutdown( qbool closemfp ); void FS_Shutdown( qbool closemfp );
qbool FS_ConditionalRestart( int checksumFeed ); void FS_ConditionalRestart( int checksumFeed );
void FS_Restart( int checksumFeed ); void FS_Restart( int checksumFeed );
// shutdown and restart the filesystem so changes to fs_gamedir can take effect // shutdown and restart the filesystem so changes to fs_gamedir can take effect