games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

vcmi: fix stack smash

Browse Source
This commit is contained in:
Konstantin 2023-04-02 23:27:15 +03:00
parent c661419897
commit f41b2475fe
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/ResourceSet.cpp
View File

@ -22,20 +22,20 @@ VCMI_LIB_NAMESPACE_BEGIN
Res::ResourceSet::ResourceSet(const JsonNode & node)
{
for(auto i = 0; i < GameConstants::RESOURCE_QUANTITY; i++)
this[i] = static_cast<int>(node[GameConstants::RESOURCE_NAMES[i]].Float());
container[i] = static_cast<int>(node[GameConstants::RESOURCE_NAMES[i]].Float());
}
Res::ResourceSet::ResourceSet(TResource wood, TResource mercury, TResource ore, TResource sulfur, TResource crystal,
TResource gems, TResource gold, TResource mithril)
{
this[Res::WOOD] = wood;
this[Res::MERCURY] = mercury;
this[Res::ORE] = ore;
this[Res::SULFUR] = sulfur;
this[Res::CRYSTAL] = crystal;
this[Res::GEMS] = gems;
this[Res::GOLD] = gold;
this[Res::MITHRIL] = mithril;
container[Res::WOOD] = wood;
container[Res::MERCURY] = mercury;
container[Res::ORE] = ore;
container[Res::SULFUR] = sulfur;
container[Res::CRYSTAL] = crystal;
container[Res::GEMS] = gems;
container[Res::GOLD] = gold;
container[Res::MITHRIL] = mithril;
}
void Res::ResourceSet::serializeJson(JsonSerializeFormat & handler, const std::string & fieldName)

6
lib/ResourceSet.h
View File

@ -36,7 +36,7 @@ namespace Res
class ResourceSet
{
private:
std::array<int, GameConstants::RESOURCE_QUANTITY> container;
std::array<TResource, GameConstants::RESOURCE_QUANTITY> container;
public:
// read resources set from json. Format example: { "gold": 500, "wood":5 }
DLL_LINKAGE ResourceSet(const JsonNode & node);
@ -105,12 +105,12 @@ namespace Res
TResource & operator[](size_t index)
{
return container[index];
return container.at(index);
}
const TResource & operator[](size_t index) const
{
return container[index];
return container.at(index);
}
bool empty () const