diff --git a/src/creatures/creature.hpp b/src/creatures/creature.hpp index bcc8db1637f..edf2fa55b74 100644 --- a/src/creatures/creature.hpp +++ b/src/creatures/creature.hpp @@ -281,7 +281,7 @@ class Creature : virtual public Thing, public SharedObject { const Outfit_t getDefaultOutfit() const { return defaultOutfit; } - bool isSupportOutfit() const { + bool isWearingSupportOutfit() const { auto outfit = currentOutfit.lookType; return outfit == 75 || outfit == 266 || outfit == 302; } diff --git a/src/creatures/players/player.cpp b/src/creatures/players/player.cpp index 45b4cab88d1..0bcb21187b4 100644 --- a/src/creatures/players/player.cpp +++ b/src/creatures/players/player.cpp @@ -5830,7 +5830,7 @@ bool Player::toggleMount(bool mount) { return false; } - if (isSupportOutfit()) { + if (isWearingSupportOutfit()) { return false; } diff --git a/src/game/game.cpp b/src/game/game.cpp index 43f95a4b09e..da9875a1e87 100644 --- a/src/game/game.cpp +++ b/src/game/game.cpp @@ -4223,7 +4223,7 @@ void Game::playerSetShowOffSocket(uint32_t playerId, Outfit_t &outfit, const Pos } const auto mount = mounts.getMountByClientID(outfit.lookMount); - if (!mount || !player->hasMount(mount) || player->isSupportOutfit()) { + if (!mount || !player->hasMount(mount) || player->isWearingSupportOutfit()) { outfit.lookMount = 0; } @@ -5920,7 +5920,7 @@ void Game::playerChangeOutfit(uint32_t playerId, Outfit_t outfit, uint8_t isMoun return; } - if (player->isSupportOutfit()) { + if (player->isWearingSupportOutfit()) { outfit.lookMount = 0; isMountRandomized = 0; } diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp index 3adee60e19c..379f1cd3ac6 100644 --- a/src/server/network/protocol/protocolgame.cpp +++ b/src/server/network/protocol/protocolgame.cpp @@ -3203,7 +3203,7 @@ void ProtocolGame::sendCreatureOutfit(std::shared_ptr creature, const } Outfit_t newOutfit = outfit; - if (player->isSupportOutfit()) { + if (player->isWearingSupportOutfit()) { player->setCurrentMount(0); newOutfit.lookMount = 0; } @@ -6872,7 +6872,7 @@ void ProtocolGame::sendOutfitWindow() { msg.addByte(0xC8); Outfit_t currentOutfit = player->getDefaultOutfit(); - auto isSupportOutfit = player->isSupportOutfit(); + auto isSupportOutfit = player->isWearingSupportOutfit(); bool mounted = false; if (!isSupportOutfit) {