From 57978a09e9d32a44a95823716d790065d73f977a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 5 Sep 2014 12:08:28 +0300 Subject: Add skill type reading from server --- src/net/ea/skillhandler.cpp | 4 ++-- src/net/eathena/skillhandler.cpp | 6 +++--- src/net/tmwa/skillhandler.cpp | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/net') diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp index 5197cff30..f3c2a6982 100644 --- a/src/net/ea/skillhandler.cpp +++ b/src/net/ea/skillhandler.cpp @@ -88,8 +88,8 @@ void SkillHandler::processPlayerSkillUp(Net::MessageIn &msg) PlayerInfo::setSkillLevel(skillId, level); if (skillDialog) { - if (!skillDialog->updateSkill(skillId, range, up)) - skillDialog->addSkill(skillId, "", level, range, up); + if (!skillDialog->updateSkill(skillId, range, up, 0)) + skillDialog->addSkill(skillId, "", level, range, up, 0); } } diff --git a/src/net/eathena/skillhandler.cpp b/src/net/eathena/skillhandler.cpp index d9aedce2c..09580b8fc 100644 --- a/src/net/eathena/skillhandler.cpp +++ b/src/net/eathena/skillhandler.cpp @@ -107,7 +107,7 @@ void SkillHandler::processPlayerSkills(Net::MessageIn &msg) for (int k = 0; k < skillCount; k++) { const int skillId = msg.readInt16("skill id"); - msg.readInt32("inf"); // what is it? + const int inf = msg.readInt32("inf"); const int level = msg.readInt16("skill level"); msg.readInt16("sp"); const int range = msg.readInt16("range"); @@ -119,8 +119,8 @@ void SkillHandler::processPlayerSkills(Net::MessageIn &msg) PlayerInfo::setSkillLevel(skillId, level); if (skillDialog) { - if (!skillDialog->updateSkill(skillId, range, up)) - skillDialog->addSkill(skillId, name, level, range, up); + if (!skillDialog->updateSkill(skillId, range, up, inf)) + skillDialog->addSkill(skillId, name, level, range, up, inf); } } if (updateSkill && skillDialog) diff --git a/src/net/tmwa/skillhandler.cpp b/src/net/tmwa/skillhandler.cpp index b4a39d4e7..8b0d6f662 100644 --- a/src/net/tmwa/skillhandler.cpp +++ b/src/net/tmwa/skillhandler.cpp @@ -109,7 +109,7 @@ void SkillHandler::processPlayerSkills(Net::MessageIn &msg) for (int k = 0; k < skillCount; k++) { const int skillId = msg.readInt16(); - msg.readInt16(); // target type + const int inf = msg.readInt16(); msg.skip(2); // skill pool flags const int level = msg.readInt16(); msg.readInt16(); // sp @@ -122,8 +122,8 @@ void SkillHandler::processPlayerSkills(Net::MessageIn &msg) PlayerInfo::setSkillLevel(skillId, level); if (skillDialog) { - if (!skillDialog->updateSkill(skillId, range, up)) - skillDialog->addSkill(skillId, "", level, range, up); + if (!skillDialog->updateSkill(skillId, range, up, inf)) + skillDialog->addSkill(skillId, "", level, range, up, inf); } } if (updateSkill && skillDialog) -- cgit v1.2.3-70-g09d2