summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-09 17:18:33 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-09 17:18:33 +0300
commitfa74e7c9b1e51d696ded77363d441f0e966ca1ad (patch)
tree29a03133071afa776ae34d824bc19b8f94d6c4b6
parent3ed77b00b2a15aa478de49b7d8382d7a99930e73 (diff)
downloadmv-fa74e7c9b1e51d696ded77363d441f0e966ca1ad.tar.gz
mv-fa74e7c9b1e51d696ded77363d441f0e966ca1ad.tar.bz2
mv-fa74e7c9b1e51d696ded77363d441f0e966ca1ad.tar.xz
mv-fa74e7c9b1e51d696ded77363d441f0e966ca1ad.zip
Add missing trade errors.
-rw-r--r--src/net/ea/tradehandler.cpp4
-rw-r--r--src/resources/notifications.h4
-rw-r--r--src/resources/notifytypes.h1
3 files changed, 9 insertions, 0 deletions
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index 482179bd1..2e9e5db56 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -124,6 +124,10 @@ void TradeHandler::processTradeResponseContinue(const uint8_t type) const
}
PlayerInfo::setTrading(false);
break;
+ case 5:
+ NotifyManager::notify(NotifyTypes::TRADE_CANCELLED_BUSY,
+ tradePartnerName);
+ break;
default: // Shouldn't happen as well, but to be sure
NotifyManager::notify(NotifyTypes::TRADE_ERROR_UNKNOWN,
tradePartnerName);
diff --git a/src/resources/notifications.h b/src/resources/notifications.h
index 0c394cea1..ea96e2eb7 100644
--- a/src/resources/notifications.h
+++ b/src/resources/notifications.h
@@ -271,6 +271,10 @@ namespace NotifyManager
// TRANSLATORS: notification message
N_("Trade with %s cancelled."),
NotifyFlags::STRING},
+ {"trade cancelled busy",
+ // TRANSLATORS: notification message
+ N_("Trade with %s cancelled, because player is busy"),
+ NotifyFlags::STRING},
{"trade error unknown",
// TRANSLATORS: notification message
N_("Unhandled trade cancel packet with %s"),
diff --git a/src/resources/notifytypes.h b/src/resources/notifytypes.h
index cb26fa5c4..3a0ca731b 100644
--- a/src/resources/notifytypes.h
+++ b/src/resources/notifytypes.h
@@ -87,6 +87,7 @@ namespace NotifyTypes
TRADE_FAIL_CHAR_NOT_EXISTS,
TRADE_CANCELLED_ERROR,
TRADE_CANCELLED_NAME,
+ TRADE_CANCELLED_BUSY,
TRADE_ERROR_UNKNOWN,
TRADE_ADD_PARTNER_OVER_WEIGHT,
TRADE_ADD_PARTNER_NO_SLOTS,