mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2025-09-05 23:08:31 +00:00
Consolidate serviceID enums into one enum (#1855)
* merge ServerType and ServiceID enums * rename eConnectionType to ServiceType in preparation for enum unification * unify ServiceID and ServiceType enums * shrink ServiceType to an 8-bit integer * fix linux compilation error and update gamemsg test * return to uint16_t * Update dNet/AuthPackets.cpp Use cast instead of padding Co-authored-by: David Markowitz <39972741+EmosewaMC@users.noreply.github.com> * Add default case to MasterServer.cpp * move ref back to type * Another formatting fix * Fix comment to be more accurate --------- Co-authored-by: jadebenn <9892985+jadebenn@users.noreply.github.com> Co-authored-by: David Markowitz <39972741+EmosewaMC@users.noreply.github.com>
This commit is contained in:
@@ -57,16 +57,17 @@ TEST_F(GameMessageTests, SendBlueprintLoadItemResponse) {
|
||||
ASSERT_EQ(bitStream->GetNumberOfUnreadBits(), 200);
|
||||
// First read in the packets' header
|
||||
uint8_t rakNetPacketId{};
|
||||
uint16_t remoteConnectionType{};
|
||||
uint8_t remoteServiceType{};
|
||||
uint32_t packetId{};
|
||||
uint8_t always0{};
|
||||
|
||||
bitStream->Read(rakNetPacketId);
|
||||
bitStream->Read(remoteConnectionType);
|
||||
bitStream->Read(remoteServiceType);
|
||||
bitStream->IgnoreBytes(1);
|
||||
bitStream->Read(packetId);
|
||||
bitStream->Read(always0);
|
||||
ASSERT_EQ(rakNetPacketId, 0x53);
|
||||
ASSERT_EQ(remoteConnectionType, 0x05);
|
||||
ASSERT_EQ(remoteServiceType, 0x5);
|
||||
ASSERT_EQ(packetId, 0x17);
|
||||
ASSERT_EQ(always0, 0x00);
|
||||
|
||||
|
Reference in New Issue
Block a user