1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
This commit is contained in:
Ivan Savenko 2024-07-27 16:46:46 +00:00
parent ea93da62da
commit b6c22b2053

View File

@ -424,7 +424,7 @@ void CGDwelling::heroAcceptsCreatures( const CGHeroInstance *h) const
if(count) //there are available creatures if(count) //there are available creatures
{ {
if (VLC->settings()->getBoolean(EGameSettings::DWELLINGS_ACCUMULATE_WHEN_OWNED)) if (VLC->settings()->getBoolean(EGameSettings::DWELLINGS_MERGE_ON_RECRUIT))
{ {
SlotID testSlot = h->getSlotFor(crid); SlotID testSlot = h->getSlotFor(crid);
if(!testSlot.validSlot()) //no available slot - try merging army of visiting hero if(!testSlot.validSlot()) //no available slot - try merging army of visiting hero