From 5f7a8dd28733fd460578e43c6b2ea4990afa0670 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 20 Sep 2014 17:55:42 +0300 Subject: Use skill owner field in most functions. --- src/net/eathena/skillhandler.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/net/eathena/skillhandler.cpp') diff --git a/src/net/eathena/skillhandler.cpp b/src/net/eathena/skillhandler.cpp index 77e87d64a..bcd90b6e0 100644 --- a/src/net/eathena/skillhandler.cpp +++ b/src/net/eathena/skillhandler.cpp @@ -127,7 +127,7 @@ void SkillHandler::processPlayerSkills(Net::MessageIn &msg) int updateSkill = 0; if (skillDialog) - skillDialog->hideSkills(); + skillDialog->hideSkills(SkillOwner::Player); for (int k = 0; k < skillCount; k++) { const int skillId = msg.readInt16("skill id"); @@ -145,7 +145,10 @@ void SkillHandler::processPlayerSkills(Net::MessageIn &msg) if (skillDialog) { if (!skillDialog->updateSkill(skillId, range, up, inf, sp)) - skillDialog->addSkill(skillId, name, level, range, up, inf, sp); + { + skillDialog->addSkill(SkillOwner::Player, + skillId, name, level, range, up, inf, sp); + } } } if (updateSkill && skillDialog) @@ -157,7 +160,7 @@ void SkillHandler::processSkillCoolDown(Net::MessageIn &msg) const int skillId = msg.readInt16("skill id"); const int duration = msg.readInt32("duration"); if (skillDialog) - skillDialog->setSkillDuration(skillId, duration); + skillDialog->setSkillDuration(SkillOwner::Player, skillId, duration); } void SkillHandler::processSkillCoolDownList(Net::MessageIn &msg) @@ -169,7 +172,10 @@ void SkillHandler::processSkillCoolDownList(Net::MessageIn &msg) msg.readInt32("total"); const int duration = msg.readInt32("duration"); if (skillDialog) - skillDialog->setSkillDuration(skillId, duration); + { + skillDialog->setSkillDuration(SkillOwner::Player, + skillId, duration); + } } } -- cgit v1.2.3-60-g2f50