|
@@ -424,7 +424,7 @@ void CGDwelling::heroAcceptsCreatures( const CGHeroInstance *h) const
|
|
|
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);
|
|
|
if(!testSlot.validSlot()) //no available slot - try merging army of visiting hero
|