From 520a67f548e17dfa279c5f4a347299ade2c1b60b Mon Sep 17 00:00:00 2001 From: kokekanon <114332266+kokekanon@users.noreply.github.com> Date: Wed, 20 Nov 2024 11:02:25 -0300 Subject: [PATCH 1/2] fix: packet addCreatureIcon #971 --- src/client/protocolgame.h | 2 +- src/client/protocolgameparse.cpp | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/client/protocolgame.h b/src/client/protocolgame.h index 2444df2267..9a773f6bf1 100644 --- a/src/client/protocolgame.h +++ b/src/client/protocolgame.h @@ -230,7 +230,7 @@ class ProtocolGame : public Protocol void parseItemClasses(const InputMessagePtr& msg); void parseCreatureMark(const InputMessagePtr& msg); void parseTrappers(const InputMessagePtr& msg); - void addCreatureIcon(const InputMessagePtr& msg); + void addCreatureIcon(const InputMessagePtr& msg) const; void parseCloseForgeWindow(const InputMessagePtr& msg); void parseCreatureData(const InputMessagePtr& msg); void parseCreatureHealth(const InputMessagePtr& msg); diff --git a/src/client/protocolgameparse.cpp b/src/client/protocolgameparse.cpp index caf257752f..7aa8455603 100644 --- a/src/client/protocolgameparse.cpp +++ b/src/client/protocolgameparse.cpp @@ -1835,7 +1835,7 @@ void ProtocolGame::parseTrappers(const InputMessagePtr& msg) } } -void ProtocolGame::addCreatureIcon(const InputMessagePtr& msg) +void ProtocolGame::addCreatureIcon(const InputMessagePtr& msg) const { const uint8_t sizeIcons = msg->getU8(); for (auto i = 0; i < sizeIcons; ++i) { @@ -3368,12 +3368,7 @@ CreaturePtr ProtocolGame::getCreature(const InputMessagePtr& msg, int type) cons const uint16_t speed = msg->getU16(); if (g_game.getClientVersion() >= 1281) { - const uint8_t iconDebuff = msg->getU8(); // creature debuffs - if (iconDebuff != 0) { - msg->getU8(); // Icon - msg->getU8(); // Update (?) - msg->getU16(); // Counter text - } + addCreatureIcon(msg); } const uint8_t skull = msg->getU8(); From 209b107d084ab67b358840f5ee9abd6829a8fd8d Mon Sep 17 00:00:00 2001 From: kokekanon <114332266+kokekanon@users.noreply.github.com> Date: Wed, 20 Nov 2024 12:22:33 -0300 Subject: [PATCH 2/2] img --- data/images/game/creatureicons/CreatureIcons.png | Bin 0 -> 2345 bytes data/images/game/creatureicons/monsterIcons.png | Bin 0 -> 1002 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 data/images/game/creatureicons/CreatureIcons.png create mode 100644 data/images/game/creatureicons/monsterIcons.png diff --git a/data/images/game/creatureicons/CreatureIcons.png b/data/images/game/creatureicons/CreatureIcons.png new file mode 100644 index 0000000000000000000000000000000000000000..f5b50d4d151ec747c8733d88330a6809af459abc GIT binary patch literal 2345 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 Yb3)&UE|N;vF#rGn07*qoM6N<$g1?RAX8-^I literal 0 HcmV?d00001