Browse Source

Fixes #181 and fixes #551

BenDol 6 years ago
parent
commit
900ebbd985
2 changed files with 3 additions and 3 deletions
  1. 1
    1
      src/client/game.cpp
  2. 2
    2
      src/client/tile.cpp

+ 1
- 1
src/client/game.cpp View File

@@ -860,7 +860,7 @@ void Game::useWith(const ItemPtr& item, const ThingPtr& toThing)
860 860
 
861 861
     Position pos = item->getPosition();
862 862
     if(!pos.isValid()) // virtual item
863
-        pos = Position(0xFFFF, 0, 0); // means that is a item in inventory
863
+        pos = Position(0xFFFF, 0, 0); // means that is an item in inventory
864 864
 
865 865
     m_protocolGame->sendUseItemWith(pos, item->getId(), item->getStackPos(), toThing->getPosition(), toThing->getId(), toThing->getStackPos());
866 866
 }

+ 2
- 2
src/client/tile.cpp View File

@@ -485,7 +485,7 @@ ThingPtr Tile::getTopMultiUseThing()
485 485
 
486 486
     for(uint i = 0; i < m_things.size(); ++i) {
487 487
         ThingPtr thing = m_things[i];
488
-        if(!thing->isGround() && !thing->isGroundBorder() && !thing->isOnBottom() && !thing->isOnTop()) {
488
+        if(!thing->isGround() && !thing->isOnBottom() && !thing->isOnTop()) {
489 489
             if(i > 0 && thing->isSplash())
490 490
                 return m_things[i-1];
491 491
             return thing;
@@ -494,7 +494,7 @@ ThingPtr Tile::getTopMultiUseThing()
494 494
 
495 495
     for(uint i = 0; i < m_things.size(); ++i) {
496 496
         ThingPtr thing = m_things[i];
497
-        if(!thing->isGround() && !thing->isGroundBorder() && !thing->isOnTop())
497
+        if(!thing->isGround() && !thing->isOnTop())
498 498
             return thing;
499 499
     }
500 500
 

Loading…
Cancel
Save