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

Stacks of armed instance are now unique_ptr

Browse Source
This commit is contained in:
Ivan Savenko
2025-03-17 21:11:06 +00:00
parent bdae7285ae
commit c02a8a84fd
33 changed files with 101 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/mapObjects/CGCreature.cpp
View File

@@ -454,7 +454,7 @@ void CGCreature::joinDecision(const CGHeroInstance *h, int cost, ui32 accept) co
giveReward(h);
for(std::pair<const SlotID, CStackInstance*> stack : this->stacks)
for(auto & stack : this->stacks)
stack.second->count = getJoiningAmount();
cb->tryJoiningArmy(this, h, true, true);
@@ -672,10 +672,10 @@ void CGCreature::serializeJsonOptions(JsonSerializeFormat & handler)
{
si32 amount = 0;
handler.serializeInt("amount", amount);
auto * hlp = new CStackInstance();
auto hlp = std::make_unique<CStackInstance>();
hlp->count = amount;
//type will be set during initialization
putStack(SlotID(0), hlp);
putStack(SlotID(0), std::move(hlp));
}
resources.serializeJson(handler, "rewardResources");