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

replace RESOURCE_NAMES where possible

Browse Source
This commit is contained in:
Laserlicht
2025-09-14 20:43:53 +02:00
parent 81c64ce54f
commit a54a1f8b8d
17 changed files with 76 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ResourceSet.cpp
View File

@@ -23,7 +23,7 @@ ResourceSet::ResourceSet() = default;
ResourceSet::ResourceSet(const JsonNode & node)
{
for(auto i = 0; i < GameConstants::RESOURCE_QUANTITY; i++)
container[i] = static_cast<int>(node[GameConstants::RESOURCE_NAMES[i]].Float());
container[i] = static_cast<int>(node[LIBRARY->resourceTypeHandler->getById(i)->getJsonKey()].Float());
}
void ResourceSet::serializeJson(JsonSerializeFormat & handler, const std::string & fieldName)
@@ -34,7 +34,7 @@ void ResourceSet::serializeJson(JsonSerializeFormat & handler, const std::string
//TODO: add proper support for mithril to map format
for(int idx = 0; idx < GameConstants::RESOURCE_QUANTITY - 1; idx ++)
handler.serializeInt(GameConstants::RESOURCE_NAMES[idx], this->operator[](idx), 0);
handler.serializeInt(LIBRARY->resourceTypeHandler->getById(idx)->getJsonKey(), this->operator[](idx), 0);
}
bool ResourceSet::nonZero() const