summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-07-26 23:12:08 +0300
committerAndrei Karas <akaras@inbox.ru>2016-07-26 23:12:08 +0300
commit751de8eaa89f186e2797551a5358f1f2c1c043bf (patch)
treea5ef58c9db13325110db5e3179d33cb6f00b7aba
parent122da0d138f7edf27308a62f6dee8658d13c2c75 (diff)
downloadplus-751de8eaa89f186e2797551a5358f1f2c1c043bf.tar.gz
plus-751de8eaa89f186e2797551a5358f1f2c1c043bf.tar.bz2
plus-751de8eaa89f186e2797551a5358f1f2c1c043bf.tar.xz
plus-751de8eaa89f186e2797551a5358f1f2c1c043bf.zip
For mercenary set stats and not attributes.
-rw-r--r--src/net/eathena/mercenaryrecv.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/net/eathena/mercenaryrecv.cpp b/src/net/eathena/mercenaryrecv.cpp
index 5ca5433ae..350ba5967 100644
--- a/src/net/eathena/mercenaryrecv.cpp
+++ b/src/net/eathena/mercenaryrecv.cpp
@@ -51,44 +51,44 @@ void MercenaryRecv::processMercenaryInfo(Net::MessageIn &msg)
// +++ need create if need mercenary being and update stats
Being *const dstBeing = actorManager->findBeing(
msg.readBeingId("being id"));
- PlayerInfo::setAttribute(Attributes::MERC_ATK,
+ PlayerInfo::setStatBase(Attributes::MERC_ATK,
msg.readInt16("atk"));
- PlayerInfo::setAttribute(Attributes::MERC_MATK,
+ PlayerInfo::setStatBase(Attributes::MERC_MATK,
msg.readInt16("matk"));
- PlayerInfo::setAttribute(Attributes::MERC_HIT,
+ PlayerInfo::setStatBase(Attributes::MERC_HIT,
msg.readInt16("hit"));
- PlayerInfo::setAttribute(Attributes::MERC_CRIT,
+ PlayerInfo::setStatBase(Attributes::MERC_CRIT,
msg.readInt16("crit/10"));
- PlayerInfo::setAttribute(Attributes::MERC_DEF,
+ PlayerInfo::setStatBase(Attributes::MERC_DEF,
msg.readInt16("def"));
- PlayerInfo::setAttribute(Attributes::MERC_MDEF,
+ PlayerInfo::setStatBase(Attributes::MERC_MDEF,
msg.readInt16("mdef"));
- PlayerInfo::setAttribute(Attributes::MERC_FLEE,
+ PlayerInfo::setStatBase(Attributes::MERC_FLEE,
msg.readInt16("flee"));
- PlayerInfo::setAttribute(Attributes::MERC_ATTACK_DELAY,
+ PlayerInfo::setStatBase(Attributes::MERC_ATTACK_DELAY,
msg.readInt16("attack speed"));
const std::string name = msg.readString(24, "name");
const int level = msg.readInt16("level");
- PlayerInfo::setAttribute(Attributes::MERC_LEVEL,
+ PlayerInfo::setStatBase(Attributes::MERC_LEVEL,
level);
- PlayerInfo::setAttribute(Attributes::MERC_HP,
+ PlayerInfo::setStatBase(Attributes::MERC_HP,
msg.readInt32("hp"));
- PlayerInfo::setAttribute(Attributes::MERC_MAX_HP,
+ PlayerInfo::setStatBase(Attributes::MERC_MAX_HP,
msg.readInt32("max hp"));
- PlayerInfo::setAttribute(Attributes::MERC_MP,
+ PlayerInfo::setStatBase(Attributes::MERC_MP,
msg.readInt32("sp"));
- PlayerInfo::setAttribute(Attributes::MERC_MAX_MP,
+ PlayerInfo::setStatBase(Attributes::MERC_MAX_MP,
msg.readInt32("max sp"));
- PlayerInfo::setAttribute(Attributes::MERC_EXPIRE,
+ PlayerInfo::setStatBase(Attributes::MERC_EXPIRE,
msg.readInt32("expire time"));
- PlayerInfo::setAttribute(Attributes::MERC_FAITH,
+ PlayerInfo::setStatBase(Attributes::MERC_FAITH,
msg.readInt16("faith"));
- PlayerInfo::setAttribute(Attributes::MERC_CALLS,
+ PlayerInfo::setStatBase(Attributes::MERC_CALLS,
msg.readInt32("calls"));
- PlayerInfo::setAttribute(Attributes::MERC_KILLS,
+ PlayerInfo::setStatBase(Attributes::MERC_KILLS,
msg.readInt32("kills"));
const int range = msg.readInt16("attack range");
- PlayerInfo::setAttribute(Attributes::MERC_ATTACK_RANGE,
+ PlayerInfo::setStatBase(Attributes::MERC_ATTACK_RANGE,
range);
if (dstBeing && localPlayer)
{