Ivan Savenko hai 1 ano
pai
achega
3e23a55c66

+ 3 - 0
client/globalLobby/GlobalLobbyRoomWindow.h

@@ -23,7 +23,10 @@ class CListBox;
 
 struct GlobalLobbyAccount;
 struct GlobalLobbyRoom;
+
+VCMI_LIB_NAMESPACE_BEGIN
 struct ModVerificationInfo;
+VCMI_LIB_NAMESPACE_END
 
 struct GlobalLobbyRoomModInfo
 {

+ 6 - 0
lib/modding/ModVerificationInfo.cpp

@@ -17,6 +17,8 @@
 #include "../json/JsonNode.h"
 #include "../VCMI_Lib.h"
 
+VCMI_LIB_NAMESPACE_BEGIN
+
 JsonNode ModVerificationInfo::jsonSerializeList(const ModCompatibilityInfo & input)
 {
 	JsonNode output;
@@ -90,6 +92,8 @@ ModListVerificationStatus ModVerificationInfo::verifyListAgainstLocalMods(const
 		modAffectsGameplay |= VLC->modh->getModInfo(remoteModId).checkModGameplayAffecting();
 
 		assert(modAffectsGameplay); // such mods should not be in the list to begin with
+		if (!modAffectsGameplay)
+			continue; // skip it
 
 		if (!vstd::contains(VLC->modh->getActiveMods(), remoteModId))
 		{
@@ -108,3 +112,5 @@ ModListVerificationStatus ModVerificationInfo::verifyListAgainstLocalMods(const
 
 	return result;
 }
+
+VCMI_LIB_NAMESPACE_END

+ 2 - 2
mapeditor/mainwindow.cpp

@@ -340,9 +340,9 @@ std::unique_ptr<CMap> MainWindow::openMapInternal(const QString & filenameSelect
 	if(auto header = mapService.loadMapHeader(resId))
 	{
 		auto missingMods = CMapService::verifyMapHeaderMods(*header);
-		ModIncompatibility::ModListWithVersion modList;
+		ModIncompatibility::ModList modList;
 		for(const auto & m : missingMods)
-			modList.push_back({m.second.name, m.second.version.toString()});
+			modList.push_back(m.second.name);
 		
 		if(!modList.empty())
 			throw ModIncompatibility(modList);