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

Record player switch in teehistorian

Browse source
This commit is contained in:
Zwelf 2022-05-03 15:38:09 +02:00
parent 416af01e0a
commit 86f57289c6
5 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/engine/shared/teehistorian_ex_chunks.h
View file

@ -8,6 +8,7 @@ UUID(TEEHISTORIAN_AUTH_LOGIN, "teehistorian-auth-login@ddnet.tw")
UUID(TEEHISTORIAN_AUTH_LOGOUT, "teehistorian-auth-logout@ddnet.tw")
UUID(TEEHISTORIAN_JOINVER6, "teehistorian-joinver6@ddnet.tw")
UUID(TEEHISTORIAN_JOINVER7, "teehistorian-joinver7@ddnet.tw")
UUID(TEEHISTORIAN_PLAYER_SWITCH, "teehistorian-player-swap@ddnet.tw")
UUID(TEEHISTORIAN_SAVE_SUCCESS, "teehistorian-save-success@ddnet.tw")
UUID(TEEHISTORIAN_SAVE_FAILURE, "teehistorian-save-failure@ddnet.tw")
UUID(TEEHISTORIAN_LOAD_SUCCESS, "teehistorian-load-success@ddnet.tw")

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

@ -908,6 +908,8 @@ void CGameTeams::SwapTeamCharacters(CPlayer *pPlayer, CPlayer *pTargetPlayer, in
GameServer()->m_World.SwapClients(pPlayer->GetCID(), pTargetPlayer->GetCID());
GameServer()->TeeHistorian()->RecordPlayerSwap(pPlayer->GetCID(), pTargetPlayer->GetCID());
str_format(aBuf, sizeof(aBuf),
"%s has swapped with %s.",
Server()->ClientName(pPlayer->GetCID()), Server()->ClientName(pTargetPlayer->GetCID()));

12
src/game/server/teehistorian.cpp
View file

@ -576,6 +576,18 @@ void CTeeHistorian::RecordTestExtra()
WriteExtra(UUID_TEEHISTORIAN_TEST, "", 0);
}
void CTeeHistorian::RecordPlayerSwap(int ClientID1, int ClientID2)
{
EnsureTickWritten();
CPacker Buffer;
Buffer.Reset();
Buffer.AddInt(ClientID1);
Buffer.AddInt(ClientID2);
WriteExtra(UUID_TEEHISTORIAN_PLAYER_SWITCH, Buffer.Data(), Buffer.Size());
}
void CTeeHistorian::RecordTeamSaveSuccess(int Team, CUuid SaveID, const char *pTeamSave)
{
EnsureTickWritten();

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

@ -70,6 +70,7 @@ public:
void RecordPlayerDrop(int ClientID, const char *pReason);
void RecordConsoleCommand(int ClientID, int FlagMask, const char *pCmd, IConsole::IResult *pResult);
void RecordTestExtra();
void RecordPlayerSwap(int ClientID1, int ClientID2);
void RecordTeamSaveSuccess(int Team, CUuid SaveID, const char *pTeamSave);
void RecordTeamSaveFailure(int Team);
void RecordTeamLoadSuccess(int Team, CUuid SaveID, const char *pTeamSave);

23
src/test/teehistorian.cpp
View file

@ -592,6 +592,29 @@ TEST_F(TeeHistorian, LoadFailed)
Expect(EXPECTED, sizeof(EXPECTED));
}
TEST_F(TeeHistorian, PlayerSwap)
{
const unsigned char EXPECTED[] = {
// TICK_SKIP dt=0
0x41, 0x00,
// EX uuid=5de9b633-49cf-3e99-9a25-d4a78e9717d7 datalen=2
0x4a,
0x5d, 0xe9, 0xb6, 0x33, 0x49, 0xcf, 0x3e, 0x99,
0x9a, 0x25, 0xd4, 0xa7, 0x8e, 0x97, 0x17, 0xd7,
0x02,
// playerId1=11
0x0b,
// playerId2=21
0x15,
// FINISH
0x40};
Tick(1);
m_TH.RecordPlayerSwap(11, 21);
Finish();
Expect(EXPECTED, sizeof(EXPECTED));
}
TEST_F(TeeHistorian, PlayerTeam)
{
const unsigned char EXPECTED[] = {