# HG changeset patch
# User PeterN <peter1138@openttd.org>
# Date 2021-05-12 07:11:14
# Node ID 91ac2a71fe2706076f1bf2db3acac8d7d605330f
# Parent  0fab37ba7fa3d0023507af67387d537ecb175d16

Fix #9202: Invalid test for unset NewGRF override mapping. (#9226)

diff --git a/src/newgrf_commons.h b/src/newgrf_commons.h
--- a/src/newgrf_commons.h
+++ b/src/newgrf_commons.h
@@ -218,7 +218,6 @@ public:
 
 	inline uint16 GetMaxMapping() const { return max_new_entities; }
 	inline uint16 GetMaxOffset() const { return max_offset; }
-	inline bool IsValidID(uint16 entity_id) const { return entity_overrides[entity_id] != invalid_ID; }
 };
 
 
diff --git a/src/saveload/newgrf_sl.cpp b/src/saveload/newgrf_sl.cpp
--- a/src/saveload/newgrf_sl.cpp
+++ b/src/saveload/newgrf_sl.cpp
@@ -30,7 +30,8 @@ static const SaveLoad _newgrf_mapping_de
 void Save_NewGRFMapping(const OverrideManagerBase &mapping)
 {
 	for (uint i = 0; i < mapping.GetMaxMapping(); i++) {
-		if (!mapping.IsValidID(i)) continue;
+		if (mapping.mapping_ID[i].grfid == 0 &&
+		    mapping.mapping_ID[i].entity_id == 0) continue;
 		SlSetArrayIndex(i);
 		SlObject(&mapping.mapping_ID[i], _newgrf_mapping_desc);
 	}