summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-05 12:20:58 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-06 01:18:57 +0300
commit2cdf1b18d5593dfecacfc7b2e113c404dc64d1f4 (patch)
tree2c0feb59deb99dbd45338ed813177c6826b543fb /src/net
parent57978a09e9d32a44a95823716d790065d73f977a (diff)
downloadplus-2cdf1b18d5593dfecacfc7b2e113c404dc64d1f4.tar.gz
plus-2cdf1b18d5593dfecacfc7b2e113c404dc64d1f4.tar.bz2
plus-2cdf1b18d5593dfecacfc7b2e113c404dc64d1f4.tar.xz
plus-2cdf1b18d5593dfecacfc7b2e113c404dc64d1f4.zip
Use skill type struct in skill info.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/skillhandler.cpp7
-rw-r--r--src/net/eathena/skillhandler.cpp3
-rw-r--r--src/net/tmwa/skillhandler.cpp3
3 files changed, 9 insertions, 4 deletions
diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp
index f3c2a6982..8a7f42d82 100644
--- a/src/net/ea/skillhandler.cpp
+++ b/src/net/ea/skillhandler.cpp
@@ -88,8 +88,11 @@ void SkillHandler::processPlayerSkillUp(Net::MessageIn &msg)
PlayerInfo::setSkillLevel(skillId, level);
if (skillDialog)
{
- if (!skillDialog->updateSkill(skillId, range, up, 0))
- skillDialog->addSkill(skillId, "", level, range, up, 0);
+ if (!skillDialog->updateSkill(skillId, range, up, SkillType::Unknown))
+ {
+ skillDialog->addSkill(skillId, "", level,
+ range, up, SkillType::Unknown);
+ }
}
}
diff --git a/src/net/eathena/skillhandler.cpp b/src/net/eathena/skillhandler.cpp
index 09580b8fc..1f2d9a8ba 100644
--- a/src/net/eathena/skillhandler.cpp
+++ b/src/net/eathena/skillhandler.cpp
@@ -107,7 +107,8 @@ void SkillHandler::processPlayerSkills(Net::MessageIn &msg)
for (int k = 0; k < skillCount; k++)
{
const int skillId = msg.readInt16("skill id");
- const int inf = msg.readInt32("inf");
+ const SkillType::SkillType inf = static_cast<SkillType::SkillType>(
+ msg.readInt32("inf"));
const int level = msg.readInt16("skill level");
msg.readInt16("sp");
const int range = msg.readInt16("range");
diff --git a/src/net/tmwa/skillhandler.cpp b/src/net/tmwa/skillhandler.cpp
index 8b0d6f662..65f86d4bc 100644
--- a/src/net/tmwa/skillhandler.cpp
+++ b/src/net/tmwa/skillhandler.cpp
@@ -109,7 +109,8 @@ void SkillHandler::processPlayerSkills(Net::MessageIn &msg)
for (int k = 0; k < skillCount; k++)
{
const int skillId = msg.readInt16();
- const int inf = msg.readInt16();
+ const SkillType::SkillType inf = static_cast<SkillType::SkillType>(
+ msg.readInt16());
msg.skip(2); // skill pool flags
const int level = msg.readInt16();
msg.readInt16(); // sp