diff --git a/src/creatures/players/cyclopedia/player_cyclopedia.hpp b/src/creatures/players/cyclopedia/player_cyclopedia.hpp index c4cc7e0ef29..6e3f654fa5b 100644 --- a/src/creatures/players/cyclopedia/player_cyclopedia.hpp +++ b/src/creatures/players/cyclopedia/player_cyclopedia.hpp @@ -30,8 +30,8 @@ class PlayerCyclopedia { Summary getSummary() { return { getAmount(Summary_t::PREY_CARDS), - getAmount(Summary_t::INSTANT_REWARDS), - getAmount(Summary_t::HIRELINGS) }; + getAmount(Summary_t::INSTANT_REWARDS), + getAmount(Summary_t::HIRELINGS) }; } void loadSummaryData(); diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp index 76ef56de6c9..4a540da3d1b 100644 --- a/src/server/network/protocol/protocolgame.cpp +++ b/src/server/network/protocol/protocolgame.cpp @@ -3965,12 +3965,12 @@ void ProtocolGame::sendCyclopediaCharacterStoreSummary() { uint8_t preySlotsUnlocked = 0; // Prey third slot unlocked if (const auto &slotP = player->getPreySlotById(PreySlot_Three); - slotP && slotP->state != PreyDataState_Locked) { + slotP && slotP->state != PreyDataState_Locked) { preySlotsUnlocked++; } // Task hunting third slot unlocked if (const auto &slotH = player->getTaskHuntingSlotById(PreySlot_Three); - slotH && slotH->state != PreyTaskDataState_Locked) { + slotH && slotH->state != PreyTaskDataState_Locked) { preySlotsUnlocked++; } msg.addByte(preySlotsUnlocked); // getPreySlotById + getTaskHuntingSlotById @@ -3994,14 +3994,14 @@ void ProtocolGame::sendCyclopediaCharacterStoreSummary() { /*std::vector m_hOutfits; for (const auto &it : g_game().getHirelingOutfits()) { - if (player->kv()->scoped("hireling-outfits")->get(it.second)) { - m_hOutfits.emplace_back(it.first); - g_logger().debug("outfit id: {}, name: {}", it.first, it.second); - } + if (player->kv()->scoped("hireling-outfits")->get(it.second)) { + m_hOutfits.emplace_back(it.first); + g_logger().debug("outfit id: {}, name: {}", it.first, it.second); + } } msg.addByte(m_hOutfits.size()); for (const auto &id : m_hOutfits) { - msg.addByte(0x01); // TODO need to get the correct id from hireling outfit + msg.addByte(0x01); // TODO need to get the correct id from hireling outfit }*/ msg.addByte(0x00); // hireling outfit size @@ -4108,7 +4108,7 @@ void ProtocolGame::sendCyclopediaCharacterInspection() { // Prey description for (uint8_t slotId = PreySlot_First; slotId <= PreySlot_Last; slotId++) { if (const auto &slot = player->getPreySlotById(static_cast(slotId)); - slot && slot->isOccupied()) { + slot && slot->isOccupied()) { playerDescriptionSize++; std::string desc = fmt::format("Active Prey {}", slotId + 1); msg.addString(desc, "ProtocolGame::sendCyclopediaCharacterInspection - active prey");