summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/adminhandler.cpp7
-rw-r--r--src/net/tmwa/buysellhandler.cpp11
-rw-r--r--src/net/tmwa/partyhandler.cpp5
3 files changed, 13 insertions, 10 deletions
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index c7b437944..c1cc349d4 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -22,12 +22,13 @@
#include "net/tmwa/adminhandler.h"
-#include "notifications.h"
#include "notifymanager.h"
#include "net/tmwa/messageout.h"
#include "net/tmwa/protocol.h"
+#include "resources/notifytypes.h"
+
#include <string>
#include "debug.h"
@@ -56,9 +57,9 @@ void AdminHandler::handleMessage(Net::MessageIn &msg)
{
case SMSG_ADMIN_KICK_ACK:
if (msg.readInt32() == 0)
- NotifyManager::notify(NotifyManager::KICK_FAIL);
+ NotifyManager::notify(NotifyTypes::KICK_FAIL);
else
- NotifyManager::notify(NotifyManager::KICK_SUCCEED);
+ NotifyManager::notify(NotifyTypes::KICK_SUCCEED);
break;
default:
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp
index 5cc23a786..c44b2ebbf 100644
--- a/src/net/tmwa/buysellhandler.cpp
+++ b/src/net/tmwa/buysellhandler.cpp
@@ -22,7 +22,6 @@
#include "net/tmwa/buysellhandler.h"
-#include "notifications.h"
#include "notifymanager.h"
#include "being/attributes.h"
@@ -34,6 +33,8 @@
#include "net/tmwa/protocol.h"
+#include "resources/notifytypes.h"
+
#include "debug.h"
extern Net::BuySellHandler *buySellHandler;
@@ -120,17 +121,17 @@ void BuySellHandler::processNpcSellResponse(Net::MessageIn &msg)
switch (msg.readInt8())
{
case 0:
- NotifyManager::notify(NotifyManager::SOLD);
+ NotifyManager::notify(NotifyTypes::SOLD);
break;
case 1:
default:
- NotifyManager::notify(NotifyManager::SELL_FAILED);
+ NotifyManager::notify(NotifyTypes::SELL_FAILED);
break;
case 2:
- NotifyManager::notify(NotifyManager::SELL_TRADE_FAILED);
+ NotifyManager::notify(NotifyTypes::SELL_TRADE_FAILED);
break;
case 3:
- NotifyManager::notify(NotifyManager::SELL_UNSELLABLE_FAILED);
+ NotifyManager::notify(NotifyTypes::SELL_UNSELLABLE_FAILED);
break;
}
}
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index ca11ccdf0..b0ab2dcef 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -22,7 +22,6 @@
#include "net/tmwa/partyhandler.h"
#include "actormanager.h"
-#include "notifications.h"
#include "notifymanager.h"
#include "party.h"
@@ -31,6 +30,8 @@
#include "net/tmwa/messageout.h"
#include "net/tmwa/protocol.h"
+#include "resources/notifytypes.h"
+
#include "debug.h"
extern Net::PartyHandler *partyHandler;
@@ -169,7 +170,7 @@ void PartyHandler::kick(const std::string &name) const
const PartyMember *const m = Ea::taParty->getMember(name);
if (!m)
{
- NotifyManager::notify(NotifyManager::PARTY_USER_NOT_IN_PARTY, name);
+ NotifyManager::notify(NotifyTypes::PARTY_USER_NOT_IN_PARTY, name);
return;
}