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

Merge #5585

Browse source 
5585: Only announce birthday once (fixes #5576) r=heinrich5991 a=def-

No matter if you use /timecp or rename

<!-- 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: Dennis Felsing <dennis@felsin9.de>
This commit is contained in:
bors[bot] 2022-07-07 09:35:05 +00:00 committed by GitHub
parent 9fd756224b aa18c1ee78
commit 9e9024d449
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/server/player.cpp
View file

@ -145,6 +145,7 @@ void CPlayer::Reset()
m_EligibleForFinishCheck = 0; m_EligibleForFinishCheck = 0;
m_VotedForPractice = false; m_VotedForPractice = false;
m_SwapTargetsClientID = -1; m_SwapTargetsClientID = -1;
m_BirthdayAnnounced = false;
} }
static int PlayerFlags_SixToSeven(int Flags) static int PlayerFlags_SixToSeven(int Flags)
@ -887,7 +888,7 @@ void CPlayer::ProcessScoreResult(CScorePlayerResult &Result)
m_Score = -10000; m_Score = -10000;
Server()->ExpireServerInfo(); Server()->ExpireServerInfo();
int Birthday = Result.m_Data.m_Info.m_Birthday; int Birthday = Result.m_Data.m_Info.m_Birthday;
if(Birthday != 0) if(Birthday != 0 && !m_BirthdayAnnounced)
{ {
char aBuf[512]; char aBuf[512];
str_format(aBuf, sizeof(aBuf), str_format(aBuf, sizeof(aBuf),
@ -898,6 +899,7 @@ void CPlayer::ProcessScoreResult(CScorePlayerResult &Result)
"Happy DDNet birthday, %s!\nYou have finished your first map exactly %d year%s ago!", "Happy DDNet birthday, %s!\nYou have finished your first map exactly %d year%s ago!",
Server()->ClientName(m_ClientID), Birthday, Birthday > 1 ? "s" : ""); Server()->ClientName(m_ClientID), Birthday, Birthday > 1 ? "s" : "");
GameServer()->SendBroadcast(aBuf, m_ClientID); GameServer()->SendBroadcast(aBuf, m_ClientID);
m_BirthdayAnnounced = true;
} }
GameServer()->SendRecord(m_ClientID); GameServer()->SendRecord(m_ClientID);
break; break;

1
src/game/server/player.h
View file

@ -214,6 +214,7 @@ public:
int64_t m_EligibleForFinishCheck; int64_t m_EligibleForFinishCheck;
bool m_VotedForPractice; bool m_VotedForPractice;
int m_SwapTargetsClientID; //Client ID of the swap target for the given player int m_SwapTargetsClientID; //Client ID of the swap target for the given player
bool m_BirthdayAnnounced;
}; };
#endif #endif