Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-10 02:08:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

look ma, more work

Browse Source
This commit is contained in:
David Markowitz 2023-05-30 18:21:10 -07:00
parent 0ecc5d83c3
commit e1a7b4993e
2 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
dGame/LeaderboardManager.cpp
View File

@ -68,16 +68,6 @@ void Leaderboard::Serialize(RakNet::BitStream* bitStream) const {
bitStream->Write0(); bitStream->Write0();
} }
bool Leaderboard::GetRankingQuery(std::string& lookupReturn) const {
if (this->infoType == InfoType::Top) {
lookupReturn = "SELECT id FROM leaderboard WHERE game_id = ? ORDER BY %s LIMIT 1";
return true;
} else {
lookupReturn = "SELECT id FROM leaderboard WHERE game_id = ? AND character_id = ? LIMIT 1";
return false;
}
}
void Leaderboard::QueryToLdf(std::unique_ptr<sql::ResultSet>& rows) { void Leaderboard::QueryToLdf(std::unique_ptr<sql::ResultSet>& rows) {
if (rows->rowsCount() == 0) return; if (rows->rowsCount() == 0) return;
@ -276,7 +266,8 @@ void Leaderboard::SetupLeaderboard(uint32_t resultStart, uint32_t resultEnd) {
ORDER BY ranking ASC; ORDER BY ranking ASC;
)QUERY"; )QUERY";
const char* friendsQuery = // If we are getting the friends leaderboard, add the friends query, otherwise fill it in with nothing.
std::string friendsQuery =
R"QUERY( AND ( R"QUERY( AND (
character_id IN ( character_id IN (
SELECT fr.requested_player FROM ( SELECT fr.requested_player FROM (
@ -294,23 +285,25 @@ void Leaderboard::SetupLeaderboard(uint32_t resultStart, uint32_t resultEnd) {
) )
)QUERY"; )QUERY";
[[likely]] if (this->infoType != InfoType::Friends) friendsQuery.clear();
const auto orderBase = GetOrdering(this->leaderboardType); const auto orderBase = GetOrdering(this->leaderboardType);
const auto selectBase = GetColumns(this->leaderboardType); const auto selectBase = GetColumns(this->leaderboardType);
constexpr uint16_t STRING_LENGTH = 1526; constexpr uint16_t STRING_LENGTH = 2048;
char lookupBuffer[STRING_LENGTH]; char lookupBuffer[STRING_LENGTH];
// If we are getting the friends leaderboard, add the friends query, otherwise fill it in with nothing. int32_t res = snprintf(lookupBuffer, STRING_LENGTH, queryBase.data(), orderBase.data(), friendsQuery.data(), selectBase.data(), resultStart, resultEnd);
if (this->infoType == InfoType::Friends) { DluAssert(res != -1);
snprintf(lookupBuffer, STRING_LENGTH, queryBase.data(),
orderBase.data(), friendsQuery, selectBase.data(), resultStart, resultEnd);
} else {
snprintf(lookupBuffer, STRING_LENGTH, queryBase.data(),
orderBase.data(), "", selectBase.data(), resultStart, resultEnd);
}
std::string baseLookupStr; std::string baseLookupStr;
char baseRankingBuffer[STRING_LENGTH]; char baseRankingBuffer[STRING_LENGTH];
bool neededFormatting = GetRankingQuery(baseLookupStr); bool neededFormatting;
[[unlikely]] if (this->infoType == InfoType::Top) {
baseLookupStr = "SELECT id FROM leaderboard WHERE game_id = ? ORDER BY %s LIMIT 1";
neededFormatting = true;
} else {
baseLookupStr = "SELECT id FROM leaderboard WHERE game_id = ? AND character_id = ? LIMIT 1";
neededFormatting = false;
}
// If we need to format the base ranking query, do so, otherwise just copy the query since it's already formatted. // If we need to format the base ranking query, do so, otherwise just copy the query since it's already formatted.
if (neededFormatting) snprintf(baseRankingBuffer, STRING_LENGTH, baseLookupStr.c_str(), orderBase.data()); if (neededFormatting) snprintf(baseRankingBuffer, STRING_LENGTH, baseLookupStr.c_str(), orderBase.data());
@ -318,9 +311,7 @@ void Leaderboard::SetupLeaderboard(uint32_t resultStart, uint32_t resultEnd) {
std::unique_ptr<sql::PreparedStatement> baseQuery(Database::CreatePreppedStmt(baseRankingBuffer)); std::unique_ptr<sql::PreparedStatement> baseQuery(Database::CreatePreppedStmt(baseRankingBuffer));
baseQuery->setInt(1, this->gameID); baseQuery->setInt(1, this->gameID);
if (!neededFormatting) { if (!neededFormatting) baseQuery->setInt(2, this->relatedPlayer);
baseQuery->setInt(2, this->relatedPlayer);
}
std::unique_ptr<sql::ResultSet> baseResult(baseQuery->executeQuery()); std::unique_ptr<sql::ResultSet> baseResult(baseQuery->executeQuery());
@ -415,16 +406,18 @@ void LeaderboardManager::SaveScore(const LWOOBJID& playerID, const GameID gameID
oldScore.SetPrimaryScore(myScoreResult->getInt("score")); oldScore.SetPrimaryScore(myScoreResult->getInt("score"));
break; break;
} }
case Leaderboard::Type::Racing: case Leaderboard::Type::Racing: {
oldScore.SetPrimaryScore(myScoreResult->getInt("bestTime")); oldScore.SetPrimaryScore(myScoreResult->getInt("bestTime"));
oldScore.SetSecondaryScore(myScoreResult->getInt("bestLapTime")); oldScore.SetSecondaryScore(myScoreResult->getInt("bestLapTime"));
lowerScoreBetter = true; lowerScoreBetter = true;
break; break;
case Leaderboard::Type::MonumentRace: }
case Leaderboard::Type::MonumentRace: {
oldScore.SetPrimaryScore(myScoreResult->getInt("bestTime")); oldScore.SetPrimaryScore(myScoreResult->getInt("bestTime"));
lowerScoreBetter = true; lowerScoreBetter = true;
// Do score checking here // Do score checking here
break; break;
}
case Leaderboard::Type::None: case Leaderboard::Type::None:
default: default:
Game::logger->Log("LeaderboardManager", "Unknown leaderboard type %i. Cannot save score!", leaderboardType); Game::logger->Log("LeaderboardManager", "Unknown leaderboard type %i. Cannot save score!", leaderboardType);

1
dGame/LeaderboardManager.h
View File

@ -2,6 +2,7 @@
#define __LEADERBOARDMANAGER__H__ #define __LEADERBOARDMANAGER__H__
#include <map> #include <map>
#include <memory>
#include <string_view> #include <string_view>
#include <vector> #include <vector>