mirror of
https://github.com/vcmi/vcmi.git
synced 2025-01-10 00:43:59 +02:00
Merge pull request #5017 from IvanSavenko/save_compat_fix
Fix loading of 1.5 and older 1.6 saves
This commit is contained in:
commit
22bd3c5621
@ -13,6 +13,7 @@
|
|||||||
#include "CModHandler.h"
|
#include "CModHandler.h"
|
||||||
#include "ModDescription.h"
|
#include "ModDescription.h"
|
||||||
#include "ModIncompatibility.h"
|
#include "ModIncompatibility.h"
|
||||||
|
#include "ModScope.h"
|
||||||
|
|
||||||
#include "../json/JsonNode.h"
|
#include "../json/JsonNode.h"
|
||||||
#include "../VCMI_Lib.h"
|
#include "../VCMI_Lib.h"
|
||||||
@ -68,6 +69,9 @@ ModListVerificationStatus ModVerificationInfo::verifyListAgainstLocalMods(const
|
|||||||
if(modList.count(m))
|
if(modList.count(m))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
if (m == ModScope::scopeBuiltin())
|
||||||
|
continue;
|
||||||
|
|
||||||
if(VLC->modh->getModInfo(m).affectsGameplay())
|
if(VLC->modh->getModInfo(m).affectsGameplay())
|
||||||
result[m] = ModVerificationStatus::EXCESSIVE;
|
result[m] = ModVerificationStatus::EXCESSIVE;
|
||||||
}
|
}
|
||||||
@ -77,6 +81,9 @@ ModListVerificationStatus ModVerificationInfo::verifyListAgainstLocalMods(const
|
|||||||
auto & remoteModId = infoPair.first;
|
auto & remoteModId = infoPair.first;
|
||||||
auto & remoteModInfo = infoPair.second;
|
auto & remoteModInfo = infoPair.second;
|
||||||
|
|
||||||
|
if (remoteModId == ModScope::scopeBuiltin())
|
||||||
|
continue;
|
||||||
|
|
||||||
bool modAffectsGameplay = remoteModInfo.impactsGameplay;
|
bool modAffectsGameplay = remoteModInfo.impactsGameplay;
|
||||||
//parent mod affects gameplay if child affects too
|
//parent mod affects gameplay if child affects too
|
||||||
for(const auto & subInfoPair : modList)
|
for(const auto & subInfoPair : modList)
|
||||||
|
Loading…
Reference in New Issue
Block a user