dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: move SLF_NOT_IN_SAVE into settings

Browse Source 
It is a settings-only flag, so don't pollute SaveLoad code with it.
This commit is contained in:
Patric Stout
2021-06-04 09:28:38 +02:00
committed by Patric Stout
parent 7572603c9d
commit 414e12d26b
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/saveload/saveload.cpp
View File

@@ -1408,10 +1408,7 @@ static void SlDeque(void *deque, VarType conv)
/** Are we going to save this object or not? */
static inline bool SlIsObjectValidInSavegame(const SaveLoad &sld)
{
if (_sl_version < sld.version_from || _sl_version >= sld.version_to) return false;
if (sld.conv & SLF_NOT_IN_SAVE) return false;
return true;
return (_sl_version >= sld.version_from && _sl_version < sld.version_to);
}
/**