fix object menu order

master
Henrique Santiago 13 years ago
parent 17c903d66c
commit c6c71a3426

@ -202,7 +202,7 @@ ThingPtr Tile::getTopLookThing()
if(isEmpty()) if(isEmpty())
return nullptr; return nullptr;
for(int i = m_things.size() - 1; i >= 0; --i) { for(uint i = 0; i < m_things.size(); ++i) {
ThingPtr thing = m_things[i]; ThingPtr thing = m_things[i];
if(!thing->ignoreLook() && (!thing->isGround() && !thing->isGroundBorder() && !thing->isOnBottom() && !thing->isOnTop())) if(!thing->ignoreLook() && (!thing->isGround() && !thing->isGroundBorder() && !thing->isOnBottom() && !thing->isOnTop()))
return thing; return thing;
@ -216,9 +216,9 @@ ThingPtr Tile::getTopUseThing()
if(isEmpty()) if(isEmpty())
return nullptr; return nullptr;
for(int i = m_things.size() - 1; i >= 0; --i) { for(uint i = 0; i < m_things.size(); ++i) {
ThingPtr thing = m_things[i]; ThingPtr thing = m_things[i];
if(thing->isForceUse() || (!thing->isGround() && !thing->isGroundBorder() && !thing->isOnBottom() && !thing->isOnTop())) if(thing->isForceUse() || (!thing->isGround() && !thing->isGroundBorder() && !thing->isOnBottom() && !thing->isOnTop() && !thing->asCreature()))
return thing; return thing;
} }
@ -228,7 +228,7 @@ ThingPtr Tile::getTopUseThing()
CreaturePtr Tile::getTopCreature() CreaturePtr Tile::getTopCreature()
{ {
CreaturePtr creature; CreaturePtr creature;
for(int i = m_things.size() - 1; i >= 0; --i) { for(uint i = 0; i < m_things.size(); ++i) {
ThingPtr thing = m_things[i]; ThingPtr thing = m_things[i];
if(thing->asLocalPlayer()) // return local player if there aint no other creature. if(thing->asLocalPlayer()) // return local player if there aint no other creature.
creature = thing->asCreature(); creature = thing->asCreature();

Loading…
Cancel
Save