diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-06-08 19:35:18 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-06-08 19:35:18 +0300 |
commit | 93e5a6fbfba642e4e3ff85dcf7bc3c02bada5649 (patch) | |
tree | 3561909ed91fb58b03a7d5bd815fcff91bfe5e30 /src/net/tmwa | |
parent | 8685a2564a96c6819fc0854891293747232fe02a (diff) | |
download | manaplus-93e5a6fbfba642e4e3ff85dcf7bc3c02bada5649.tar.gz manaplus-93e5a6fbfba642e4e3ff85dcf7bc3c02bada5649.tar.bz2 manaplus-93e5a6fbfba642e4e3ff85dcf7bc3c02bada5649.tar.xz manaplus-93e5a6fbfba642e4e3ff85dcf7bc3c02bada5649.zip |
Add setWeaponId into Being class.
Diffstat (limited to 'src/net/tmwa')
-rw-r--r-- | src/net/tmwa/beingrecv.cpp | 6 | ||||
-rw-r--r-- | src/net/tmwa/charserverrecv.cpp | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp index 98f030f12..a219203cc 100644 --- a/src/net/tmwa/beingrecv.cpp +++ b/src/net/tmwa/beingrecv.cpp @@ -149,6 +149,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, ItemColor_one, IsWeapon_true, nullptr); + dstBeing->setWeaponId(id); dstBeing->setSprite(SPRITE_FLOOR, id2, std::string(), @@ -370,6 +371,7 @@ void BeingRecv::processPlayerUpdate1(Net::MessageIn &msg) "", ItemColor_one, IsWeapon_true); + dstBeing->setWeaponId(weapon); dstBeing->updateSprite(SPRITE_FLOOR, shield); dstBeing->updateSprite(SPRITE_WEAPON, headBottom); dstBeing->updateSprite(SPRITE_HEAD_BOTTOM, headMid); @@ -516,6 +518,7 @@ void BeingRecv::processPlayerUpdate2(Net::MessageIn &msg) "", ItemColor_one, IsWeapon_true); + dstBeing->setWeaponId(weapon); dstBeing->updateSprite(SPRITE_FLOOR, shield); dstBeing->updateSprite(SPRITE_WEAPON, headBottom); dstBeing->updateSprite(SPRITE_HEAD_BOTTOM, headMid); @@ -662,6 +665,7 @@ void BeingRecv::processPlayerMove(Net::MessageIn &msg) "", ItemColor_one, IsWeapon_true); + dstBeing->setWeaponId(weapon); dstBeing->updateSprite(SPRITE_FLOOR, shield); dstBeing->updateSprite(SPRITE_WEAPON, headBottom); dstBeing->updateSprite(SPRITE_HEAD_BOTTOM, headMid); @@ -916,6 +920,7 @@ void BeingRecv::processBeingVisible(Net::MessageIn &msg) "", ItemColor_one, IsWeapon_true); + dstBeing->setWeaponId(weapon); Ea::BeingRecv::setSprite(dstBeing, SPRITE_FLOOR, shield); } else if (dstBeing->getType() == ActorType::Npc @@ -1133,6 +1138,7 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg) "", ItemColor_one, IsWeapon_true); + dstBeing->setWeaponId(weapon); Ea::BeingRecv::setSprite(dstBeing, SPRITE_FLOOR, shield); } else if (dstBeing->getType() == ActorType::Npc diff --git a/src/net/tmwa/charserverrecv.cpp b/src/net/tmwa/charserverrecv.cpp index a940799ba..fdc24cf7a 100644 --- a/src/net/tmwa/charserverrecv.cpp +++ b/src/net/tmwa/charserverrecv.cpp @@ -110,6 +110,7 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, ItemColor_one, IsWeapon_true, nullptr); + tempPlayer->setWeaponId(weapon); data.mAttributes[Attributes::LEVEL] = msg.readInt16("level"); |