From a51da75e329df773a01e963c3a27e72cf487138c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 6 Jun 2014 22:41:39 +0300 Subject: fix code style. --- src/net/ea/playerhandler.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/net/ea/playerhandler.cpp') diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 0ed9f9a18..9e2a0dfb3 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -25,7 +25,6 @@ #include "configuration.h" #include "game.h" #include "party.h" -#include "notifications.h" #include "notifymanager.h" #include "units.h" @@ -38,6 +37,8 @@ #include "gui/windows/skilldialog.h" #include "gui/windows/statuswindow.h" +#include "resources/notifytypes.h" + #include "resources/db/deaddb.h" #include "resources/map/map.h" @@ -50,6 +51,8 @@ #include "net/ea/eaprotocol.h" +#include "utils/gettext.h" + #include "debug.h" extern int weightNoticeTime; @@ -395,12 +398,12 @@ void PlayerHandler::processPlayerStatUpdate2(Net::MessageIn &msg) const int newMoney = msg.readInt32(); if (newMoney > oldMoney) { - NotifyManager::notify(NotifyManager::MONEY_GET, + NotifyManager::notify(NotifyTypes::MONEY_GET, Units::formatCurrency(newMoney - oldMoney)); } else if (newMoney < oldMoney) { - NotifyManager::notify(NotifyManager::MONEY_SPENT, + NotifyManager::notify(NotifyTypes::MONEY_SPENT, Units::formatCurrency(oldMoney - newMoney).c_str()); } @@ -448,7 +451,7 @@ void PlayerHandler::processPlayerStatUpdate4(Net::MessageIn &msg) const int points = PlayerInfo::getAttribute(Attributes::CHAR_POINTS) + oldValue - value; PlayerInfo::setAttribute(Attributes::CHAR_POINTS, points); - NotifyManager::notify(NotifyManager::SKILL_RAISE_ERROR); + NotifyManager::notify(NotifyTypes::SKILL_RAISE_ERROR); } PlayerInfo::setStatBase(type, value); @@ -571,7 +574,7 @@ void PlayerHandler::processPlayerArrowMessage(Net::MessageIn &msg) switch (type) { case 0: - NotifyManager::notify(NotifyManager::ARROWS_EQUIP_NEEDED); + NotifyManager::notify(NotifyTypes::ARROWS_EQUIP_NEEDED); break; case 3: // arrows equiped -- cgit v1.2.3-60-g2f50