games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

introduce modScope into ObstacleInfo

Browse Source
This commit is contained in:
godric3
2024-08-12 13:57:27 +02:00
parent 07a1e9b768
commit 0ef42a1d3d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ObstacleHandler.cpp
View File

@@ -28,12 +28,12 @@ int32_t ObstacleInfo::getIconIndex() const
std::string ObstacleInfo::getJsonKey() const
{
return identifier;
return modScope + ':' + identifier;
}
std::string ObstacleInfo::getModScope() const
{
return "core";
return modScope;
}
std::string ObstacleInfo::getNameTranslated() const
@@ -96,6 +96,7 @@ std::shared_ptr<ObstacleInfo> ObstacleHandler::loadFromJson(const std::string &
auto info = std::make_shared<ObstacleInfo>(Obstacle(index), identifier);
info->modScope = scope;
info->animation = AnimationPath::fromJson(json["animation"]);
info->width = json["width"].Integer();
info->height = json["height"].Integer();

1
lib/ObstacleHandler.h
View File

@@ -31,6 +31,7 @@ public:
Obstacle obstacle;
si32 iconIndex;
std::string modScope;
std::string identifier;
AudioPath appearSound;
AnimationPath appearAnimation;