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

Merged the 092c-compat branch.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2013-09-28 12:31:06 +00:00
parent 0abbe71b25
commit 30a0237fb8
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/CCreatureSet.cpp
View File

@@ -420,11 +420,13 @@ bool CCreatureSet::canBeMergedWith(const CCreatureSet &cs, bool allowMergingStac
else
{
CCreatureSet cres;
SlotID j;
//get types of creatures that need their own slot
for(auto & elem : cs.stacks)
cres.addToSlot(elem.first, elem.second->type->idNumber, 1, true);
SlotID j;
if ((j = cres.getSlotFor(elem.second->type)).validSlot())
cres.addToSlot(j, elem.second->type->idNumber, 1, true); //merge if possible
//cres.addToSlot(elem.first, elem.second->type->idNumber, 1, true);
for(auto & elem : stacks)
{
if ((j = cres.getSlotFor(elem.second->type)).validSlot())