Reverted getTopMultiUseThing() change

11 years ago · cc12db0d1f
parent 1ce6df99ac
commit cc12db0d1f
1 changed files with 3 additions and 3 deletions
--- a/src/client/tile.cpp
+++ b/src/client/tile.cpp
@ -449,15 +449,15 @@ ThingPtr Tile::getTopMultiUseThing()
    if(isEmpty())
        return nullptr;

+    if(CreaturePtr topCreature = getTopCreature())
+        return topCreature;
+
    for(uint i = 0; i < m_things.size(); ++i) {
        ThingPtr thing = m_things[i];
        if(thing->isForceUse())
            return thing;
    }
    
-    if(CreaturePtr topCreature = getTopCreature())
-        return topCreature;
-
    for(uint i = 0; i < m_things.size(); ++i) {
        ThingPtr thing = m_things[i];
        if(!thing->isGround() && !thing->isGroundBorder() && !thing->isOnBottom() && !thing->isOnTop()) {