diff options
| author | Patric Stout <truebrain@openttd.org> | 2021-06-04 09:28:38 +0200 |
|---|---|---|
| committer | Patric Stout <github@truebrain.nl> | 2021-06-06 21:45:01 +0200 |
| commit | 414e12d26be88043000aa7fe540edc974244dcc8 (patch) | |
| tree | 0b77f714795982ffc0c8cab3d369e3a8778fb5c1 /src/saveload/saveload.cpp | |
| parent | 7572603c9d97215afe62cd79e25048237a637616 (diff) | |
| download | openttd-414e12d26be88043000aa7fe540edc974244dcc8.tar.xz | |
Codechange: move SLF_NOT_IN_SAVE into settings
It is a settings-only flag, so don't pollute SaveLoad code with it.
Diffstat (limited to 'src/saveload/saveload.cpp')
| -rw-r--r-- | src/saveload/saveload.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index 3c95e61e2..427a19aa9 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -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); } /** |