Move receive code from skillhandler into separate file.

1 files changed, 6 insertions, 174 deletions

diff --git a/src/net/tmwa/skillhandler.cpp b/src/net/tmwa/skillhandler.cpp
index 292e93d2d..33eb884d1 100644
--- a/src/net/tmwa/skillhandler.cpp
+++ b/src/net/tmwa/skillhandler.cpp
@@ -31,8 +31,11 @@
 
 #include "gui/windows/skilldialog.h"
 
+#include "net/ea/skillrecv.h"
+
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
+#include "net/tmwa/skillrecv.h"
 
 #include "utils/gettext.h"
 
@@ -64,15 +67,15 @@ void SkillHandler::handleMessage(Net::MessageIn &msg)
     switch (msg.getId())
     {
         case SMSG_PLAYER_SKILLS:
-            processPlayerSkills(msg);
+            SkillRecv::processPlayerSkills(msg);
             break;
 
         case SMSG_PLAYER_SKILL_UP:
-            processPlayerSkillUp(msg);
+            Ea::SkillRecv::processPlayerSkillUp(msg);
             break;
 
         case SMSG_SKILL_FAILED:
-            processSkillFailed(msg);
+            SkillRecv::processSkillFailed(msg);
             break;
 
         default:
@@ -119,175 +122,4 @@ void SkillHandler::useMap(const int id, const std::string &map) const
     outMsg.writeString(map, 16, "map name");
 }
 
-void SkillHandler::processPlayerSkills(Net::MessageIn &msg)
-{
-    msg.readInt16("len");
-    const int skillCount = (msg.getLength() - 4) / 37;
-    int updateSkill = 0;
-
-    for (int k = 0; k < skillCount; k++)
-    {
-        const int skillId = msg.readInt16("skill id");
-        const SkillType::SkillType inf = static_cast<SkillType::SkillType>(
-            msg.readInt16("inf"));
-        msg.readInt16("skill pool flags");
-        const int level = msg.readInt16("skill level");
-        const int sp = msg.readInt16("sp");
-        const int range = msg.readInt16("range");
-        msg.skip(24, "unused");
-        const Modifiable up = fromBool(msg.readUInt8("up flag"), Modifiable);
-        const int oldLevel = PlayerInfo::getSkillLevel(skillId);
-        if (oldLevel && oldLevel != level)
-            updateSkill = skillId;
-        PlayerInfo::setSkillLevel(skillId, level);
-        if (skillDialog)
-        {
-            if (!skillDialog->updateSkill(skillId, range, up, inf, sp))
-            {
-                skillDialog->addSkill(SkillOwner::Player,
-                    skillId, "", level, range, up, inf, sp);
-            }
-        }
-    }
-    if (skillDialog)
-    {
-        skillDialog->update();
-        if (updateSkill)
-            skillDialog->playUpdateEffect(updateSkill);
-    }
-}
-
-void SkillHandler::processSkillFailed(Net::MessageIn &msg)
-{
-    // Action failed (ex. sit because you have not reached the
-    // right level)
-    const int skillId   = msg.readInt16("skill id");
-    const int16_t bskill  = msg.readInt16("bskill");
-    msg.readInt16("btype");
-    const signed char success = msg.readUInt8("success");
-    const signed char reason  = msg.readUInt8("reason");
-    if (success != static_cast<int>(SKILL_FAILED)
-        && bskill == static_cast<int>(BSKILL_EMOTE))
-    {
-        logger->log("Action: %d/%d", bskill, success);
-    }
-
-    std::string txt;
-    if (success == static_cast<int>(SKILL_FAILED)
-        && skillId == static_cast<int>(SKILL_BASIC))
-    {
-        if (localPlayer && bskill == static_cast<int>(BSKILL_EMOTE)
-            && reason == static_cast<int>(RFAIL_SKILLDEP))
-        {
-            localPlayer->stopAdvert();
-        }
-
-        switch (bskill)
-        {
-            case BSKILL_TRADE:
-                // TRANSLATORS: error message
-                txt = _("Trade failed!");
-                break;
-            case BSKILL_EMOTE:
-                // TRANSLATORS: error message
-                txt = _("Emote failed!");
-                break;
-            case BSKILL_SIT:
-                // TRANSLATORS: error message
-                txt = _("Sit failed!");
-                break;
-            case BSKILL_CREATECHAT:
-                // TRANSLATORS: error message
-                txt = _("Chat creating failed!");
-                break;
-            case BSKILL_JOINPARTY:
-                // TRANSLATORS: error message
-                txt = _("Could not join party!");
-                break;
-            case BSKILL_SHOUT:
-                // TRANSLATORS: error message
-                txt = _("Cannot shout!");
-                break;
-            default:
-                UNIMPLIMENTEDPACKET;
-                break;
-        }
-
-        txt.append(" ");
-
-        switch (reason)
-        {
-            case RFAIL_SKILLDEP:
-                // TRANSLATORS: error message
-                txt.append(_("You have not yet reached a high enough lvl!"));
-                break;
-            case RFAIL_INSUFHP:
-                // TRANSLATORS: error message
-                txt.append(_("Insufficient HP!"));
-                break;
-            case RFAIL_INSUFSP:
-                // TRANSLATORS: error message
-                txt.append(_("Insufficient SP!"));
-                break;
-            case RFAIL_NOMEMO:
-                // TRANSLATORS: error message
-                txt.append(_("You have no memos!"));
-                break;
-            case RFAIL_SKILLDELAY:
-                // TRANSLATORS: error message
-                txt.append(_("You cannot do that right now!"));
-                break;
-            case RFAIL_ZENY:
-                // TRANSLATORS: error message
-                txt.append(_("Seems you need more money... ;-)"));
-                break;
-            case RFAIL_WEAPON:
-                // TRANSLATORS: error message
-                txt.append(_("You cannot use this skill with that "
-                    "kind of weapon!"));
-                break;
-            case RFAIL_REDGEM:
-                // TRANSLATORS: error message
-                txt.append(_("You need another red gem!"));
-                break;
-            case RFAIL_BLUEGEM:
-                // TRANSLATORS: error message
-                txt.append(_("You need another blue gem!"));
-                break;
-            case RFAIL_OVERWEIGHT:
-                // TRANSLATORS: error message
-                txt.append(_("You're carrying to much to do this!"));
-                break;
-            default:
-                // TRANSLATORS: error message
-                txt.append(_("Huh? What's that?"));
-                UNIMPLIMENTEDPACKET;
-                break;
-        }
-    }
-    else
-    {
-        switch (skillId)
-        {
-            case SKILL_WARP :
-                // TRANSLATORS: error message
-                txt = _("Warp failed...");
-                break;
-            case SKILL_STEAL :
-                // TRANSLATORS: error message
-                txt = _("Could not steal anything...");
-                break;
-            case SKILL_ENVENOM :
-                // TRANSLATORS: error message
-                txt = _("Poison had no effect...");
-                break;
-            default:
-                UNIMPLIMENTEDPACKET;
-                break;
-        }
-    }
-
-    NotifyManager::notify(NotifyTypes::SKILL_FAIL_MESSAGE, txt);
-}
-
 }  // namespace TmwAthena