Merge branch 'feature/cyclopedia' of https://github.com/elsongabriel/…

…canary into feature/cyclopedia
elsongabriel · Jun 25, 2024 · 14f6c21 · 14f6c21
2 parents 0c93647 + 319d62d
commit 14f6c21
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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<uint16_t> 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<PreySlot_t>(slotId));
-			slot && slot->isOccupied()) {
+		    slot && slot->isOccupied()) {
 			playerDescriptionSize++;
 			std::string desc = fmt::format("Active Prey {}", slotId + 1);
 			msg.addString(desc, "ProtocolGame::sendCyclopediaCharacterInspection - active prey");