1
0
mirror of https://github.com/vcmi/vcmi.git synced 2026-05-22 09:55:17 +02:00

Load battle effects from all mods

This commit is contained in:
Ivan Savenko
2026-01-08 19:02:21 +00:00
parent 1bca316154
commit 09b5749a0f
+2 -1
View File
@@ -29,6 +29,7 @@
#include "../../lib/battle/BattleAction.h"
#include "../../lib/battle/CPlayerBattleCallback.h"
#include "../../lib/filesystem/ResourcePath.h"
#include "../../lib/json/JsonUtils.h"
#include "../../lib/networkPacks/PacksForClientBattle.h"
#include "../../lib/texts/CGeneralTextHandler.h"
@@ -132,7 +133,7 @@ void BattleEffectsController::collectRenderableObjects(BattleRenderer & renderer
void BattleEffectsController::loadColorMuxers()
{
const JsonNode config(JsonPath::builtin("config/battleEffects.json"));
const JsonNode config = JsonUtils::assembleFromFiles("config/battleEffects.json");
for(auto & muxer : config["colorMuxers"].Struct())
{