games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-13 13:18:43 +02:00
Code Issues Releases Activity

Fix h3 bug: icons of View Earth and View Air are swapped

Browse Source
This commit is contained in:
Ivan Savenko 2024-11-24 19:26:06 +00:00
parent a4417f3fc5
commit 2b692c2606
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Mods/vcmi/Content/Sprites/spells.json Normal file
View File

@ -0,0 +1,7 @@
{
"images" :
[
{ "frame" : 3, "defFile" : "spells.def", "defFrame" : 5},
{ "frame" : 5, "defFile" : "spells.def", "defFrame" : 3}
]
}

10
client/render/ImageLocator.cpp
View File

@ -15,15 +15,17 @@
#include "../../lib/json/JsonNode.h"
ImageLocator::ImageLocator(const JsonNode & config)
: image(ImagePath::fromJson(config["file"]))
, defFile(AnimationPath::fromJson(config["defFile"]))
, defFrame(config["defFrame"].Integer())
: defFrame(config["defFrame"].Integer())
, defGroup(config["defGroup"].Integer())
, verticalFlip(config["verticalFlip"].Bool())
, horizontalFlip(config["horizontalFlip"].Bool())
{
if(!config["file"].isNull())
image = ImagePath::fromJson(config["file"]);
if(!config["defFile"].isNull())
defFile = AnimationPath::fromJson(config["defFile"]);
}
ImageLocator::ImageLocator(const ImagePath & path)

8
client/renderSDL/RenderHandler.cpp
View File

@ -142,7 +142,13 @@ void RenderHandler::initFromJson(AnimationLayoutMap & source, const JsonNode & c
JsonNode toAdd = node;
JsonUtils::inherit(toAdd, base);
toAdd["file"].String() = basepath + node["file"].String();
if (toAdd.Struct().count("file"))
toAdd["file"].String() = basepath + node["file"].String();
if (toAdd.Struct().count("defFile"))
toAdd["defFile"].String() = basepath + node["defFile"].String();
source[group][frame] = ImageLocator(toAdd);
}
}