From cc12db0d1f2de3f4376439b0cb9cc5037618656c Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 9 Apr 2013 23:54:10 +0200 Subject: [PATCH] Reverted getTopMultiUseThing() change --- src/client/tile.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/tile.cpp b/src/client/tile.cpp index af10c38f..505b8410 100644 --- 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()) {