chore: Convert LeaderboardManager to use BitStream refs (#1469)

DarkflameUniverse · Feb 27, 2024 · 9e0dd05 · 9e0dd05
1 parent 27d20dd
commit 9e0dd05
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/dGame/LeaderboardManager.cpp b/dGame/LeaderboardManager.cpp
@@ -43,9 +43,9 @@ inline void WriteLeaderboardRow(std::ostringstream& leaderboard, const uint32_t&
 	leaderboard << "\nResult[0].Row[" << index << "]." << data->GetString();
 }
 
-void Leaderboard::Serialize(RakNet::BitStream* bitStream) const {
-	bitStream->Write(gameID);
-	bitStream->Write(infoType);
+void Leaderboard::Serialize(RakNet::BitStream& bitStream) const {
+	bitStream.Write(gameID);
+	bitStream.Write(infoType);
 
 	std::ostringstream leaderboard;
 
@@ -64,12 +64,12 @@ void Leaderboard::Serialize(RakNet::BitStream* bitStream) const {
 
 	// Serialize the thing to a BitStream
 	uint32_t leaderboardSize = leaderboard.tellp();
-	bitStream->Write<uint32_t>(leaderboardSize);
+	bitStream.Write<uint32_t>(leaderboardSize);
 	// Doing this all in 1 call so there is no possbility of a dangling pointer.
-	bitStream->WriteAlignedBytes(reinterpret_cast<const unsigned char*>(GeneralUtils::ASCIIToUTF16(leaderboard.str()).c_str()), leaderboardSize * sizeof(char16_t));
-	if (leaderboardSize > 0) bitStream->Write<uint16_t>(0);
-	bitStream->Write0();
-	bitStream->Write0();
+	bitStream.WriteAlignedBytes(reinterpret_cast<const unsigned char*>(GeneralUtils::ASCIIToUTF16(leaderboard.str()).c_str()), leaderboardSize * sizeof(char16_t));
+	if (leaderboardSize > 0) bitStream.Write<uint16_t>(0);
+	bitStream.Write0();
+	bitStream.Write0();
 }
 
 void Leaderboard::QueryToLdf(std::unique_ptr<sql::ResultSet>& rows) {

diff --git a/dGame/LeaderboardManager.h b/dGame/LeaderboardManager.h
@@ -88,7 +88,7 @@ class Leaderboard {
 	 *
 	 * Expensive!  Leaderboards are very string intensive so be wary of performatnce calling this method.
 	 */
-	void Serialize(RakNet::BitStream* bitStream) const;
+	void Serialize(RakNet::BitStream& bitStream) const;
 
 	/**
 	 * Builds the leaderboard from the database based on the associated gameID

diff --git a/dGame/dGameMessages/GameMessages.cpp b/dGame/dGameMessages/GameMessages.cpp
@@ -1666,7 +1666,7 @@ void GameMessages::SendActivitySummaryLeaderboardData(const LWOOBJID& objectID,
 	bitStream.Write(objectID);
 	bitStream.Write(eGameMessageType::SEND_ACTIVITY_SUMMARY_LEADERBOARD_DATA);
 
-	leaderboard->Serialize(&bitStream);
+	leaderboard->Serialize(bitStream);
 	SEND_PACKET;
 }