edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-20 15:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #2374

Browse source 
2374: Restore old /save behavior r=def- a=Zwelf

Fixes #2362, supersedes #2367 

I didn't change the /save message. There are already two different: "Use '/load %s' on %s to continue" and "Use '/load %s' to continue".
I think it would be better to add a NetMessage, this could also solve the problem of saving which team members were in the team.

>  I guess this can't be used to cheat anything?

Only if an instant rehook is necessary. Might be useful for rehooking an edge hook (but you still have to aim).

Co-authored-by: Zwelf <zwelf@strct.cc>
This commit is contained in:
bors[bot] 2020-06-25 19:43:30 +00:00 committed by GitHub
parent 35cb666b63 0d887e8b37
commit 00eb2044b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/game/server/score/sql_score.cpp
View file

@ -1573,9 +1573,18 @@ bool CSqlScore::SaveTeamThread(CSqlServer* pSqlServer, const CSqlData<CScoreSave
pData->m_pResult->m_Status = CScoreSaveResult::SAVE_SUCCESS; pData->m_pResult->m_Status = CScoreSaveResult::SAVE_SUCCESS;
strcpy(pData->m_pResult->m_aBroadcast, strcpy(pData->m_pResult->m_aBroadcast,
"Database connection failed, teamsave written to a file instead. Admins will add it manually in a few days."); "Database connection failed, teamsave written to a file instead. Admins will add it manually in a few days.");
str_format(pData->m_pResult->m_aMessage, sizeof(pData->m_pResult->m_aMessage), if(str_comp(pData->m_Server, g_Config.m_SvSqlServerName) == 0)
"Team successfully saved by %s. Use '/load %s' to continue", {
pData->m_ClientName, Code.Str()); str_format(pData->m_pResult->m_aMessage, sizeof(pData->m_pResult->m_aMessage),
"Team successfully saved by %s. The database connection failed, using generated save code instead to avoid collisions. Use '/load %s' to continue",
pData->m_ClientName, Code.ClrStr());
}
else
{
str_format(pData->m_pResult->m_aMessage, sizeof(pData->m_pResult->m_aMessage),
"Team successfully saved by %s. The database connection failed, using generated save code instead to avoid collisions. Use '/load %s' on %s to continue",
pData->m_ClientName, Code.ClrStr(), pData->m_Server);
}
return true; return true;
} }
lock_unlock(ms_FailureFileLock); lock_unlock(ms_FailureFileLock);
@ -1606,7 +1615,7 @@ bool CSqlScore::SaveTeamThread(CSqlServer* pSqlServer, const CSqlData<CScoreSave
str_copy(Code, pData->m_Code, sizeof(Code)); str_copy(Code, pData->m_Code, sizeof(Code));
} }
} }
if(!UseCode) else
{ {
// use random generated passphrase if save code exists or no save code given // use random generated passphrase if save code exists or no save code given
pPrepStmt->setString(1, pData->m_aGeneratedCode); pPrepStmt->setString(1, pData->m_aGeneratedCode);