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

Fix crash on using two mods that add battlefield with same identifier

Browse Source
This commit is contained in:
Ivan Savenko
2024-01-05 15:58:25 +02:00
parent b5307948c5
commit fbdceb4f71
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/BattleFieldHandler.cpp
View File

@@ -21,6 +21,7 @@ BattleFieldInfo * BattleFieldHandler::loadFromJson(const std::string & scope, co
auto * info = new BattleFieldInfo(BattleField(index), identifier); auto * info = new BattleFieldInfo(BattleField(index), identifier);
info->modScope = scope;
info->graphics = ImagePath::fromJson(json["graphics"]); info->graphics = ImagePath::fromJson(json["graphics"]);
info->icon = json["icon"].String(); info->icon = json["icon"].String();
info->name = json["name"].String(); info->name = json["name"].String();
@@ -66,7 +67,7 @@ int32_t BattleFieldInfo::getIconIndex() const
std::string BattleFieldInfo::getJsonKey() const std::string BattleFieldInfo::getJsonKey() const
{ {
return identifier; return modScope + ':' + identifier;
} }
std::string BattleFieldInfo::getNameTextID() const std::string BattleFieldInfo::getNameTextID() const

1
lib/BattleFieldHandler.h
View File

@@ -27,6 +27,7 @@ public:
bool isSpecial; bool isSpecial;
ImagePath graphics; ImagePath graphics;
std::string name; std::string name;
std::string modScope;
std::string identifier; std::string identifier;
std::string icon; std::string icon;
si32 iconIndex; si32 iconIndex;