Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-10-24 13:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: activity game messages as structs

Browse Source 
Converts ActivityEnter, ActivityExit, ActivityStart, ActivityStop,
ActivityPause, StartActivityTime, RequestActivityEnter,
RequestActivityExit and ShowActivityCountdown to NetGameMsgs in
ActivityMessages.{h,cpp}, switches their callers (racing, shooting
gallery, survival, waves, AG course, NT combat challenge) and deletes
the old GameMessages::Send* / HandleRequestActivityExit functions.
REQUEST_ACTIVITY_EXIT is registered in GameMessageHandler's map.

No wire change. Verified by comparing every struct byte for byte with a
frozen verbatim copy of the old functions (tests/.../Legacy) over a
grid of inputs, both to one client and as a broadcast (a temporary test
proved the copy matched production before it was deleted), plus hand
computed golden bytes, round trips and a deliberate field mutation that
made the tests fail. Layouts confirmed against the 1.10.64 client in
Ghidra. Only difference: a broadcast no longer makes
the extra Send(UNASSIGNED, false) that RakNet already rejected.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-26 10:32:32 -05:00
parent b653a290a7
commit 060a5e4c5b
15 changed files with 589 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
dGame/dGameMessages/ActivityMessages.h Normal file
View File

@@ -0,0 +1,88 @@
#ifndef ACTIVITYMESSAGES_H
#define ACTIVITYMESSAGES_H
#include "GameMessages.h"
#include <string>
// Game messages for the activity lifecycle (minigames, races, shooting galleries, survival...).
// Field names and wire order match the client (legouniverse.exe 1.10.64). Fields are listed in wire order.
namespace GameMessages {
// Server -> client. No payload.
struct ActivityEnter : public NetGameMsg {
ActivityEnter() : NetGameMsg(MessageType::Game::ACTIVITY_ENTER) {}
};
// Server -> client. No payload.
struct ActivityExit : public NetGameMsg {
ActivityExit() : NetGameMsg(MessageType::Game::ACTIVITY_EXIT) {}
};
// Server -> client. No payload.
struct ActivityStart : public NetGameMsg {
ActivityStart() : NetGameMsg(MessageType::Game::ACTIVITY_START) {}
};
// Server -> client.
struct ActivityStop : public NetGameMsg {
ActivityStop() : NetGameMsg(MessageType::Game::ACTIVITY_STOP) {}
void Serialize(RakNet::BitStream& bitStream) const override;
bool Deserialize(RakNet::BitStream& bitStream) override;
bool bExit{};
bool bUserCancel{};
};
// Server -> client.
struct ActivityPause : public NetGameMsg {
ActivityPause() : NetGameMsg(MessageType::Game::ACTIVITY_PAUSE) {}
void Serialize(RakNet::BitStream& bitStream) const override;
bool Deserialize(RakNet::BitStream& bitStream) override;
bool bPause{};
};
// Server -> client.
struct StartActivityTime : public NetGameMsg {
StartActivityTime() : NetGameMsg(MessageType::Game::START_ACTIVITY_TIME) {}
void Serialize(RakNet::BitStream& bitStream) const override;
bool Deserialize(RakNet::BitStream& bitStream) override;
float startTime{};
};
// Client -> server in the client, but historically also sent by DLU. Kept for completeness.
struct RequestActivityEnter : public NetGameMsg {
RequestActivityEnter() : NetGameMsg(MessageType::Game::REQUEST_ACTIVITY_ENTER) {}
void Serialize(RakNet::BitStream& bitStream) const override;
bool Deserialize(RakNet::BitStream& bitStream) override;
bool bStart{};
LWOOBJID userID{};
};
// Client -> server. Sent when the player leaves an activity (e.g. closes the minigame UI).
struct RequestActivityExit : public NetGameMsg {
RequestActivityExit() : NetGameMsg(MessageType::Game::REQUEST_ACTIVITY_EXIT) {}
void Serialize(RakNet::BitStream& bitStream) const override;
bool Deserialize(RakNet::BitStream& bitStream) override;
void Handle(Entity& entity, const SystemAddress& sysAddr) override;
bool bUserCancel{};
LWOOBJID userID{};
};
// Server -> client.
struct ShowActivityCountdown : public NetGameMsg {
ShowActivityCountdown() : NetGameMsg(MessageType::Game::SHOW_ACTIVITY_COUNTDOWN) {}
void Serialize(RakNet::BitStream& bitStream) const override;
bool Deserialize(RakNet::BitStream& bitStream) override;
bool bPlayAdditionalSound{};
bool bPlayCountdownSound{};
std::u16string sndName{};
int32_t stateToPlaySoundOn{};
};
};
#endif // ACTIVITYMESSAGES_H