edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-19 17:14:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8826 from bencie/announce-unfinishedmap-voter

Browse source 
Send result of `random_unfinished_map` to all clients
This commit is contained in:
Dennis Felsing 2024-08-27 15:25:12 +00:00 committed by GitHub
parent 3a2cecb8b4 c4ff37d9d9
commit 7c8f9b43ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/server/gamecontext.cpp
View file

@ -1277,7 +1277,7 @@ void CGameContext::OnTick()
if(m_SqlRandomMapResult->m_Success) if(m_SqlRandomMapResult->m_Success)
{ {
if(PlayerExists(m_SqlRandomMapResult->m_ClientId) && m_SqlRandomMapResult->m_aMessage[0] != '\0') 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') if(m_SqlRandomMapResult->m_aMap[0] != '\0')
Server()->ChangeMap(m_SqlRandomMapResult->m_aMap); Server()->ChangeMap(m_SqlRandomMapResult->m_aMap);
else else

3
src/game/server/scoreworker.cpp
View file

@ -1560,7 +1560,8 @@ bool CScoreWorker::RandomUnfinishedMap(IDbConnection *pSqlServer, const ISqlData
} }
else 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; return false;
} }

2
src/test/score.cpp
View file

@ -580,7 +580,7 @@ TEST_P(RandomMap, UnfinishedDoesntExist)
ASSERT_FALSE(CScoreWorker::RandomUnfinishedMap(m_pConn, &m_RandomMapRequest, m_aError, sizeof(m_aError))) << m_aError; ASSERT_FALSE(CScoreWorker::RandomUnfinishedMap(m_pConn, &m_RandomMapRequest, m_aError, sizeof(m_aError))) << m_aError;
EXPECT_EQ(m_pRandomMapResult->m_ClientId, 0); EXPECT_EQ(m_pRandomMapResult->m_ClientId, 0);
EXPECT_STREQ(m_pRandomMapResult->m_aMap, ""); 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); auto g_pSqliteConn = CreateSqliteConnection(":memory:", true);