games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

Fixed crash on joining units that we already have in our army.

Browse Source
This commit is contained in:
DjWarmonger 2011-06-23 10:12:35 +00:00
parent d9a9477cb4
commit 5f53531f4b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/CObjectHandler.cpp
View File

@ -3153,7 +3153,7 @@ void CGCreature::joinDecision(const CGHeroInstance *h, int cost, ui32 accept) co
if(cost)
cb->giveResource(h->tempOwner,6,-cost);
cb->tryJoiningArmy(this, h, true, false);
cb->tryJoiningArmy(this, h, true, true);
}
}