Merge pull request #6126 from MichalZr6/bad_maps_handling

Map loader/saver rework: fix empty modScope

lib/mapping/MapFormatJson.cpp

@@ -1044,6 +1044,8 @@ void CMapLoaderJson::MapObjectLoader::construct()
 		return;
 	}
 
+	configuration.setModScope(ModScope::scopeGame());
+
 	auto handler = LIBRARY->objtypeh->getHandlerFor( ModScope::scopeMap(), typeName, subtypeName);
 
 	auto appearance = std::make_shared<ObjectTemplate>();
@@ -1293,6 +1295,8 @@ void CMapSaverJson::writeObjects()
 		auto temp = handler.enterStruct(obj->instanceName);
 
 		obj->serializeJson(handler);
+
+		data[obj->instanceName].setModScope(ModScope::scopeGame());
 	}
 
 	if(map->grailPos.isValid())
@@ -1306,6 +1310,8 @@ void CMapSaverJson::writeObjects()
 
 		grail["options"]["radius"].Float() = map->grailRadius;
 
+		grail.setModScope(ModScope::scopeGame());
+
 		data["grail"] = grail;
 	}
 

lib/modding/IdentifierStorage.cpp

@@ -246,7 +246,7 @@ std::optional<si32> CIdentifierStorage::getIdentifierImpl(const ObjectCallback &
 
 	if (idList.size() == 1)
 		return idList.front().id;
-	if (!silent)
+	if (!silent && options.localScope != ModScope::scopeGame())
 		showIdentifierResolutionErrorDetails(options);
 	return std::optional<si32>();
 }