Merge pull request #484 from LordHepipud/patch-3
Fix Tile::getTopUseThing()
This commit is contained in:
commit
ce411ec871
|
@ -399,13 +399,13 @@ ThingPtr Tile::getTopUseThing()
|
|||
|
||||
for(uint i = 0; i < m_things.size(); ++i) {
|
||||
ThingPtr thing = m_things[i];
|
||||
if(thing->isForceUse() || (!thing->isGround() && !thing->isGroundBorder() && !thing->isOnBottom() && !thing->isOnTop() && !thing->isCreature()))
|
||||
if (thing->isForceUse() || (!thing->isGround() && !thing->isGroundBorder() && !thing->isOnBottom() && !thing->isOnTop() && !thing->isCreature() && !thing->isSplash()))
|
||||
return thing;
|
||||
}
|
||||
|
||||
for(uint i = 0; i < m_things.size(); ++i) {
|
||||
ThingPtr thing = m_things[i];
|
||||
if(!thing->isGround() && !thing->isGroundBorder() && !thing->isCreature())
|
||||
if (!thing->isGround() && !thing->isGroundBorder() && !thing->isCreature() && !thing->isSplash())
|
||||
return thing;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue