From 0e016f973246b9b06ad5fab7e9c5e35469b8fc76 Mon Sep 17 00:00:00 2001 From: furo Date: Tue, 27 Aug 2024 20:41:43 +0200 Subject: [PATCH] Use `GetMapName()` when getting the map name --- src/engine/server/server.cpp | 2 +- src/game/server/ddracechat.cpp | 2 +- src/game/server/score.cpp | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index 7191a4abe..65aaf57e7 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -2341,7 +2341,7 @@ void CServer::UpdateRegisterServerInfo() JsonWriter.WriteAttribute("map"); JsonWriter.BeginObject(); JsonWriter.WriteAttribute("name"); - JsonWriter.WriteStrValue(m_aCurrentMap); + JsonWriter.WriteStrValue(GetMapName()); JsonWriter.WriteAttribute("sha256"); JsonWriter.WriteStrValue(aMapSha256); JsonWriter.WriteAttribute("size"); diff --git a/src/game/server/ddracechat.cpp b/src/game/server/ddracechat.cpp index 9d75010ed..63c9137d7 100644 --- a/src/game/server/ddracechat.cpp +++ b/src/game/server/ddracechat.cpp @@ -565,7 +565,7 @@ void CGameContext::ConMapInfo(IConsole::IResult *pResult, void *pUserData) if(pResult->NumArguments() > 0) pSelf->Score()->MapInfo(pResult->m_ClientId, pResult->GetString(0)); else - pSelf->Score()->MapInfo(pResult->m_ClientId, g_Config.m_SvMap); + pSelf->Score()->MapInfo(pResult->m_ClientId, pSelf->Server()->GetMapName()); } void CGameContext::ConTimeout(IConsole::IResult *pResult, void *pUserData) diff --git a/src/game/server/score.cpp b/src/game/server/score.cpp index 80e5c6c27..ee7c21167 100644 --- a/src/game/server/score.cpp +++ b/src/game/server/score.cpp @@ -37,7 +37,7 @@ void CScore::ExecPlayerThread( return; auto Tmp = std::make_unique(pResult); str_copy(Tmp->m_aName, pName, sizeof(Tmp->m_aName)); - str_copy(Tmp->m_aMap, g_Config.m_SvMap, sizeof(Tmp->m_aMap)); + str_copy(Tmp->m_aMap, Server()->GetMapName(), sizeof(Tmp->m_aMap)); str_copy(Tmp->m_aServer, g_Config.m_SvSqlServerName, sizeof(Tmp->m_aServer)); str_copy(Tmp->m_aRequestingPlayer, Server()->ClientName(ClientId), sizeof(Tmp->m_aRequestingPlayer)); Tmp->m_Offset = Offset; @@ -113,7 +113,7 @@ void CScore::LoadBestTime() m_pGameServer->m_pController->m_pLoadBestTimeResult = LoadBestTimeResult; auto Tmp = std::make_unique(LoadBestTimeResult); - str_copy(Tmp->m_aMap, g_Config.m_SvMap, sizeof(Tmp->m_aMap)); + str_copy(Tmp->m_aMap, Server()->GetMapName(), sizeof(Tmp->m_aMap)); m_pPool->Execute(CScoreWorker::LoadBestTime, std::move(Tmp), "load best time"); } @@ -154,7 +154,7 @@ void CScore::SaveScore(int ClientId, int TimeTicks, const char *pTimestamp, cons dbg_msg("sql", "WARNING: previous save score result didn't complete, overwriting it now"); pCurPlayer->m_ScoreFinishResult = std::make_shared(); auto Tmp = std::make_unique(pCurPlayer->m_ScoreFinishResult); - str_copy(Tmp->m_aMap, g_Config.m_SvMap, sizeof(Tmp->m_aMap)); + str_copy(Tmp->m_aMap, Server()->GetMapName(), sizeof(Tmp->m_aMap)); FormatUuid(GameServer()->GameUuid(), Tmp->m_aGameUuid, sizeof(Tmp->m_aGameUuid)); Tmp->m_ClientId = ClientId; str_copy(Tmp->m_aName, Server()->ClientName(ClientId), sizeof(Tmp->m_aName)); @@ -186,7 +186,7 @@ void CScore::SaveTeamScore(int Team, int *pClientIds, unsigned int Size, int Tim Tmp->m_Time = (float)TimeTicks / (float)Server()->TickSpeed(); str_copy(Tmp->m_aTimestamp, pTimestamp, sizeof(Tmp->m_aTimestamp)); FormatUuid(GameServer()->GameUuid(), Tmp->m_aGameUuid, sizeof(Tmp->m_aGameUuid)); - str_copy(Tmp->m_aMap, g_Config.m_SvMap, sizeof(Tmp->m_aMap)); + str_copy(Tmp->m_aMap, Server()->GetMapName(), sizeof(Tmp->m_aMap)); Tmp->m_TeamrankUuid = RandomUuid(); m_pPool->ExecuteWrite(CScoreWorker::SaveTeamScore, std::move(Tmp), "save team score"); @@ -262,7 +262,7 @@ void CScore::RandomMap(int ClientId, int Stars) auto Tmp = std::make_unique(pResult); Tmp->m_Stars = Stars; - str_copy(Tmp->m_aCurrentMap, g_Config.m_SvMap, sizeof(Tmp->m_aCurrentMap)); + str_copy(Tmp->m_aCurrentMap, Server()->GetMapName(), sizeof(Tmp->m_aCurrentMap)); str_copy(Tmp->m_aServerType, g_Config.m_SvServerType, sizeof(Tmp->m_aServerType)); str_copy(Tmp->m_aRequestingPlayer, GameServer()->Server()->ClientName(ClientId), sizeof(Tmp->m_aRequestingPlayer)); @@ -276,7 +276,7 @@ void CScore::RandomUnfinishedMap(int ClientId, int Stars) auto Tmp = std::make_unique(pResult); Tmp->m_Stars = Stars; - str_copy(Tmp->m_aCurrentMap, g_Config.m_SvMap, sizeof(Tmp->m_aCurrentMap)); + str_copy(Tmp->m_aCurrentMap, Server()->GetMapName(), sizeof(Tmp->m_aCurrentMap)); str_copy(Tmp->m_aServerType, g_Config.m_SvServerType, sizeof(Tmp->m_aServerType)); str_copy(Tmp->m_aRequestingPlayer, GameServer()->Server()->ClientName(ClientId), sizeof(Tmp->m_aRequestingPlayer)); @@ -310,7 +310,7 @@ void CScore::SaveTeam(int ClientId, const char *pCode, const char *pServer) auto Tmp = std::make_unique(SaveResult); str_copy(Tmp->m_aCode, pCode, sizeof(Tmp->m_aCode)); - str_copy(Tmp->m_aMap, g_Config.m_SvMap, sizeof(Tmp->m_aMap)); + str_copy(Tmp->m_aMap, Server()->GetMapName(), sizeof(Tmp->m_aMap)); str_copy(Tmp->m_aServer, pServer, sizeof(Tmp->m_aServer)); str_copy(Tmp->m_aClientName, this->Server()->ClientName(ClientId), sizeof(Tmp->m_aClientName)); Tmp->m_aGeneratedCode[0] = '\0'; @@ -372,7 +372,7 @@ void CScore::LoadTeam(const char *pCode, int ClientId) pController->Teams().SetSaving(Team, SaveResult); auto Tmp = std::make_unique(SaveResult); str_copy(Tmp->m_aCode, pCode, sizeof(Tmp->m_aCode)); - str_copy(Tmp->m_aMap, g_Config.m_SvMap, sizeof(Tmp->m_aMap)); + str_copy(Tmp->m_aMap, Server()->GetMapName(), sizeof(Tmp->m_aMap)); Tmp->m_ClientId = ClientId; str_copy(Tmp->m_aRequestingPlayer, Server()->ClientName(ClientId), sizeof(Tmp->m_aRequestingPlayer)); Tmp->m_NumPlayer = 0;