Skip to content

fix: packet addCreatureIcon issues : #971 #972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luanluciano93 merged 2 commits into from
Nov 21, 2024
Merged

fix: packet addCreatureIcon issues : #971 #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
520a67f
fix: packet addCreatureIcon #971
kokekanon Nov 20, 2024
209b107
img
kokekanon Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added data/images/game/creatureicons/CreatureIcons.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/game/creatureicons/monsterIcons.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/client/protocolgame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 2 additions & 7 deletions src/client/protocolgameparse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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();
Expand Down