games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Merge pull request #5540 from GeorgeK1ng/campaign_sets

Browse Source 
Make campaign sets modable
This commit is contained in:
Ivan Savenko
2025-03-12 14:56:10 +02:00
committed by GitHub
parent e5d476d9c4 d5136afdf1
commit f7305fd1c2
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/lobby/SelectionTab.cpp
View File

@@ -48,6 +48,7 @@
#include "../../lib/TerrainHandler.h" #include "../../lib/TerrainHandler.h"
#include "../../lib/UnlockGuard.h" #include "../../lib/UnlockGuard.h"
#include "../../lib/GameLibrary.h" #include "../../lib/GameLibrary.h"
#include "../../lib/json/JsonUtils.h"
bool mapSorter::operator()(const std::shared_ptr<ElementInfo> aaa, const std::shared_ptr<ElementInfo> bbb) bool mapSorter::operator()(const std::shared_ptr<ElementInfo> aaa, const std::shared_ptr<ElementInfo> bbb)
{ {
@@ -962,7 +963,7 @@ void SelectionTab::handleUnsupportedSavegames(const std::vector<ResourcePath> &
void SelectionTab::parseCampaigns(const std::unordered_set<ResourcePath> & files) void SelectionTab::parseCampaigns(const std::unordered_set<ResourcePath> & files)
{ {
auto campaignSets = JsonNode(JsonPath::builtin("config/campaignSets.json")); auto campaignSets = JsonUtils::assembleFromFiles("config/campaignSets.json");
auto mainmenu = JsonNode(JsonPath::builtin("config/mainmenu.json")); auto mainmenu = JsonNode(JsonPath::builtin("config/mainmenu.json"));
allItems.reserve(files.size()); allItems.reserve(files.size());

3
client/mainmenu/CMainMenu.cpp
View File

@@ -60,6 +60,7 @@
#include "../../lib/GameConstants.h" #include "../../lib/GameConstants.h"
#include "../../lib/CRandomGenerator.h" #include "../../lib/CRandomGenerator.h"
#include "../../lib/GameLibrary.h" #include "../../lib/GameLibrary.h"
#include "../../lib/json/JsonUtils.h"
ISelectionScreenInfo * SEL = nullptr; ISelectionScreenInfo * SEL = nullptr;
@@ -305,7 +306,7 @@ CMenuEntry::CMenuEntry(CMenuScreen * parent, const JsonNode & config)
} }
CMainMenuConfig::CMainMenuConfig() CMainMenuConfig::CMainMenuConfig()
: campaignSets(JsonPath::builtin("config/campaignSets.json")) : campaignSets(JsonUtils::assembleFromFiles("config/campaignSets.json"))
, config(JsonPath::builtin("config/mainmenu.json")) , config(JsonPath::builtin("config/mainmenu.json"))
{ {
if (!config["scenario-selection"].isStruct()) if (!config["scenario-selection"].isStruct())