1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-03 00:46:55 +02:00

Mostly done combined artifacts.

[assembling, disassembling, moving, picking]
This commit is contained in:
Michał W. Urbańczyk
2011-01-23 23:49:17 +00:00
parent 3fde9e45df
commit e6d577c233
9 changed files with 83 additions and 29 deletions

View File

@ -7005,10 +7005,10 @@ const ArtSlotInfo * CArtifactSet::getSlot(ui16 pos) const
return NULL;
}
bool CArtifactSet::isPositionFree(ui16 pos) const
bool CArtifactSet::isPositionFree(ui16 pos, bool onlyLockCheck /*= false*/) const
{
if(const ArtSlotInfo *s = getSlot(pos))
return !s->artifact && !s->locked;
return (onlyLockCheck || !s->artifact) && !s->locked;
return true; //no slot means not used
}