From a2ffd7da11831cc063f25ed6bb9f6be50c3b20e8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 9 Oct 2014 11:22:55 +0300 Subject: Add missing buy fail reasons. --- src/net/ea/buysellhandler.cpp | 32 ++++++++++++++++++++++++-------- src/resources/notifications.h | 12 ++++++++++++ src/resources/notifytypes.h | 3 +++ 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp index f2252d1fe..14378de4a 100644 --- a/src/net/ea/buysellhandler.cpp +++ b/src/net/ea/buysellhandler.cpp @@ -170,18 +170,34 @@ void BuySellHandler::processNpcSell(Net::MessageIn &msg) const void BuySellHandler::processNpcBuyResponse(Net::MessageIn &msg) const { - if (msg.readUInt8("response") == 0U) + const uint8_t response = msg.readUInt8("response"); + if (response == 0U) { NotifyManager::notify(NotifyTypes::BUY_DONE); + return; } - else + // Reset player money since buy dialog already assumed purchase + // would go fine + if (mBuyDialog) + mBuyDialog->setMoney(PlayerInfo::getAttribute(Attributes::MONEY)); + switch (response) { - // Reset player money since buy dialog already assumed purchase - // would go fine - if (mBuyDialog) - mBuyDialog->setMoney(PlayerInfo::getAttribute(Attributes::MONEY)); - NotifyManager::notify(NotifyTypes::BUY_FAILED); - } + case 1: + NotifyManager::notify(NotifyTypes::BUY_FAILED_NO_MONEY); + break; + + case 2: + NotifyManager::notify(NotifyTypes::BUY_FAILED_OVERWEIGHT); + break; + + case 3: + NotifyManager::notify(NotifyTypes::BUY_FAILED_TOO_MANY_ITEMS); + break; + + default: + NotifyManager::notify(NotifyTypes::BUY_FAILED); + break; + }; } } // namespace Ea diff --git a/src/resources/notifications.h b/src/resources/notifications.h index 2cfeca286..05ef0f50c 100644 --- a/src/resources/notifications.h +++ b/src/resources/notifications.h @@ -42,6 +42,18 @@ namespace NotifyManager // TRANSLATORS: notification message N_("Unable to buy."), NotifyFlags::EMPTY}, + {"buy fail no money", + // TRANSLATORS: notification message + N_("Unable to buy. You not have enought money."), + NotifyFlags::EMPTY}, + {"buy fail overweight", + // TRANSLATORS: notification message + N_("Unable to buy. You overweight."), + NotifyFlags::EMPTY}, + {"buy fail too many items", + // TRANSLATORS: notification message + N_("Unable to buy. You have too many items."), + NotifyFlags::EMPTY}, {"sell empty", // TRANSLATORS: notification message N_("Nothing to sell."), diff --git a/src/resources/notifytypes.h b/src/resources/notifytypes.h index be3af93b8..e3f528e43 100644 --- a/src/resources/notifytypes.h +++ b/src/resources/notifytypes.h @@ -30,6 +30,9 @@ namespace NotifyTypes NONE = 0, BUY_DONE, BUY_FAILED, + BUY_FAILED_NO_MONEY, + BUY_FAILED_OVERWEIGHT, + BUY_FAILED_TOO_MANY_ITEMS, SELL_LIST_EMPTY, SOLD, SELL_FAILED, -- cgit v1.2.3-70-g09d2