From f924674239571a40b0806136a49b4da3edcadbbf Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 2 Dec 2014 19:05:34 +0300 Subject: Move weight notification from playerhander. --- src/net/ea/playerhandler.cpp | 49 -------------------------------------------- 1 file changed, 49 deletions(-) (limited to 'src/net/ea') diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 2835b3def..fa892af29 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -35,7 +35,6 @@ #include "gui/dialogtype.h" #include "gui/viewport.h" -#include "gui/windows/okdialog.h" #include "gui/windows/skilldialog.h" #include "gui/windows/statuswindow.h" @@ -43,8 +42,6 @@ #include "resources/map/map.h" -#include "listeners/weightlistener.h" - #include "net/messagein.h" #include "net/ea/eaprotocol.h" @@ -53,17 +50,10 @@ #include "debug.h" -extern int weightNoticeTime; - // Max. distance we are willing to scroll after a teleport; // everything beyond will reset the port hard. static const int MAP_TELEPORT_SCROLL_DISTANCE = 8; -namespace -{ - WeightListener weightListener; -} // anonymous namespace - namespace Ea { @@ -385,45 +375,6 @@ void PlayerHandler::setStat(const int type, PlayerInfo::getStatExperience(Attributes::JOB).first, base); break; case Ea::TOTAL_WEIGHT: - if (!weightNotice && config.getBoolValue("weightMsg")) - { - const int max = PlayerInfo::getAttribute( - Attributes::MAX_WEIGHT) / 2; - const int total = PlayerInfo::getAttribute( - Attributes::TOTAL_WEIGHT); - if (base >= max && total < max) - { - weightNoticeTime = cur_time + 5; - // TRANSLATORS: message header - weightNotice = new OkDialog(_("Message"), - // TRANSLATORS: weight message - _("You are carrying more than " - "half your weight. You are " - "unable to regain health."), - // TRANSLATORS: ok dialog button - _("OK"), - DialogType::OK, - false, true, nullptr, 260); - weightNotice->addActionListener( - &weightListener); - } - else if (base < max && total >= max) - { - weightNoticeTime = cur_time + 5; - // TRANSLATORS: message header - weightNotice = new OkDialog(_("Message"), - // TRANSLATORS: weight message - _("You are carrying less than " - "half your weight. You " - "can regain health."), - // TRANSLATORS: ok dialog button - _("OK"), - DialogType::OK, - false, true, nullptr, 260); - weightNotice->addActionListener( - &weightListener); - } - } PlayerInfo::setAttribute(Attributes::TOTAL_WEIGHT, base); break; case Ea::MAX_WEIGHT: -- cgit v1.2.3-60-g2f50