summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-09 15:27:42 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-09 15:27:42 +0300
commit84f1e19691aa83f0bd73d63d08de2a0baa5596bd (patch)
treeb2a260fd3c51b61e1ae9e530adc093561a95aaca
parenta2ffd7da11831cc063f25ed6bb9f6be50c3b20e8 (diff)
downloadplus-84f1e19691aa83f0bd73d63d08de2a0baa5596bd.tar.gz
plus-84f1e19691aa83f0bd73d63d08de2a0baa5596bd.tar.bz2
plus-84f1e19691aa83f0bd73d63d08de2a0baa5596bd.tar.xz
plus-84f1e19691aa83f0bd73d63d08de2a0baa5596bd.zip
eathena: add missing equip error messages.
-rw-r--r--src/net/eathena/inventoryhandler.cpp18
-rw-r--r--src/resources/notifications.h4
-rw-r--r--src/resources/notifytypes.h1
3 files changed, 19 insertions, 4 deletions
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 7605e9177..11cc8f311 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -486,10 +486,20 @@ void InventoryHandler::processPlayerEquip(Net::MessageIn &msg)
msg.readInt16("sprite");
const uint8_t flag = msg.readUInt8("result");
- if (flag)
- NotifyManager::notify(NotifyTypes::EQUIP_FAILED);
- else
- mEquips.setEquipment(getSlot(equipType), index);
+ switch (flag)
+ {
+ case 0:
+ mEquips.setEquipment(getSlot(equipType), index);
+ break;
+ case 1:
+ NotifyManager::notify(NotifyTypes::EQUIP_FAILED_LEVEL);
+ break;
+
+ case 2:
+ default:
+ NotifyManager::notify(NotifyTypes::EQUIP_FAILED);
+ break;
+ }
BLOCK_END("InventoryHandler::processPlayerEquip")
}
diff --git a/src/resources/notifications.h b/src/resources/notifications.h
index 05ef0f50c..0c394cea1 100644
--- a/src/resources/notifications.h
+++ b/src/resources/notifications.h
@@ -138,6 +138,10 @@ namespace NotifyManager
// TRANSLATORS: notification message
N_("Unable to equip."),
NotifyFlags::EMPTY},
+ {"equip failed level",
+ // TRANSLATORS: notification message
+ N_("Unable to equip because you have wrong level."),
+ NotifyFlags::EMPTY},
{"party create failed",
// TRANSLATORS: notification message
N_("Could not create party."),
diff --git a/src/resources/notifytypes.h b/src/resources/notifytypes.h
index e3f528e43..cb26fa5c4 100644
--- a/src/resources/notifytypes.h
+++ b/src/resources/notifytypes.h
@@ -54,6 +54,7 @@ namespace NotifyTypes
GUILD_USER_KICKED,
USE_FAILED,
EQUIP_FAILED,
+ EQUIP_FAILED_LEVEL,
PARTY_CREATE_FAILED,
PARTY_CREATED,
PARTY_LEFT,