Merge pull request #725 from ottools/master
Fix 'getTopMultiUseThing' returning border items. Closes #644
This commit is contained in:
commit
fa3068f6e6
|
@ -485,7 +485,7 @@ ThingPtr Tile::getTopMultiUseThing()
|
||||||
|
|
||||||
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->isOnBottom() && !thing->isOnTop()) {
|
if(!thing->isGround() && !thing->isGroundBorder() && !thing->isOnBottom() && !thing->isOnTop()) {
|
||||||
if(i > 0 && thing->isSplash())
|
if(i > 0 && thing->isSplash())
|
||||||
return m_things[i-1];
|
return m_things[i-1];
|
||||||
return thing;
|
return thing;
|
||||||
|
|
Loading…
Reference in New Issue