games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-21 21:17:49 +02:00
Code Issues Releases Activity

Fix build

Browse Source
This commit is contained in:
Ivan Savenko 2024-04-19 12:46:50 +03:00
parent 526ac9807b
commit 3e23a55c66
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/globalLobby/GlobalLobbyRoomWindow.h
View File

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

6
lib/modding/ModVerificationInfo.cpp
View File

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

4
mapeditor/mainwindow.cpp
View File

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