From 414e12d26be88043000aa7fe540edc974244dcc8 Mon Sep 17 00:00:00 2001
From: Patric Stout <truebrain@openttd.org>
Date: Fri, 4 Jun 2021 09:28:38 +0200
Subject: Codechange: move SLF_NOT_IN_SAVE into settings

It is a settings-only flag, so don't pollute SaveLoad code with it.
---
 src/saveload/saveload.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/saveload/saveload.cpp')

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);
 }
 
 /**
-- 
cgit v1.2.3-54-g00ecf