diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-08-12 19:47:30 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-08-12 20:06:32 +0300 |
| commit | 10e1a4858db10445f4c9b3f7b5574612e28a57a5 (patch) | |
| tree | edee24516f9310fb6ffeb5df2ef64874215830d9 | |
| parent | 650ed453901c51b75234523fd70bd3d07d2244bc (diff) | |
| download | manaplus-10e1a4858db10445f4c9b3f7b5574612e28a57a5.tar.gz manaplus-10e1a4858db10445f4c9b3f7b5574612e28a57a5.tar.bz2 manaplus-10e1a4858db10445f4c9b3f7b5574612e28a57a5.tar.xz manaplus-10e1a4858db10445f4c9b3f7b5574612e28a57a5.zip | |
Send equipped cards to function processBeingChangeLookContinue.
| -rw-r--r-- | src/net/eathena/beinghandler.cpp | 12 | ||||
| -rw-r--r-- | src/net/eathena/beinghandler.h | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index f08344abc..90a53dd50 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -517,7 +517,7 @@ void BeingHandler::processBeingChangeLook2(Net::MessageIn &msg) if (!localPlayer || !dstBeing) return; - processBeingChangeLookContinue(msg, dstBeing, type, id, id2); + processBeingChangeLookContinue(msg, dstBeing, type, id, id2, nullptr); } void BeingHandler::processBeingChangeLookCards(Net::MessageIn &msg) @@ -525,6 +525,8 @@ void BeingHandler::processBeingChangeLookCards(Net::MessageIn &msg) if (!actorManager) return; + uint16_t cards[4]; + Being *const dstBeing = actorManager->findBeing( msg.readBeingId("being id")); const uint8_t type = msg.readUInt8("type"); @@ -535,19 +537,21 @@ void BeingHandler::processBeingChangeLookCards(Net::MessageIn &msg) id2 = 1; for (int f = 0; f < 4; f ++) - msg.readInt16("card"); // +++ ignore cards for now + cards[f] = msg.readInt16("card"); if (!localPlayer || !dstBeing) return; - processBeingChangeLookContinue(msg, dstBeing, type, id, id2); + processBeingChangeLookContinue(msg, dstBeing, type, id, id2, &cards[0]); } void BeingHandler::processBeingChangeLookContinue(Net::MessageIn &msg, Being *const dstBeing, const uint8_t type, const int id, - const int id2) + const int id2, + const uint16_t *cards + A_UNUSED) { if (dstBeing->getType() == ActorType::Player) dstBeing->setOtherTime(); diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h index 19a3bd2dc..bc77924b9 100644 --- a/src/net/eathena/beinghandler.h +++ b/src/net/eathena/beinghandler.h @@ -88,7 +88,9 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler Being *const dstBeing, const uint8_t type, const int id, - const int id2) A_NONNULL(2); + const int id2, + const uint16_t *cards) + A_NONNULL(2); static void processBeingSpecialEffect(Net::MessageIn &msg); |