From 900ebbd985200e2ab52c77d900d6174255f04023 Mon Sep 17 00:00:00 2001 From: BenDol Date: Tue, 27 Jan 2015 22:11:27 +1300 Subject: [PATCH] Fixes #181 and fixes #551 --- src/client/game.cpp | 2 +- src/client/tile.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/game.cpp b/src/client/game.cpp index 688b0960..1cb8d395 100644 --- a/src/client/game.cpp +++ b/src/client/game.cpp @@ -860,7 +860,7 @@ void Game::useWith(const ItemPtr& item, const ThingPtr& toThing) Position pos = item->getPosition(); if(!pos.isValid()) // virtual item - pos = Position(0xFFFF, 0, 0); // means that is a item in inventory + pos = Position(0xFFFF, 0, 0); // means that is an item in inventory m_protocolGame->sendUseItemWith(pos, item->getId(), item->getStackPos(), toThing->getPosition(), toThing->getId(), toThing->getStackPos()); } diff --git a/src/client/tile.cpp b/src/client/tile.cpp index 548a3335..c5e41c96 100644 --- a/src/client/tile.cpp +++ b/src/client/tile.cpp @@ -485,7 +485,7 @@ ThingPtr Tile::getTopMultiUseThing() for(uint i = 0; i < m_things.size(); ++i) { ThingPtr thing = m_things[i]; - if(!thing->isGround() && !thing->isGroundBorder() && !thing->isOnBottom() && !thing->isOnTop()) { + if(!thing->isGround() && !thing->isOnBottom() && !thing->isOnTop()) { if(i > 0 && thing->isSplash()) return m_things[i-1]; return thing; @@ -494,7 +494,7 @@ ThingPtr Tile::getTopMultiUseThing() for(uint i = 0; i < m_things.size(); ++i) { ThingPtr thing = m_things[i]; - if(!thing->isGround() && !thing->isGroundBorder() && !thing->isOnTop()) + if(!thing->isGround() && !thing->isOnTop()) return thing; }