summaryrefslogtreecommitdiff
path: root/src/net/ea/skillhandler.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-25 22:50:59 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-25 22:50:59 +0100
commitcc79f0fe21e1a2ef73cbe987d54e848b9a47142d (patch)
treeedd316eb6094f0c02d6d014385865dcd88a2bc56 /src/net/ea/skillhandler.cpp
parentb0df784f1be44a657ca8092069488602270629b7 (diff)
parent99e8a3fd77b63a029fe02dcf771b6af1aad252ed (diff)
downloadMana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.tar.gz
Mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.tar.bz2
Mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.tar.xz
Mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.zip
Merge branch 'eathena/master'
Conflicts: A lot of files.
Diffstat (limited to 'src/net/ea/skillhandler.cpp')
-rw-r--r--src/net/ea/skillhandler.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp
index 4361b147..12c38aaa 100644
--- a/src/net/ea/skillhandler.cpp
+++ b/src/net/ea/skillhandler.cpp
@@ -85,14 +85,14 @@ void SkillHandler::handleMessage(MessageIn &msg)
for (int k = 0; k < skillCount; k++)
{
- Sint16 skillId = msg.readInt16();
+ int skillId = msg.readInt16();
msg.readInt16(); // target type
msg.readInt16(); // unknown
- Sint16 level = msg.readInt16();
- Sint16 sp = msg.readInt16();
+ int level = msg.readInt16();
+ int sp = msg.readInt16();
msg.readInt16(); // range
std::string skillName = msg.readString(24);
- Sint8 up = msg.readInt8();
+ int up = msg.readInt8();
if (level != 0 || up != 0)
{