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

Merge #3630

Browse source 
3630: /times: Show country rank is from r=heinrich5991 a=def-

<!-- What is the motivation for the changes of this pull request -->

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: def <dennis@felsin9.de>
This commit is contained in:
bors[bot] 2021-02-20 22:09:30 +00:00 committed by GitHub
parent 2efbd53cbc 660d23adac
commit daf13cb85a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/game/server/score.cpp
View file

@ -1062,7 +1062,7 @@ bool CScore::ShowTimesThread(IDbConnection *pSqlServer, const ISqlData *pGameDat
else // last 5 times of server
{
str_format(aBuf, sizeof(aBuf),
"SELECT Time, (%s-%s) as Ago, %s as Stamp, Name "
"SELECT Time, (%s-%s) as Ago, %s as Stamp, Name, Server "
"FROM %s_race "
"WHERE Map = ? "
"ORDER BY Timestamp %s "
@ -1090,6 +1090,11 @@ bool CScore::ShowTimesThread(IDbConnection *pSqlServer, const ISqlData *pGameDat
str_time_float(Time, TIME_HOURS_CENTISECS, aBuf, sizeof(aBuf));
int Ago = pSqlServer->GetInt(2);
int Stamp = pSqlServer->GetInt(3);
char aServer[5];
pSqlServer->GetString(5, aServer, sizeof(aServer));
char aServerFormatted[8] = "\0";
if(str_comp(aServer, "UNK") != 0)
str_format(aServerFormatted, sizeof(aServerFormatted), "[%s] ", aServer);
char aAgoString[40] = "\0";
sqlstr::AgoTimeToString(Ago, aAgoString, sizeof(aAgoString));
@ -1098,10 +1103,10 @@ bool CScore::ShowTimesThread(IDbConnection *pSqlServer, const ISqlData *pGameDat
{
if(Stamp == 0) // stamp is 00:00:00 cause it's an old entry from old times where there where no stamps yet
str_format(paMessages[Line], sizeof(paMessages[Line]),
"%s, don't know how long ago", aBuf);
"%s%s, don't know how long ago", aServerFormatted, aBuf);
else
str_format(paMessages[Line], sizeof(paMessages[Line]),
"%s ago, %s", aAgoString, aBuf);
"%s%s ago, %s", aServerFormatted, aAgoString, aBuf);
}
else // last 5 times of the server
{
@ -1110,12 +1115,12 @@ bool CScore::ShowTimesThread(IDbConnection *pSqlServer, const ISqlData *pGameDat
if(Stamp == 0) // stamp is 00:00:00 cause it's an old entry from old times where there where no stamps yet
{
str_format(paMessages[Line], sizeof(paMessages[Line]),
"%s, %s, don't know when", aName, aBuf);
"%s%s, %s, don't know when", aServerFormatted, aName, aBuf);
}
else
{
str_format(paMessages[Line], sizeof(paMessages[Line]),
"%s, %s ago, %s", aName, aAgoString, aBuf);
"%s%s, %s ago, %s", aServerFormatted, aName, aAgoString, aBuf);
}
}
Line++;