summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-03-09 16:38:40 +0300
committerAndrei Karas <akaras@inbox.ru>2013-03-09 16:38:40 +0300
commit834f1f74a3e16c3fa8ccc2593d049a0c3201b659 (patch)
tree67df0ab79e5a8dc0131d623e7e688f8ac5e3d0a5
parent25da12e98285c44279d24ee77a08bd5f563d8ad0 (diff)
downloadmv-834f1f74a3e16c3fa8ccc2593d049a0c3201b659.tar.gz
mv-834f1f74a3e16c3fa8ccc2593d049a0c3201b659.tar.bz2
mv-834f1f74a3e16c3fa8ccc2593d049a0c3201b659.tar.xz
mv-834f1f74a3e16c3fa8ccc2593d049a0c3201b659.zip
Add new notifications to other classes.
-rw-r--r--src/net/ea/skillhandler.cpp4
-rw-r--r--src/net/eathena/adminhandler.cpp1
-rw-r--r--src/net/tmwa/adminhandler.cpp1
-rw-r--r--src/notifications.h4
4 files changed, 6 insertions, 4 deletions
diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp
index 51dc85461..35d8d61dc 100644
--- a/src/net/ea/skillhandler.cpp
+++ b/src/net/ea/skillhandler.cpp
@@ -24,6 +24,7 @@
#include "logger.h"
#include "localplayer.h"
+#include "notifymanager.h"
#include "playerinfo.h"
#include "gui/skilldialog.h"
@@ -238,7 +239,6 @@ void SkillHandler::processSkillFailed(Net::MessageIn &msg)
}
}
- if (localChatTab)
- localChatTab->chatLog(txt);
+ NotifyManager::notify(NotifyManager::SKILL_FAIL_MESSAGE, txt);
}
} // namespace Ea
diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp
index ba9551dc1..d0c763be4 100644
--- a/src/net/eathena/adminhandler.cpp
+++ b/src/net/eathena/adminhandler.cpp
@@ -23,7 +23,6 @@
#include "net/eathena/adminhandler.h"
#include "actorspritemanager.h"
-#include "depricatedevent.h"
#include "game.h"
#include "notifymanager.h"
#include "playerrelations.h"
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index 6f356c871..7e5e582c0 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -23,7 +23,6 @@
#include "net/tmwa/adminhandler.h"
#include "actorspritemanager.h"
-#include "depricatedevent.h"
#include "game.h"
#include "notifymanager.h"
#include "playerrelations.h"
diff --git a/src/notifications.h b/src/notifications.h
index 6644d8ffe..f1df9f020 100644
--- a/src/notifications.h
+++ b/src/notifications.h
@@ -44,6 +44,7 @@ namespace NotifyManager
enum NotifyTypes
{
+ NONE,
BUY_DONE,
BUY_FAILED,
SELL_LIST_EMPTY,
@@ -107,12 +108,14 @@ namespace NotifyManager
WHISPERS_IGNORE_FAILED,
WHISPERS_UNIGNORED,
WHISPERS_UNIGNORE_FAILED,
+ SKILL_FAIL_MESSAGE,
TYPE_END
};
static const NotificationInfo notifications[] =
{
+ {"", EMPTY},
{N_("Thanks for buying."), EMPTY},
{N_("Unable to buy."), EMPTY},
{N_("Nothing to sell."), EMPTY},
@@ -177,6 +180,7 @@ namespace NotifyManager
{N_("All whispers ignore failed."), EMPTY},
{N_("All whispers unignored."), EMPTY},
{N_("All whispers unignore failed."), EMPTY},
+ {N_("%s"), STRING},
};
}
#endif