From c4ff37d9d9e20caec81a8240b8b7c917a7b8b77c Mon Sep 17 00:00:00 2001 From: bencie Date: Tue, 27 Aug 2024 15:45:42 +0200 Subject: [PATCH] Send result of `random_unfinished_map` to all clients --- src/game/server/gamecontext.cpp | 2 +- src/game/server/scoreworker.cpp | 3 ++- src/test/score.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp index 9e205896e..eb5d69b6e 100644 --- a/src/game/server/gamecontext.cpp +++ b/src/game/server/gamecontext.cpp @@ -1277,7 +1277,7 @@ void CGameContext::OnTick() if(m_SqlRandomMapResult->m_Success) { if(PlayerExists(m_SqlRandomMapResult->m_ClientId) && m_SqlRandomMapResult->m_aMessage[0] != '\0') - SendChatTarget(m_SqlRandomMapResult->m_ClientId, m_SqlRandomMapResult->m_aMessage); + SendChat(-1, TEAM_ALL, m_SqlRandomMapResult->m_aMessage); if(m_SqlRandomMapResult->m_aMap[0] != '\0') Server()->ChangeMap(m_SqlRandomMapResult->m_aMap); else diff --git a/src/game/server/scoreworker.cpp b/src/game/server/scoreworker.cpp index a225ec296..5516ec65c 100644 --- a/src/game/server/scoreworker.cpp +++ b/src/game/server/scoreworker.cpp @@ -1560,7 +1560,8 @@ bool CScoreWorker::RandomUnfinishedMap(IDbConnection *pSqlServer, const ISqlData } else { - str_copy(pResult->m_aMessage, "You have no more unfinished maps on this server!", sizeof(pResult->m_aMessage)); + str_format(aBuf, sizeof(aBuf), "%s has no more unfinished maps on this server!", pData->m_aRequestingPlayer); + str_copy(pResult->m_aMessage, aBuf, sizeof(pResult->m_aMessage)); } return false; } diff --git a/src/test/score.cpp b/src/test/score.cpp index d64bd6f37..2bb920ebc 100644 --- a/src/test/score.cpp +++ b/src/test/score.cpp @@ -580,7 +580,7 @@ TEST_P(RandomMap, UnfinishedDoesntExist) ASSERT_FALSE(CScoreWorker::RandomUnfinishedMap(m_pConn, &m_RandomMapRequest, m_aError, sizeof(m_aError))) << m_aError; EXPECT_EQ(m_pRandomMapResult->m_ClientId, 0); EXPECT_STREQ(m_pRandomMapResult->m_aMap, ""); - EXPECT_STREQ(m_pRandomMapResult->m_aMessage, "You have no more unfinished maps on this server!"); + EXPECT_STREQ(m_pRandomMapResult->m_aMessage, "nameless tee has no more unfinished maps on this server!"); } auto g_pSqliteConn = CreateSqliteConnection(":memory:", true);