diff --git a/src/game/game.cpp b/src/game/game.cpp index 6e731f78feb..ddccb42dbcf 100644 --- a/src/game/game.cpp +++ b/src/game/game.cpp @@ -1619,7 +1619,7 @@ void Game::playerMoveItem(std::shared_ptr player, const Position &fromPo auto toHouseTile = map.getTile(mapToPos)->dynamic_self_cast(); auto fromHouseTile = map.getTile(mapFromPos)->dynamic_self_cast(); if (fromHouseTile && (!toHouseTile || toHouseTile->getHouse()->getId() != fromHouseTile->getHouse()->getId())) { - player->sendCancelMessage("You can't move this item outside a house."); + player->sendCancelMessage("You cannot move this item out of this house."); return; } } @@ -1666,12 +1666,12 @@ ReturnValue Game::checkMoveItemToCylinder(std::shared_ptr player, std::s bool allowAnything = g_configManager().getBoolean(TOGGLE_GOLD_POUCH_ALLOW_ANYTHING, __FUNCTION__); if (!allowAnything && item->getID() != ITEM_GOLD_COIN && item->getID() != ITEM_PLATINUM_COIN && item->getID() != ITEM_CRYSTAL_COIN) { - return RETURNVALUE_CONTAINERNOTENOUGHROOM; + return RETURNVALUE_ITEMCANNOTBEMOVEDPOUCH; } - // prevent move up + // prevent move up from ponch to store inbox. if (!item->canBeMovedToStore() && fromCylinder->getContainer() && fromCylinder->getContainer()->getID() == ITEM_GOLD_POUCH) { - return RETURNVALUE_CONTAINERNOTENOUGHROOM; + return RETURNVALUE_NOTBOUGHTINSTORE; } return RETURNVALUE_NOERROR; @@ -1681,7 +1681,7 @@ ReturnValue Game::checkMoveItemToCylinder(std::shared_ptr player, std::s const auto parentContainer = topParentContainer->getParent() ? topParentContainer->getParent()->getContainer() : nullptr; auto isStoreInbox = parentContainer && parentContainer->isStoreInbox(); if (!item->canBeMovedToStore() && (containerID == ITEM_STORE_INBOX || isStoreInbox)) { - return RETURNVALUE_CONTAINERNOTENOUGHROOM; + return RETURNVALUE_NOTBOUGHTINSTORE; } if (item->isStoreItem()) { @@ -1705,7 +1705,7 @@ ReturnValue Game::checkMoveItemToCylinder(std::shared_ptr player, std::s } if (!isValidMoveItem) { - return RETURNVALUE_NOTPOSSIBLE; + return RETURNVALUE_ITEMCANNOTBEMOVEDTHERE; } if (item->hasOwner() && !item->isOwner(player)) { @@ -1738,7 +1738,7 @@ ReturnValue Game::checkMoveItemToCylinder(std::shared_ptr player, std::s } if (item->isStoreItem() && !house) { - return RETURNVALUE_NOTPOSSIBLE; + return RETURNVALUE_ITEMCANNOTBEMOVEDTHERE; } } }