games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Fixes crash on dropping an artifact on an empty garrison slot;

Browse Source
This commit is contained in:
Fay
2015-01-24 00:21:18 +01:00
parent a90d603c16
commit 72f34a7799
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/widgets/CGarrisonInt.cpp
View File

@@ -239,6 +239,8 @@ void CGarrisonSlot::clickLeft(tribool down, bool previousState)
{
const CGHeroInstance *srcHero = commonInfo->src.AOH->getHero();
artSelected = true;
if (myStack) // try dropping the artifact only if the slot isn't empty
{
ArtifactLocation src(srcHero, commonInfo->src.slotID);
ArtifactLocation dst(myStack, ArtifactPosition::CREATURE_SLOT);
if (art->canBePutAt(dst, true))
@@ -253,6 +255,7 @@ void CGarrisonSlot::clickLeft(tribool down, bool previousState)
}
}
}
}
if (!artSelected && creature)
{
owner->selectSlot(this);