Reverted getTopMultiUseThing() change

This commit is contained in:
Sam 2013-04-09 23:54:10 +02:00
parent 1ce6df99ac
commit cc12db0d1f
1 changed files with 3 additions and 3 deletions

View File

@ -449,15 +449,15 @@ ThingPtr Tile::getTopMultiUseThing()
if(isEmpty()) if(isEmpty())
return nullptr; return nullptr;
if(CreaturePtr topCreature = getTopCreature())
return topCreature;
for(uint i = 0; i < m_things.size(); ++i) { for(uint i = 0; i < m_things.size(); ++i) {
ThingPtr thing = m_things[i]; ThingPtr thing = m_things[i];
if(thing->isForceUse()) if(thing->isForceUse())
return thing; return thing;
} }
if(CreaturePtr topCreature = getTopCreature())
return topCreature;
for(uint i = 0; i < m_things.size(); ++i) { for(uint i = 0; i < m_things.size(); ++i) {
ThingPtr thing = m_things[i]; ThingPtr thing = m_things[i];
if(!thing->isGround() && !thing->isGroundBorder() && !thing->isOnBottom() && !thing->isOnTop()) { if(!thing->isGround() && !thing->isGroundBorder() && !thing->isOnBottom() && !thing->isOnTop()) {