games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00
Code Issues Releases Activity

Cherry-picked essential fix from #631. This fixes https://bugs.vcmi.eu/view.php?id=3074.

Browse Source
This commit is contained in:
AlexVinS 2020-03-18 00:06:07 +03:00
parent dca5d86e7a
commit 55b54024a8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/windows/CHeroWindow.cpp
View File

@ -52,10 +52,11 @@ const TBonusListPtr CHeroWithMaybePickedArtifact::getAllBonuses(const CSelector
else else
bonusesFromPickedUpArtifact = TBonusListPtr(new BonusList()); bonusesFromPickedUpArtifact = TBonusListPtr(new BonusList());
for(auto b : *bonusesFromPickedUpArtifact)
*heroBonuses -= b;
for(auto b : *heroBonuses) for(auto b : *heroBonuses)
out->push_back(b); out->push_back(b);
for(auto b : *bonusesFromPickedUpArtifact)
*out -= b;
return out; return out;
} }