updates.

elsongabriel · Apr 26, 2024 · 6e56b2e · 6e56b2e
1 parent 83c8cee
commit 6e56b2e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 214 deletions.
diff --git a/src/creatures/players/cyclopedia/player_cyclopedia.cpp b/src/creatures/players/cyclopedia/player_cyclopedia.cpp
diff --git a/src/creatures/players/cyclopedia/player_cyclopedia.hpp b/src/creatures/players/cyclopedia/player_cyclopedia.hpp
diff --git a/src/game/game.cpp b/src/game/game.cpp
@@ -8500,15 +8500,10 @@ void Game::processHighscoreResults(DBResult_ptr result, uint32_t playerID, uint8
 		characters.reserve(result->countResults());
 		if (result) {
 			do {
-				uint8_t characterVocation;
 				const auto &voc = g_vocations().getVocation(result->getNumber<uint16_t>("vocation"));
-				if (voc) {
-					characterVocation = voc->getClientId();
-				} else {
-					characterVocation = 0;
-				}
-				// todo get char title
-				characters.emplace_back(std::move(result->getString("name")), result->getNumber<uint64_t>("points"), result->getNumber<uint32_t>("id"), result->getNumber<uint32_t>("rank"), result->getNumber<uint16_t>("level"), characterVocation, 0);
+				uint8_t characterVocation = voc ? voc->getClientId() : 0;
+				std::string characterTitle = "";
+				characters.emplace_back(std::move(result->getString("name")), result->getNumber<uint64_t>("points"), result->getNumber<uint32_t>("id"), result->getNumber<uint32_t>("rank"), result->getNumber<uint16_t>("level"), characterVocation, characterTitle);
 			} while (result->next());
 		}
 

diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp
@@ -2190,7 +2190,7 @@ void ProtocolGame::sendHighscores(const std::vector<HighscoreCharacter> &charact
 	for (const HighscoreCharacter &character : characters) {
 		msg.add<uint32_t>(character.rank); // Rank
 		msg.addString(character.name, "ProtocolGame::sendHighscores - character.name"); // Character Name
-		msg.addString("", "ProtocolGame::sendHighscores - empty"); // Probably Character Title(not visible in window)
+		msg.addString(character.title, "ProtocolGame::sendHighscores - character.title"); // Character Title
 		msg.addByte(character.vocation); // Vocation Id
 		msg.addString(g_configManager().getString(SERVER_NAME, __FUNCTION__), "ProtocolGame::sendHighscores - g_configManager().getString(SERVER_NAME)"); // World
 		msg.add<uint16_t>(character.level); // Level

diff --git a/src/server/server_definitions.hpp b/src/server/server_definitions.hpp
@@ -113,7 +113,7 @@ enum Supply_Stash_Actions_t : uint8_t {
 };
 
 struct HighscoreCharacter {
-	HighscoreCharacter(std::string name, uint64_t points, uint32_t id, uint32_t rank, uint16_t level, uint8_t vocation, uint8_t title) :
+	HighscoreCharacter(std::string name, uint64_t points, uint32_t id, uint32_t rank, uint16_t level, uint8_t vocation, std::string title) :
 		name(std::move(name)),
 		points(points),
 		id(id),
@@ -128,5 +128,5 @@ struct HighscoreCharacter {
 	uint32_t rank;
 	uint16_t level;
 	uint8_t vocation;
-	uint8_t title;
+	std::string title;
 };
diff --git a/src/utils/const.hpp b/src/utils/const.hpp
@@ -21,9 +21,6 @@ static constexpr int32_t CHANNEL_GUILD = 0x00;
 static constexpr int32_t CHANNEL_PARTY = 0x01;
 static constexpr int32_t CHANNEL_PRIVATE = 0xFFFF;
 
-// Highscore interval time to reload from database in seconds
-static constexpr int64_t EVENT_HIGHSCORE_INTERVAL = 3600;
-
 // This is in miliseconds
 static constexpr int32_t EVENT_IMBUEMENT_INTERVAL = 1000;
 static constexpr uint8_t IMBUEMENT_MAX_TIER = 3;