summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-29 01:33:29 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-29 18:12:36 +0300
commit2774a0c9ea6b06c000c60dbcc602862ced0a17b8 (patch)
tree8b4b6b137a0f8a4a4bee502b839602b2ee5d5e21
parentffaadb3ddad5b8577786f7176e4415db68f115f0 (diff)
downloadmanaplus-2774a0c9ea6b06c000c60dbcc602862ced0a17b8.tar.gz
manaplus-2774a0c9ea6b06c000c60dbcc602862ced0a17b8.tar.bz2
manaplus-2774a0c9ea6b06c000c60dbcc602862ced0a17b8.tar.xz
manaplus-2774a0c9ea6b06c000c60dbcc602862ced0a17b8.zip
Fix skill using to being.
-rw-r--r--src/gui/windows/skilldialog.cpp8
-rw-r--r--src/net/eathena/skillhandler.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index 514bd101b..297bc0049 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -590,14 +590,14 @@ void SkillDialog::useSkill(const SkillInfo *const info)
const Being *const being = localPlayer->getTarget();
if (being)
{
- skillHandler->useBeing(info->level,
- info->id, being->getId());
+ skillHandler->useBeing(info->id,
+ info->level, being->getId());
}
break;
}
case SkillType::Self:
- skillHandler->useBeing(info->level,
- info->id, localPlayer->getId());
+ skillHandler->useBeing(info->id,
+ info->level, localPlayer->getId());
break;
case SkillType::Ground:
diff --git a/src/net/eathena/skillhandler.cpp b/src/net/eathena/skillhandler.cpp
index ba2fc8f8b..03dce353b 100644
--- a/src/net/eathena/skillhandler.cpp
+++ b/src/net/eathena/skillhandler.cpp
@@ -116,8 +116,8 @@ void SkillHandler::useBeing(const int id, const int level,
const int beingId) const
{
createOutPacket(CMSG_SKILL_USE_BEING);
- outMsg.writeInt16(static_cast<int16_t>(id), "skill id");
outMsg.writeInt16(static_cast<int16_t>(level), "skill level");
+ outMsg.writeInt16(static_cast<int16_t>(id), "skill id");
outMsg.writeInt32(beingId, "target id");
}