summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-06 13:29:42 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-06 13:29:42 +0300
commit83a6463a88b4b5eda003f55b419995c13476d917 (patch)
tree94df4a85319146e17ebe89ce82c6c3a0e1d9b138 /src/net
parent8a23a928d99d79b0d48961a225c3656ca42f34f0 (diff)
downloadmv-83a6463a88b4b5eda003f55b419995c13476d917.tar.gz
mv-83a6463a88b4b5eda003f55b419995c13476d917.tar.bz2
mv-83a6463a88b4b5eda003f55b419995c13476d917.tar.xz
mv-83a6463a88b4b5eda003f55b419995c13476d917.zip
In skills add support for reading mana cost from server.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/skillhandler.cpp7
-rw-r--r--src/net/eathena/skillhandler.cpp6
-rw-r--r--src/net/tmwa/skillhandler.cpp6
3 files changed, 10 insertions, 9 deletions
diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp
index 8a7f42d82..19f7d4d63 100644
--- a/src/net/ea/skillhandler.cpp
+++ b/src/net/ea/skillhandler.cpp
@@ -79,7 +79,7 @@ void SkillHandler::processPlayerSkillUp(Net::MessageIn &msg)
{
const int skillId = msg.readInt16();
const int level = msg.readInt16();
- msg.readInt16(); // sp
+ const int sp = msg.readInt16();
const int range = msg.readInt16();
const int up = msg.readUInt8();
@@ -88,10 +88,11 @@ void SkillHandler::processPlayerSkillUp(Net::MessageIn &msg)
PlayerInfo::setSkillLevel(skillId, level);
if (skillDialog)
{
- if (!skillDialog->updateSkill(skillId, range, up, SkillType::Unknown))
+ if (!skillDialog->updateSkill(skillId, range,
+ up, SkillType::Unknown, sp))
{
skillDialog->addSkill(skillId, "", level,
- range, up, SkillType::Unknown);
+ range, up, SkillType::Unknown, sp);
}
}
}
diff --git a/src/net/eathena/skillhandler.cpp b/src/net/eathena/skillhandler.cpp
index a66987f71..ef0b7d399 100644
--- a/src/net/eathena/skillhandler.cpp
+++ b/src/net/eathena/skillhandler.cpp
@@ -112,7 +112,7 @@ void SkillHandler::processPlayerSkills(Net::MessageIn &msg)
const SkillType::SkillType inf = static_cast<SkillType::SkillType>(
msg.readInt32("inf"));
const int level = msg.readInt16("skill level");
- msg.readInt16("sp");
+ const int sp = msg.readInt16("sp");
const int range = msg.readInt16("range");
const std::string name = msg.readString(24, "skill name");
const int up = msg.readUInt8("up flag");
@@ -122,8 +122,8 @@ void SkillHandler::processPlayerSkills(Net::MessageIn &msg)
PlayerInfo::setSkillLevel(skillId, level);
if (skillDialog)
{
- if (!skillDialog->updateSkill(skillId, range, up, inf))
- skillDialog->addSkill(skillId, name, level, range, up, inf);
+ if (!skillDialog->updateSkill(skillId, range, up, inf, sp))
+ skillDialog->addSkill(skillId, name, level, range, up, inf, sp);
}
}
if (updateSkill && skillDialog)
diff --git a/src/net/tmwa/skillhandler.cpp b/src/net/tmwa/skillhandler.cpp
index 65f86d4bc..da6a04b7e 100644
--- a/src/net/tmwa/skillhandler.cpp
+++ b/src/net/tmwa/skillhandler.cpp
@@ -113,7 +113,7 @@ void SkillHandler::processPlayerSkills(Net::MessageIn &msg)
msg.readInt16());
msg.skip(2); // skill pool flags
const int level = msg.readInt16();
- msg.readInt16(); // sp
+ const int sp = msg.readInt16();
const int range = msg.readInt16();
msg.skip(24); // 0 unused
const int up = msg.readUInt8();
@@ -123,8 +123,8 @@ void SkillHandler::processPlayerSkills(Net::MessageIn &msg)
PlayerInfo::setSkillLevel(skillId, level);
if (skillDialog)
{
- if (!skillDialog->updateSkill(skillId, range, up, inf))
- skillDialog->addSkill(skillId, "", level, range, up, inf);
+ if (!skillDialog->updateSkill(skillId, range, up, inf, sp))
+ skillDialog->addSkill(skillId, "", level, range, up, inf, sp);
}
}
if (updateSkill && skillDialog)