summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-05 12:08:28 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-06 01:18:57 +0300
commit57978a09e9d32a44a95823716d790065d73f977a (patch)
tree0d89ebeebb91b86fd2c16fa9066b5a08fd7e4f73 /src/net
parent3b1d570f626786d141d99a7923669e82e0c125ca (diff)
downloadmanaverse-57978a09e9d32a44a95823716d790065d73f977a.tar.gz
manaverse-57978a09e9d32a44a95823716d790065d73f977a.tar.bz2
manaverse-57978a09e9d32a44a95823716d790065d73f977a.tar.xz
manaverse-57978a09e9d32a44a95823716d790065d73f977a.zip
Add skill type reading from server
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/skillhandler.cpp4
-rw-r--r--src/net/eathena/skillhandler.cpp6
-rw-r--r--src/net/tmwa/skillhandler.cpp6
3 files changed, 8 insertions, 8 deletions
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)