Merge remote-tracking branch 'upstream/main' into first-draft-leaderboard-re-write

.github/workflows/build-and-test.yml

@@ -36,22 +36,16 @@ jobs:
         testPreset: "ci-${{matrix.os}}"
     - name: artifacts
       uses: actions/upload-artifact@v3
-      if: ${{ github.ref == 'ref/head/main' }}
       with:
         name: build-${{matrix.os}}
         path: |
-          build
+          build/*Server*
-          !build/tests
+          build/*.ini
-          !build/Testing
+          build/*.so
-          !build/CMakeFiles
+          build/*.dll
-          !build/DartConfiguration.tcl
+          build/vanity/
-          !build/CTestTestfile.cmake
+          build/navmeshes/
-          !build/CMakeCache.txt
+          build/migrations/
-          !build/build.ninja
+          build/*.dcf
-          !build/_deps
+          !build/*.pdb
-          !build/cmake_install.cmake
+          !build/d*/
-          !build/*.a
-          !build/*.lib
-          !build/*.dir
-          !build/*.vcxproj
-          !build/*.vcxproj.filters

dAuthServer/AuthServer.cpp

@@ -15,10 +15,13 @@
 
 //RakNet includes:
 #include "RakNetDefines.h"
+#include <MessageIdentifiers.h>
 
 //Auth includes:
 #include "AuthPackets.h"
-#include "dMessageIdentifiers.h"
+#include "eConnectionType.h"
+#include "eServerMessageType.h"
+#include "eAuthMessageType.h"
 
 #include "Game.h"
 namespace Game {
@@ -168,13 +171,15 @@ dLogger* SetupLogger() {
 }
 
 void HandlePacket(Packet* packet) {
+	if (packet->length < 4) return;
+
 	if (packet->data[0] == ID_USER_PACKET_ENUM) {
-		if (packet->data[1] == SERVER) {
+		if (static_cast<eConnectionType>(packet->data[1]) == eConnectionType::SERVER) {
-			if (packet->data[3] == MSG_SERVER_VERSION_CONFIRM) {
+			if (static_cast<eServerMessageType>(packet->data[3]) == eServerMessageType::VERSION_CONFIRM) {
 				AuthPackets::HandleHandshake(Game::server, packet);
 			}
-		} else if (packet->data[1] == AUTH) {
+		} else if (static_cast<eConnectionType>(packet->data[1]) == eConnectionType::AUTH) {
-			if (packet->data[3] == MSG_AUTH_LOGIN_REQUEST) {
+			if (static_cast<eAuthMessageType>(packet->data[3]) == eAuthMessageType::LOGIN_REQUEST) {
 				AuthPackets::HandleLoginRequest(Game::server, packet);
 			}
 		}

dChatServer/ChatPacketHandler.cpp

@@ -3,7 +3,6 @@
 #include "Database.h"
 #include <vector>
 #include "PacketUtils.h"
-#include "dMessageIdentifiers.h"
 #include "Game.h"
 #include "dServer.h"
 #include "GeneralUtils.h"
@@ -13,15 +12,19 @@
 #include "RakString.h"
 #include "dConfig.h"
 #include "eObjectBits.h"
+#include "eConnectionType.h"
+#include "eChatMessageType.h"
+#include "eChatInternalMessageType.h"
+#include "eClientMessageType.h"
+#include "eGameMessageType.h"
 
 extern PlayerContainer playerContainer;
 
 void ChatPacketHandler::HandleFriendlistRequest(Packet* packet) {
 	//Get from the packet which player we want to do something with:
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID = 0;
 	inStream.Read(playerID);
-	inStream.Read(playerID);
 
 	auto player = playerContainer.GetPlayerData(playerID);
 	if (!player) return;
@@ -72,11 +75,11 @@ void ChatPacketHandler::HandleFriendlistRequest(Packet* packet) {
 
 	//Now, we need to send the friendlist to the server they came from:
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(playerID);
 
 	//portion that will get routed:
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_GET_FRIENDS_LIST_RESPONSE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::GET_FRIENDS_LIST_RESPONSE);
 	bitStream.Write<uint8_t>(0);
 	bitStream.Write<uint16_t>(1); //Length of packet -- just writing one as it doesn't matter, client skips it.
 	bitStream.Write((uint16_t)friends.size());
@@ -95,10 +98,9 @@ void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
 	auto maxNumberOfBestFriendsAsString = Game::config->GetValue("max_number_of_best_friends");
 	// If this config option doesn't exist, default to 5 which is what live used.
 	auto maxNumberOfBestFriends = maxNumberOfBestFriendsAsString != "" ? std::stoi(maxNumberOfBestFriendsAsString) : 5U;
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID requestorPlayerID;
 	inStream.Read(requestorPlayerID);
-	inStream.Read(requestorPlayerID);
 	uint32_t spacing{};
 	inStream.Read(spacing);
 	std::string playerName = "";
@@ -243,10 +245,9 @@ void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
 }
 
 void ChatPacketHandler::HandleFriendResponse(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID;
 	inStream.Read(playerID);
-	inStream.Read(playerID);
 
 	eAddFriendResponseCode clientResponseCode = static_cast<eAddFriendResponseCode>(packet->data[0x14]);
 	std::string friendName = PacketUtils::ReadString(0x15, packet, true);
@@ -319,10 +320,9 @@ void ChatPacketHandler::HandleFriendResponse(Packet* packet) {
 }
 
 void ChatPacketHandler::HandleRemoveFriend(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID;
 	inStream.Read(playerID);
-	inStream.Read(playerID);
 	std::string friendName = PacketUtils::ReadString(0x14, packet, true);
 
 	//we'll have to query the db here to find the user, since you can delete them while they're offline.
@@ -377,10 +377,9 @@ void ChatPacketHandler::HandleRemoveFriend(Packet* packet) {
 }
 
 void ChatPacketHandler::HandleChatMessage(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID = LWOOBJID_EMPTY;
 	inStream.Read(playerID);
-	inStream.Read(playerID);
 
 	auto* sender = playerContainer.GetPlayerData(playerID);
 
@@ -413,10 +412,10 @@ void ChatPacketHandler::HandleChatMessage(Packet* packet) {
 		const auto otherName = std::string(otherMember->playerName.c_str());
 
 		CBITSTREAM;
-		PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_ROUTE_TO_PLAYER);
+		PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 		bitStream.Write(otherMember->playerID);
 
-		PacketUtils::WriteHeader(bitStream, CHAT, MSG_CHAT_PRIVATE_CHAT_MESSAGE);
+		PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::PRIVATE_CHAT_MESSAGE);
 		bitStream.Write(otherMember->playerID);
 		bitStream.Write<uint8_t>(8);
 		bitStream.Write<unsigned int>(69);
@@ -452,10 +451,10 @@ void ChatPacketHandler::HandlePrivateChatMessage(Packet* packet) {
 	//To the sender:
 	{
 		CBITSTREAM;
-		PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_ROUTE_TO_PLAYER);
+		PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 		bitStream.Write(goonA->playerID);
 
-		PacketUtils::WriteHeader(bitStream, CHAT, MSG_CHAT_PRIVATE_CHAT_MESSAGE);
+		PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::PRIVATE_CHAT_MESSAGE);
 		bitStream.Write(goonA->playerID);
 		bitStream.Write<uint8_t>(7);
 		bitStream.Write<unsigned int>(69);
@@ -475,10 +474,10 @@ void ChatPacketHandler::HandlePrivateChatMessage(Packet* packet) {
 	//To the receiver:
 	{
 		CBITSTREAM;
-		PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_ROUTE_TO_PLAYER);
+		PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 		bitStream.Write(goonB->playerID);
 
-		PacketUtils::WriteHeader(bitStream, CHAT, MSG_CHAT_PRIVATE_CHAT_MESSAGE);
+		PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::PRIVATE_CHAT_MESSAGE);
 		bitStream.Write(goonA->playerID);
 		bitStream.Write<uint8_t>(7);
 		bitStream.Write<unsigned int>(69);
@@ -497,10 +496,9 @@ void ChatPacketHandler::HandlePrivateChatMessage(Packet* packet) {
 }
 
 void ChatPacketHandler::HandleTeamInvite(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID;
 	inStream.Read(playerID);
-	inStream.Read(playerID);
 	std::string invitedPlayer = PacketUtils::ReadString(0x14, packet, true);
 
 	auto* player = playerContainer.GetPlayerData(playerID);
@@ -538,10 +536,9 @@ void ChatPacketHandler::HandleTeamInvite(Packet* packet) {
 }
 
 void ChatPacketHandler::HandleTeamInviteResponse(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID = LWOOBJID_EMPTY;
 	inStream.Read(playerID);
-	inStream.Read(playerID);
 	uint32_t size = 0;
 	inStream.Read(size);
 	char declined = 0;
@@ -572,10 +569,9 @@ void ChatPacketHandler::HandleTeamInviteResponse(Packet* packet) {
 }
 
 void ChatPacketHandler::HandleTeamLeave(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID = LWOOBJID_EMPTY;
 	inStream.Read(playerID);
-	inStream.Read(playerID);
 	uint32_t size = 0;
 	inStream.Read(size);
 
@@ -589,10 +585,9 @@ void ChatPacketHandler::HandleTeamLeave(Packet* packet) {
 }
 
 void ChatPacketHandler::HandleTeamKick(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID = LWOOBJID_EMPTY;
 	inStream.Read(playerID);
-	inStream.Read(playerID);
 
 	std::string kickedPlayer = PacketUtils::ReadString(0x14, packet, true);
 
@@ -620,10 +615,9 @@ void ChatPacketHandler::HandleTeamKick(Packet* packet) {
 }
 
 void ChatPacketHandler::HandleTeamPromote(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID = LWOOBJID_EMPTY;
 	inStream.Read(playerID);
-	inStream.Read(playerID);
 
 	std::string promotedPlayer = PacketUtils::ReadString(0x14, packet, true);
 
@@ -643,10 +637,9 @@ void ChatPacketHandler::HandleTeamPromote(Packet* packet) {
 }
 
 void ChatPacketHandler::HandleTeamLootOption(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID = LWOOBJID_EMPTY;
 	inStream.Read(playerID);
-	inStream.Read(playerID);
 	uint32_t size = 0;
 	inStream.Read(size);
 
@@ -667,10 +660,9 @@ void ChatPacketHandler::HandleTeamLootOption(Packet* packet) {
 }
 
 void ChatPacketHandler::HandleTeamStatusRequest(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID = LWOOBJID_EMPTY;
 	inStream.Read(playerID);
-	inStream.Read(playerID);
 
 	auto* team = playerContainer.GetTeam(playerID);
 	auto* data = playerContainer.GetPlayerData(playerID);
@@ -717,11 +709,11 @@ void ChatPacketHandler::HandleTeamStatusRequest(Packet* packet) {
 
 void ChatPacketHandler::SendTeamInvite(PlayerData* receiver, PlayerData* sender) {
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver->playerID);
 
 	//portion that will get routed:
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_TEAM_INVITE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::TEAM_INVITE);
 
 	PacketUtils::WritePacketWString(sender->playerName.c_str(), 33, &bitStream);
 	bitStream.Write(sender->playerID);
@@ -732,14 +724,14 @@ void ChatPacketHandler::SendTeamInvite(PlayerData* receiver, PlayerData* sender)
 
 void ChatPacketHandler::SendTeamInviteConfirm(PlayerData* receiver, bool bLeaderIsFreeTrial, LWOOBJID i64LeaderID, LWOZONEID i64LeaderZoneID, uint8_t ucLootFlag, uint8_t ucNumOfOtherPlayers, uint8_t ucResponseCode, std::u16string wsLeaderName) {
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver->playerID);
 
 	//portion that will get routed:
 	CMSGHEADER;
 
 	bitStream.Write(receiver->playerID);
-	bitStream.Write(GAME_MSG::GAME_MSG_TEAM_INVITE_CONFIRM);
+	bitStream.Write(eGameMessageType::TEAM_INVITE_CONFIRM);
 
 	bitStream.Write(bLeaderIsFreeTrial);
 	bitStream.Write(i64LeaderID);
@@ -759,14 +751,14 @@ void ChatPacketHandler::SendTeamInviteConfirm(PlayerData* receiver, bool bLeader
 
 void ChatPacketHandler::SendTeamStatus(PlayerData* receiver, LWOOBJID i64LeaderID, LWOZONEID i64LeaderZoneID, uint8_t ucLootFlag, uint8_t ucNumOfOtherPlayers, std::u16string wsLeaderName) {
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver->playerID);
 
 	//portion that will get routed:
 	CMSGHEADER;
 
 	bitStream.Write(receiver->playerID);
-	bitStream.Write(GAME_MSG::GAME_MSG_TEAM_GET_STATUS_RESPONSE);
+	bitStream.Write(eGameMessageType::TEAM_GET_STATUS_RESPONSE);
 
 	bitStream.Write(i64LeaderID);
 	bitStream.Write(i64LeaderZoneID);
@@ -784,14 +776,14 @@ void ChatPacketHandler::SendTeamStatus(PlayerData* receiver, LWOOBJID i64LeaderI
 
 void ChatPacketHandler::SendTeamSetLeader(PlayerData* receiver, LWOOBJID i64PlayerID) {
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver->playerID);
 
 	//portion that will get routed:
 	CMSGHEADER;
 
 	bitStream.Write(receiver->playerID);
-	bitStream.Write(GAME_MSG::GAME_MSG_TEAM_SET_LEADER);
+	bitStream.Write(eGameMessageType::TEAM_SET_LEADER);
 
 	bitStream.Write(i64PlayerID);
 
@@ -801,14 +793,14 @@ void ChatPacketHandler::SendTeamSetLeader(PlayerData* receiver, LWOOBJID i64Play
 
 void ChatPacketHandler::SendTeamAddPlayer(PlayerData* receiver, bool bIsFreeTrial, bool bLocal, bool bNoLootOnDeath, LWOOBJID i64PlayerID, std::u16string wsPlayerName, LWOZONEID zoneID) {
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver->playerID);
 
 	//portion that will get routed:
 	CMSGHEADER;
 
 	bitStream.Write(receiver->playerID);
-	bitStream.Write(GAME_MSG::GAME_MSG_TEAM_ADD_PLAYER);
+	bitStream.Write(eGameMessageType::TEAM_ADD_PLAYER);
 
 	bitStream.Write(bIsFreeTrial);
 	bitStream.Write(bLocal);
@@ -830,14 +822,14 @@ void ChatPacketHandler::SendTeamAddPlayer(PlayerData* receiver, bool bIsFreeTria
 
 void ChatPacketHandler::SendTeamRemovePlayer(PlayerData* receiver, bool bDisband, bool bIsKicked, bool bIsLeaving, bool bLocal, LWOOBJID i64LeaderID, LWOOBJID i64PlayerID, std::u16string wsPlayerName) {
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver->playerID);
 
 	//portion that will get routed:
 	CMSGHEADER;
 
 	bitStream.Write(receiver->playerID);
-	bitStream.Write(GAME_MSG::GAME_MSG_TEAM_REMOVE_PLAYER);
+	bitStream.Write(eGameMessageType::TEAM_REMOVE_PLAYER);
 
 	bitStream.Write(bDisband);
 	bitStream.Write(bIsKicked);
@@ -856,14 +848,14 @@ void ChatPacketHandler::SendTeamRemovePlayer(PlayerData* receiver, bool bDisband
 
 void ChatPacketHandler::SendTeamSetOffWorldFlag(PlayerData* receiver, LWOOBJID i64PlayerID, LWOZONEID zoneID) {
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver->playerID);
 
 	//portion that will get routed:
 	CMSGHEADER;
 
 	bitStream.Write(receiver->playerID);
-	bitStream.Write(GAME_MSG::GAME_MSG_TEAM_SET_OFF_WORLD_FLAG);
+	bitStream.Write(eGameMessageType::TEAM_SET_OFF_WORLD_FLAG);
 
 	bitStream.Write(i64PlayerID);
 	if (receiver->zoneID.GetCloneID() == zoneID.GetCloneID()) {
@@ -890,11 +882,11 @@ void ChatPacketHandler::SendFriendUpdate(PlayerData* friendData, PlayerData* pla
 		[bool] - is FTP*/
 
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(friendData->playerID);
 
 	//portion that will get routed:
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_UPDATE_FRIEND_NOTIFY);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::UPDATE_FRIEND_NOTIFY);
 	bitStream.Write<uint8_t>(notifyType);
 
 	std::string playerName = playerData->playerName.c_str();
@@ -929,11 +921,11 @@ void ChatPacketHandler::SendFriendRequest(PlayerData* receiver, PlayerData* send
 	}
 
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver->playerID);
 
 	//portion that will get routed:
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_ADD_FRIEND_REQUEST);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::ADD_FRIEND_REQUEST);
 	PacketUtils::WritePacketWString(sender->playerName.c_str(), 33, &bitStream);
 	bitStream.Write<uint8_t>(0); // This is a BFF flag however this is unused in live and does not have an implementation client side.
 
@@ -945,11 +937,11 @@ void ChatPacketHandler::SendFriendResponse(PlayerData* receiver, PlayerData* sen
 	if (!receiver || !sender) return;
 
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver->playerID);
 
 	// Portion that will get routed:
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_ADD_FRIEND_RESPONSE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::ADD_FRIEND_RESPONSE);
 	bitStream.Write(responseCode);
 	// For all requests besides accepted, write a flag that says whether or not we are already best friends with the receiver.
 	bitStream.Write<uint8_t>(responseCode != eAddFriendResponseType::ACCEPTED ? isBestFriendsAlready : sender->sysAddr != UNASSIGNED_SYSTEM_ADDRESS);
@@ -970,11 +962,11 @@ void ChatPacketHandler::SendRemoveFriend(PlayerData* receiver, std::string& pers
 	if (!receiver) return;
 
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver->playerID);
 
 	//portion that will get routed:
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_REMOVE_FRIEND_RESPONSE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::REMOVE_FRIEND_RESPONSE);
 	bitStream.Write<uint8_t>(isSuccessful); //isOnline
 	PacketUtils::WritePacketWString(personToRemove, 33, &bitStream);
 

dChatServer/ChatServer.cpp

@@ -9,19 +9,23 @@
 #include "dLogger.h"
 #include "Database.h"
 #include "dConfig.h"
-#include "dMessageIdentifiers.h"
 #include "dChatFilter.h"
 #include "Diagnostics.h"
 #include "AssetManager.h"
 #include "BinaryPathFinder.h"
-
+#include "eConnectionType.h"
 #include "PlayerContainer.h"
 #include "ChatPacketHandler.h"
+#include "eChatMessageType.h"
+#include "eChatInternalMessageType.h"
+#include "eWorldMessageType.h"
 
 #include "Game.h"
 
 //RakNet includes:
 #include "RakNetDefines.h"
+#include <MessageIdentifiers.h>
+
 namespace Game {
 	dLogger* logger = nullptr;
 	dServer* server = nullptr;
@@ -68,7 +72,7 @@ int main(int argc, char** argv) {
 		Game::assetManager = new AssetManager(clientPath);
 	} catch (std::runtime_error& ex) {
 		Game::logger->Log("ChatServer", "Got an error while setting up assets: %s", ex.what());
-		
+
 		return EXIT_FAILURE;
 	}
 
@@ -199,25 +203,27 @@ void HandlePacket(Packet* packet) {
 		Game::logger->Log("ChatServer", "A server is connecting, awaiting user list.");
 	}
 
-	if (packet->data[1] == CHAT_INTERNAL) {
+	if (packet->length < 4) return; // Nothing left to process.  Need 4 bytes to continue.
-		switch (packet->data[3]) {
+
-		case MSG_CHAT_INTERNAL_PLAYER_ADDED_NOTIFICATION:
+	if (static_cast<eConnectionType>(packet->data[1]) == eConnectionType::CHAT_INTERNAL) {
+		switch (static_cast<eChatInternalMessageType>(packet->data[3])) {
+		case eChatInternalMessageType::PLAYER_ADDED_NOTIFICATION:
 			playerContainer.InsertPlayer(packet);
 			break;
 
-		case MSG_CHAT_INTERNAL_PLAYER_REMOVED_NOTIFICATION:
+		case eChatInternalMessageType::PLAYER_REMOVED_NOTIFICATION:
 			playerContainer.RemovePlayer(packet);
 			break;
 
-		case MSG_CHAT_INTERNAL_MUTE_UPDATE:
+		case eChatInternalMessageType::MUTE_UPDATE:
 			playerContainer.MuteUpdate(packet);
 			break;
 
-		case MSG_CHAT_INTERNAL_CREATE_TEAM:
+		case eChatInternalMessageType::CREATE_TEAM:
 			playerContainer.CreateTeamServer(packet);
 			break;
 
-		case MSG_CHAT_INTERNAL_ANNOUNCEMENT: {
+		case eChatInternalMessageType::ANNOUNCEMENT: {
 			//we just forward this packet to every connected server
 			CINSTREAM;
 			Game::server->Send(&inStream, packet->systemAddress, true); //send to everyone except origin
@@ -229,67 +235,67 @@ void HandlePacket(Packet* packet) {
 		}
 	}
 
-	if (packet->data[1] == CHAT) {
+	if (static_cast<eConnectionType>(packet->data[1]) == eConnectionType::CHAT) {
-		switch (packet->data[3]) {
+		switch (static_cast<eChatMessageType>(packet->data[3])) {
-		case MSG_CHAT_GET_FRIENDS_LIST:
+		case eChatMessageType::GET_FRIENDS_LIST:
 			ChatPacketHandler::HandleFriendlistRequest(packet);
 			break;
 
-		case MSG_CHAT_GET_IGNORE_LIST:
+		case eChatMessageType::GET_IGNORE_LIST:
 			Game::logger->Log("ChatServer", "Asked for ignore list, but is unimplemented right now.");
 			break;
 
-		case MSG_CHAT_TEAM_GET_STATUS:
+		case eChatMessageType::TEAM_GET_STATUS:
 			ChatPacketHandler::HandleTeamStatusRequest(packet);
 			break;
 
-		case MSG_CHAT_ADD_FRIEND_REQUEST:
+		case eChatMessageType::ADD_FRIEND_REQUEST:
 			//this involves someone sending the initial request, the response is below, response as in from the other player.
 			//We basically just check to see if this player is online or not and route the packet.
 			ChatPacketHandler::HandleFriendRequest(packet);
 			break;
 
-		case MSG_CHAT_ADD_FRIEND_RESPONSE:
+		case eChatMessageType::ADD_FRIEND_RESPONSE:
 			//This isn't the response a server sent, rather it is a player's response to a received request.
 			//Here, we'll actually have to add them to eachother's friend lists depending on the response code.
 			ChatPacketHandler::HandleFriendResponse(packet);
 			break;
 
-		case MSG_CHAT_REMOVE_FRIEND:
+		case eChatMessageType::REMOVE_FRIEND:
 			ChatPacketHandler::HandleRemoveFriend(packet);
 			break;
 
-		case MSG_CHAT_GENERAL_CHAT_MESSAGE:
+		case eChatMessageType::GENERAL_CHAT_MESSAGE:
 			ChatPacketHandler::HandleChatMessage(packet);
 			break;
 
-		case MSG_CHAT_PRIVATE_CHAT_MESSAGE:
+		case eChatMessageType::PRIVATE_CHAT_MESSAGE:
 			//This message is supposed to be echo'd to both the sender and the receiver
 			//BUT: they have to have different responseCodes, so we'll do some of the ol hacky wacky to fix that right up.
 			ChatPacketHandler::HandlePrivateChatMessage(packet);
 			break;
 
-		case MSG_CHAT_TEAM_INVITE:
+		case eChatMessageType::TEAM_INVITE:
 			ChatPacketHandler::HandleTeamInvite(packet);
 			break;
 
-		case MSG_CHAT_TEAM_INVITE_RESPONSE:
+		case eChatMessageType::TEAM_INVITE_RESPONSE:
 			ChatPacketHandler::HandleTeamInviteResponse(packet);
 			break;
 
-		case MSG_CHAT_TEAM_LEAVE:
+		case eChatMessageType::TEAM_LEAVE:
 			ChatPacketHandler::HandleTeamLeave(packet);
 			break;
 
-		case MSG_CHAT_TEAM_SET_LEADER:
+		case eChatMessageType::TEAM_SET_LEADER:
 			ChatPacketHandler::HandleTeamPromote(packet);
 			break;
 
-		case MSG_CHAT_TEAM_KICK:
+		case eChatMessageType::TEAM_KICK:
 			ChatPacketHandler::HandleTeamKick(packet);
 			break;
 
-		case MSG_CHAT_TEAM_SET_LOOT:
+		case eChatMessageType::TEAM_SET_LOOT:
 			ChatPacketHandler::HandleTeamLootOption(packet);
 			break;
 
@@ -298,9 +304,9 @@ void HandlePacket(Packet* packet) {
 		}
 	}
 
-	if (packet->data[1] == WORLD) {
+	if (static_cast<eConnectionType>(packet->data[1]) == eConnectionType::WORLD) {
-		switch (packet->data[3]) {
+		switch (static_cast<eWorldMessageType>(packet->data[3])) {
-		case MSG_WORLD_CLIENT_ROUTE_PACKET: {
+		case eWorldMessageType::ROUTE_PACKET: {
 			Game::logger->Log("ChatServer", "Routing packet from world");
 			break;
 		}

dChatServer/PlayerContainer.cpp

@@ -6,9 +6,10 @@
 #include "dLogger.h"
 #include "ChatPacketHandler.h"
 #include "GeneralUtils.h"
-#include "dMessageIdentifiers.h"
 #include "PacketUtils.h"
 #include "Database.h"
+#include "eConnectionType.h"
+#include "eChatInternalMessageType.h"
 
 PlayerContainer::PlayerContainer() {
 }
@@ -18,9 +19,8 @@ PlayerContainer::~PlayerContainer() {
 }
 
 void PlayerContainer::InsertPlayer(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	PlayerData* data = new PlayerData();
-	inStream.SetReadOffset(inStream.GetReadOffset() + 64);
 	inStream.Read(data->playerID);
 
 	uint32_t len;
@@ -51,9 +51,8 @@ void PlayerContainer::InsertPlayer(Packet* packet) {
 }
 
 void PlayerContainer::RemovePlayer(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID;
-	inStream.Read(playerID); //skip header
 	inStream.Read(playerID);
 
 	//Before they get kicked, we need to also send a message to their friends saying that they disconnected.
@@ -96,9 +95,8 @@ void PlayerContainer::RemovePlayer(Packet* packet) {
 }
 
 void PlayerContainer::MuteUpdate(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID;
-	inStream.Read(playerID); //skip header
 	inStream.Read(playerID);
 	time_t expire = 0;
 	inStream.Read(expire);
@@ -117,9 +115,8 @@ void PlayerContainer::MuteUpdate(Packet* packet) {
 }
 
 void PlayerContainer::CreateTeamServer(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID;
-	inStream.Read(playerID); //skip header
 	inStream.Read(playerID);
 	size_t membersSize = 0;
 	inStream.Read(membersSize);
@@ -149,7 +146,7 @@ void PlayerContainer::CreateTeamServer(Packet* packet) {
 
 void PlayerContainer::BroadcastMuteUpdate(LWOOBJID player, time_t time) {
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_MUTE_UPDATE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::MUTE_UPDATE);
 
 	bitStream.Write(player);
 	bitStream.Write(time);
@@ -348,7 +345,7 @@ void PlayerContainer::TeamStatusUpdate(TeamData* team) {
 
 void PlayerContainer::UpdateTeamsOnWorld(TeamData* team, bool deleteTeam) {
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_TEAM_UPDATE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::TEAM_UPDATE);
 
 	bitStream.Write(team->teamID);
 	bitStream.Write(deleteTeam);

dCommon/AMFDeserialize.cpp

@@ -1,77 +1,81 @@
 #include "AMFDeserialize.h"
 
-#include "AMFFormat.h"
+#include <stdexcept>
+
+#include "Amf3.h"
 
 /**
  * AMF3 Reference document https://rtmp.veriskope.com/pdf/amf3-file-format-spec.pdf
  * AMF3 Deserializer written by EmosewaMC
  */
 
-AMFValue* AMFDeserialize::Read(RakNet::BitStream* inStream) {
+AMFBaseValue* AMFDeserialize::Read(RakNet::BitStream* inStream) {
 	if (!inStream) return nullptr;
-	AMFValue* returnValue = nullptr;
+	AMFBaseValue* returnValue = nullptr;
 	// Read in the value type from the bitStream
-	int8_t marker;
+	uint8_t i;
-	inStream->Read(marker);
+	inStream->Read(i);
+	if (i > static_cast<uint8_t>(eAmf::Dictionary)) return nullptr;
+	eAmf marker = static_cast<eAmf>(i);
 	// Based on the typing, create the value associated with that and return the base value class
 	switch (marker) {
-	case AMFValueType::AMFUndefined: {
+	case eAmf::Undefined: {
-		returnValue = new AMFUndefinedValue();
+		returnValue = new AMFBaseValue();
 		break;
 	}
 
-	case AMFValueType::AMFNull: {
+	case eAmf::Null: {
 		returnValue = new AMFNullValue();
 		break;
 	}
 
-	case AMFValueType::AMFFalse: {
+	case eAmf::False: {
-		returnValue = new AMFFalseValue();
+		returnValue = new AMFBoolValue(false);
 		break;
 	}
 
-	case AMFValueType::AMFTrue: {
+	case eAmf::True: {
-		returnValue = new AMFTrueValue();
+		returnValue = new AMFBoolValue(true);
 		break;
 	}
 
-	case AMFValueType::AMFInteger: {
+	case eAmf::Integer: {
 		returnValue = ReadAmfInteger(inStream);
 		break;
 	}
 
-	case AMFValueType::AMFDouble: {
+	case eAmf::Double: {
 		returnValue = ReadAmfDouble(inStream);
 		break;
 	}
 
-	case AMFValueType::AMFString: {
+	case eAmf::String: {
 		returnValue = ReadAmfString(inStream);
 		break;
 	}
 
-	case AMFValueType::AMFArray: {
+	case eAmf::Array: {
 		returnValue = ReadAmfArray(inStream);
 		break;
 	}
 
-							   // TODO We do not need these values, but if someone wants to implement them
+	// These values are unimplemented in the live client and will remain unimplemented
-							   // then please do so and add the corresponding unit tests.
+	// unless someone modifies the client to allow serializing of these values.
-	case AMFValueType::AMFXMLDoc:
+	case eAmf::XMLDoc:
-	case AMFValueType::AMFDate:
+	case eAmf::Date:
-	case AMFValueType::AMFObject:
+	case eAmf::Object:
-	case AMFValueType::AMFXML:
+	case eAmf::XML:
-	case AMFValueType::AMFByteArray:
+	case eAmf::ByteArray:
-	case AMFValueType::AMFVectorInt:
+	case eAmf::VectorInt:
-	case AMFValueType::AMFVectorUInt:
+	case eAmf::VectorUInt:
-	case AMFValueType::AMFVectorDouble:
+	case eAmf::VectorDouble:
-	case AMFValueType::AMFVectorObject:
+	case eAmf::VectorObject:
-	case AMFValueType::AMFDictionary: {
+	case eAmf::Dictionary: {
-		throw static_cast<AMFValueType>(marker);
+		throw marker;
 		break;
 	}
 	default:
-		throw static_cast<AMFValueType>(marker);
+		throw std::invalid_argument("Invalid AMF3 marker" + std::to_string(static_cast<int32_t>(marker)));
 		break;
 	}
 	return returnValue;
@@ -99,7 +103,7 @@ uint32_t AMFDeserialize::ReadU29(RakNet::BitStream* inStream) {
 	return actualNumber;
 }
 
-std::string AMFDeserialize::ReadString(RakNet::BitStream* inStream) {
+const std::string AMFDeserialize::ReadString(RakNet::BitStream* inStream) {
 	auto length = ReadU29(inStream);
 	// Check if this is a reference
 	bool isReference = length % 2 == 1;
@@ -113,48 +117,39 @@ std::string AMFDeserialize::ReadString(RakNet::BitStream* inStream) {
 		return value;
 	} else {
 		// Length is a reference to a previous index - use that as the read in value
-		return accessedElements[length];
+		return accessedElements.at(length);
 	}
 }
 
-AMFValue* AMFDeserialize::ReadAmfDouble(RakNet::BitStream* inStream) {
+AMFBaseValue* AMFDeserialize::ReadAmfDouble(RakNet::BitStream* inStream) {
-	auto doubleValue = new AMFDoubleValue();
 	double value;
 	inStream->Read<double>(value);
-	doubleValue->SetDoubleValue(value);
+	return new AMFDoubleValue(value);
-	return doubleValue;
 }
 
-AMFValue* AMFDeserialize::ReadAmfArray(RakNet::BitStream* inStream) {
+AMFBaseValue* AMFDeserialize::ReadAmfArray(RakNet::BitStream* inStream) {
 	auto arrayValue = new AMFArrayValue();
 
 	// Read size of dense array
 	auto sizeOfDenseArray = (ReadU29(inStream) >> 1);
-
+	// Then read associative portion
-	// Then read Key'd portion
 	while (true) {
 		auto key = ReadString(inStream);
-		// No more values when we encounter an empty string
+		// No more associative values when we encounter an empty string key
 		if (key.size() == 0) break;
-		arrayValue->InsertValue(key, Read(inStream));
+		arrayValue->Insert(key, Read(inStream));
 	}
-
 	// Finally read dense portion
 	for (uint32_t i = 0; i < sizeOfDenseArray; i++) {
-		arrayValue->PushBackValue(Read(inStream));
+		arrayValue->Insert(i, Read(inStream));
 	}
-
 	return arrayValue;
 }
 
-AMFValue* AMFDeserialize::ReadAmfString(RakNet::BitStream* inStream) {
+AMFBaseValue* AMFDeserialize::ReadAmfString(RakNet::BitStream* inStream) {
-	auto stringValue = new AMFStringValue();
+	return new AMFStringValue(ReadString(inStream));
-	stringValue->SetStringValue(ReadString(inStream));
-	return stringValue;
 }
 
-AMFValue* AMFDeserialize::ReadAmfInteger(RakNet::BitStream* inStream) {
+AMFBaseValue* AMFDeserialize::ReadAmfInteger(RakNet::BitStream* inStream) {
-	auto integerValue = new AMFIntegerValue();
+	return new AMFIntValue(ReadU29(inStream));
-	integerValue->SetIntegerValue(ReadU29(inStream));
-	return integerValue;
 }

dCommon/AMFDeserialize.h

@@ -5,7 +5,8 @@
 #include <vector>
 #include <string>
 
-class AMFValue;
+class AMFBaseValue;
+
 class AMFDeserialize {
 public:
 	/**
@@ -14,7 +15,7 @@ public:
 	 * @param inStream inStream to read value from.
 	 * @return Returns an AMFValue with all the information from the bitStream in it.
 	 */
-	AMFValue* Read(RakNet::BitStream* inStream);
+	AMFBaseValue* Read(RakNet::BitStream* inStream);
 private:
 	/**
 	 * @brief Private method to read a U29 integer from a bitstream
@@ -30,7 +31,7 @@ private:
 	 * @param inStream bitStream to read data from
 	 * @return The read string
 	 */
-	std::string ReadString(RakNet::BitStream* inStream);
+	const std::string ReadString(RakNet::BitStream* inStream);
 
 	/**
 	 * @brief Read an AMFDouble value from a bitStream
@@ -38,7 +39,7 @@ private:
 	 * @param inStream bitStream to read data from
 	 * @return Double value represented as an AMFValue
 	 */
-	AMFValue* ReadAmfDouble(RakNet::BitStream* inStream);
+	AMFBaseValue* ReadAmfDouble(RakNet::BitStream* inStream);
 
 	/**
 	 * @brief Read an AMFArray from a bitStream
@@ -46,7 +47,7 @@ private:
 	 * @param inStream bitStream to read data from
 	 * @return Array value represented as an AMFValue
 	 */
-	AMFValue* ReadAmfArray(RakNet::BitStream* inStream);
+	AMFBaseValue* ReadAmfArray(RakNet::BitStream* inStream);
 
 	/**
 	 * @brief Read an AMFString from a bitStream
@@ -54,7 +55,7 @@ private:
 	 * @param inStream bitStream to read data from
 	 * @return String value represented as an AMFValue
 	 */
-	AMFValue* ReadAmfString(RakNet::BitStream* inStream);
+	AMFBaseValue* ReadAmfString(RakNet::BitStream* inStream);
 
 	/**
 	 * @brief Read an AMFInteger from a bitStream
@@ -62,7 +63,7 @@ private:
 	 * @param inStream bitStream to read data from
 	 * @return Integer value represented as an AMFValue
 	 */
-	AMFValue* ReadAmfInteger(RakNet::BitStream* inStream);
+	AMFBaseValue* ReadAmfInteger(RakNet::BitStream* inStream);
 
 	/**
 	 * List of strings read so far saved to be read by reference.

dCommon/AMFFormat.cpp

@@ -1,156 +0,0 @@
-#include "AMFFormat.h"
-
-// AMFInteger
-void AMFIntegerValue::SetIntegerValue(uint32_t value) {
-	this->value = value;
-}
-
-uint32_t AMFIntegerValue::GetIntegerValue() {
-	return this->value;
-}
-
-// AMFDouble
-void AMFDoubleValue::SetDoubleValue(double value) {
-	this->value = value;
-}
-
-double AMFDoubleValue::GetDoubleValue() {
-	return this->value;
-}
-
-// AMFString
-void AMFStringValue::SetStringValue(const std::string& value) {
-	this->value = value;
-}
-
-std::string AMFStringValue::GetStringValue() {
-	return this->value;
-}
-
-// AMFXMLDoc
-void AMFXMLDocValue::SetXMLDocValue(const std::string& value) {
-	this->xmlData = value;
-}
-
-std::string AMFXMLDocValue::GetXMLDocValue() {
-	return this->xmlData;
-}
-
-// AMFDate
-void AMFDateValue::SetDateValue(uint64_t value) {
-	this->millisecondTimestamp = value;
-}
-
-uint64_t AMFDateValue::GetDateValue() {
-	return this->millisecondTimestamp;
-}
-
-// AMFArray Insert Value
-void AMFArrayValue::InsertValue(const std::string& key, AMFValue* value) {
-	this->associative.insert(std::make_pair(key, value));
-}
-
-// AMFArray Remove Value
-void AMFArrayValue::RemoveValue(const std::string& key) {
-	_AMFArrayMap_::iterator it = this->associative.find(key);
-	if (it != this->associative.end()) {
-		this->associative.erase(it);
-	}
-}
-
-// AMFArray Get Associative Iterator Begin
-_AMFArrayMap_::iterator AMFArrayValue::GetAssociativeIteratorValueBegin() {
-	return this->associative.begin();
-}
-
-// AMFArray Get Associative Iterator End
-_AMFArrayMap_::iterator AMFArrayValue::GetAssociativeIteratorValueEnd() {
-	return this->associative.end();
-}
-
-// AMFArray Push Back Value
-void AMFArrayValue::PushBackValue(AMFValue* value) {
-	this->dense.push_back(value);
-}
-
-// AMFArray Pop Back Value
-void AMFArrayValue::PopBackValue() {
-	this->dense.pop_back();
-}
-
-// AMFArray Get Dense List Size
-uint32_t AMFArrayValue::GetDenseValueSize() {
-	return (uint32_t)this->dense.size();
-}
-
-// AMFArray Get Dense Iterator Begin
-_AMFArrayList_::iterator AMFArrayValue::GetDenseIteratorBegin() {
-	return this->dense.begin();
-}
-
-// AMFArray Get Dense Iterator End
-_AMFArrayList_::iterator AMFArrayValue::GetDenseIteratorEnd() {
-	return this->dense.end();
-}
-
-AMFArrayValue::~AMFArrayValue() {
-	for (auto valueToDelete : GetDenseArray()) {
-		if (valueToDelete) delete valueToDelete;
-	}
-	for (auto valueToDelete : GetAssociativeMap()) {
-		if (valueToDelete.second) delete valueToDelete.second;
-	}
-}
-
-// AMFObject Constructor
-AMFObjectValue::AMFObjectValue(std::vector<std::pair<std::string, AMFValueType>> traits) {
-	this->traits.reserve(traits.size());
-	std::vector<std::pair<std::string, AMFValueType>>::iterator it = traits.begin();
-	while (it != traits.end()) {
-		this->traits.insert(std::make_pair(it->first, std::make_pair(it->second, new AMFNullValue())));
-		it++;
-	}
-}
-
-// AMFObject Set Value
-void AMFObjectValue::SetTraitValue(const std::string& trait, AMFValue* value) {
-	if (value) {
-		_AMFObjectTraits_::iterator it = this->traits.find(trait);
-		if (it != this->traits.end()) {
-			if (it->second.first == value->GetValueType()) {
-				it->second.second = value;
-			}
-		}
-	}
-}
-
-// AMFObject Get Value
-AMFValue* AMFObjectValue::GetTraitValue(const std::string& trait) {
-	_AMFObjectTraits_::iterator it = this->traits.find(trait);
-	if (it != this->traits.end()) {
-		return it->second.second;
-	}
-
-	return nullptr;
-}
-
-// AMFObject Get Trait Iterator Begin
-_AMFObjectTraits_::iterator AMFObjectValue::GetTraitsIteratorBegin() {
-	return this->traits.begin();
-}
-
-// AMFObject Get Trait Iterator End
-_AMFObjectTraits_::iterator AMFObjectValue::GetTraitsIteratorEnd() {
-	return this->traits.end();
-}
-
-// AMFObject Get Trait Size
-uint32_t AMFObjectValue::GetTraitArrayCount() {
-	return (uint32_t)this->traits.size();
-}
-
-AMFObjectValue::~AMFObjectValue() {
-	for (auto valueToDelete = GetTraitsIteratorBegin(); valueToDelete != GetTraitsIteratorEnd(); valueToDelete++) {
-		if (valueToDelete->second.second) delete valueToDelete->second.second;
-	}
-}

dCommon/AMFFormat.h

@@ -1,413 +0,0 @@
-#pragma once
-
-// Custom Classes
-#include "dCommonVars.h"
-
-// C++
-#include <unordered_map>
-#include <vector>
-
-/*!
-  \file AMFFormat.hpp
-  \brief A class for managing AMF values
- */
-
-class AMFValue;     // Forward declaration
-
-// Definitions
-#define _AMFArrayMap_               std::unordered_map<std::string, AMFValue*>
-#define _AMFArrayList_              std::vector<AMFValue*>
-
-#define _AMFObjectTraits_           std::unordered_map<std::string, std::pair<AMFValueType, AMFValue*>>
-#define _AMFObjectDynamicTraits_    std::unordered_map<std::string, AMFValue*>
-
-//! An enum for each AMF value type
-enum AMFValueType : unsigned char {
-	AMFUndefined = 0x00,            //!< An undefined AMF Value
-	AMFNull = 0x01,                 //!< A null AMF value
-	AMFFalse = 0x02,                //!< A false AMF value
-	AMFTrue = 0x03,                 //!< A true AMF value
-	AMFInteger = 0x04,              //!< An integer AMF value
-	AMFDouble = 0x05,               //!< A double AMF value
-	AMFString = 0x06,               //!< A string AMF value
-	AMFXMLDoc = 0x07,               //!< An XML Doc AMF value
-	AMFDate = 0x08,                 //!< A date AMF value
-	AMFArray = 0x09,                //!< An array AMF value
-	AMFObject = 0x0A,               //!< An object AMF value
-	AMFXML = 0x0B,                  //!< An XML AMF value
-	AMFByteArray = 0x0C,            //!< A byte array AMF value
-	AMFVectorInt = 0x0D,            //!< An integer vector AMF value
-	AMFVectorUInt = 0x0E,           //!< An unsigned integer AMF value
-	AMFVectorDouble = 0x0F,         //!< A double vector AMF value
-	AMFVectorObject = 0x10,         //!< An object vector AMF value
-	AMFDictionary = 0x11            //!< A dictionary AMF value
-};
-
-//! An enum for the object value types
-enum AMFObjectValueType : unsigned char {
-	AMFObjectAnonymous = 0x01,
-	AMFObjectTyped = 0x02,
-	AMFObjectDynamic = 0x03,
-	AMFObjectExternalizable = 0x04
-};
-
-//! The base AMF value class
-class AMFValue {
-public:
-	//! Returns the AMF value type
-	/*!
-	  \return The AMF value type
-	 */
-	virtual AMFValueType GetValueType() = 0;
-	virtual ~AMFValue() {};
-};
-
-//! A typedef for a pointer to an AMF value
-typedef AMFValue* NDGFxValue;
-
-
-// The various AMF value types
-
-//! The undefined value AMF type
-class AMFUndefinedValue : public AMFValue {
-private:
-	//! Returns the AMF value type
-	/*!
-	  \return The AMF value type
-	 */
-	AMFValueType GetValueType() { return ValueType; }
-public:
-	static const AMFValueType ValueType = AMFUndefined;
-};
-
-//! The null value AMF type
-class AMFNullValue : public AMFValue {
-private:
-	//! Returns the AMF value type
-	/*!
-	 \return The AMF value type
-	 */
-	AMFValueType GetValueType() { return ValueType; }
-public:
-	static const AMFValueType ValueType = AMFNull;
-};
-
-//! The false value AMF type
-class AMFFalseValue : public AMFValue {
-private:
-	//! Returns the AMF value type
-	/*!
-	 \return The AMF value type
-	 */
-	AMFValueType GetValueType() { return ValueType; }
-public:
-	static const AMFValueType ValueType = AMFFalse;
-};
-
-//! The true value AMF type
-class AMFTrueValue : public AMFValue {
-private:
-	//! Returns the AMF value type
-	/*!
-	 \return The AMF value type
-	 */
-	AMFValueType GetValueType() { return ValueType; }
-public:
-	static const AMFValueType ValueType = AMFTrue;
-};
-
-//! The integer value AMF type
-class AMFIntegerValue : public AMFValue {
-private:
-	uint32_t value;         //!< The value of the AMF type
-
-	//! Returns the AMF value type
-	/*!
-	 \return The AMF value type
-	 */
-	AMFValueType GetValueType() { return ValueType; }
-
-public:
-	static const AMFValueType ValueType = AMFInteger;
-	//! Sets the integer value
-	/*!
-	  \param value The value to set
-	 */
-	void SetIntegerValue(uint32_t value);
-
-	//! Gets the integer value
-	/*!
-	  \return The integer value
-	 */
-	uint32_t GetIntegerValue();
-};
-
-//! The double value AMF type
-class AMFDoubleValue : public AMFValue {
-private:
-	double value;           //!< The value of the AMF type
-
-	//! Returns the AMF value type
-	/*!
-	 \return The AMF value type
-	 */
-	AMFValueType GetValueType() { return ValueType; }
-
-public:
-	static const AMFValueType ValueType = AMFDouble;
-	//! Sets the double value
-	/*!
-	  \param value The value to set to
-	 */
-	void SetDoubleValue(double value);
-
-	//! Gets the double value
-	/*!
-	  \return The double value
-	 */
-	double GetDoubleValue();
-};
-
-//! The string value AMF type
-class AMFStringValue : public AMFValue {
-private:
-	std::string value;          //!< The value of the AMF type
-
-	//! Returns the AMF value type
-	/*!
-	 \return The AMF value type
-	 */
-	AMFValueType GetValueType() { return ValueType; }
-
-public:
-	static const AMFValueType ValueType = AMFString;
-	//! Sets the string value
-	/*!
-	  \param value The string value to set to
-	 */
-	void SetStringValue(const std::string& value);
-
-	//! Gets the string value
-	/*!
-	  \return The string value
-	 */
-	std::string GetStringValue();
-};
-
-//! The XML doc value AMF type
-class AMFXMLDocValue : public AMFValue {
-private:
-	std::string xmlData;            //!< The value of the AMF type
-
-	//! Returns the AMF value type
-	/*!
-	 \return The AMF value type
-	 */
-	AMFValueType GetValueType() { return ValueType; }
-
-public:
-	static const AMFValueType ValueType = AMFXMLDoc;
-	//! Sets the XML Doc value
-	/*!
-	  \param value The value to set to
-	 */
-	void SetXMLDocValue(const std::string& value);
-
-	//! Gets the XML Doc value
-	/*!
-	  \return The XML Doc value
-	 */
-	std::string GetXMLDocValue();
-};
-
-//! The date value AMF type
-class AMFDateValue : public AMFValue {
-private:
-	uint64_t millisecondTimestamp;      //!< The time in milliseconds since the ephoch
-
-	//! Returns the AMF value type
-	/*!
-	 \return The AMF value type
-	 */
-	AMFValueType GetValueType() { return ValueType; }
-
-public:
-	static const AMFValueType ValueType = AMFDate;
-	//! Sets the date time
-	/*!
-	  \param value The value to set to
-	 */
-	void SetDateValue(uint64_t value);
-
-	//! Gets the date value
-	/*!
-	  \return The date value in milliseconds since the epoch
-	 */
-	uint64_t GetDateValue();
-};
-
-//! The array value AMF type
-// This object will manage it's own memory map and list.  Do not delete its values.
-class AMFArrayValue : public AMFValue {
-private:
-	_AMFArrayMap_ associative;      //!< The array map (associative part)
-	_AMFArrayList_ dense;           //!< The array list (dense part)
-
-	//! Returns the AMF value type
-	/*!
-	 \return The AMF value type
-	 */
-	AMFValueType GetValueType() override { return ValueType; }
-
-public:
-	static const AMFValueType ValueType = AMFArray;
-
-	~AMFArrayValue() override;
-	//! Inserts an item into the array map for a specific key
-	/*!
-	  \param key The key to set
-	  \param value The value to add
-	 */
-	void InsertValue(const std::string& key, AMFValue* value);
-
-	//! Removes an item for a specific key
-	/*!
-	  \param key The key to remove
-	 */
-	void RemoveValue(const std::string& key);
-
-	//! Finds an AMF value
-	/*!
-	  \return The AMF value if found, nullptr otherwise
-	 */
-	template <typename T>
-	T* FindValue(const std::string& key) const {
-		_AMFArrayMap_::const_iterator it = this->associative.find(key);
-		if (it != this->associative.end() && T::ValueType == it->second->GetValueType()) {
-			return dynamic_cast<T*>(it->second);
-		}
-
-		return nullptr;
-	};
-
-	//! Returns where the associative iterator begins
-	/*!
-	  \return Where the array map iterator begins
-	 */
-	_AMFArrayMap_::iterator GetAssociativeIteratorValueBegin();
-
-	//! Returns where the associative iterator ends
-	/*!
-	  \return Where the array map iterator ends
-	 */
-	_AMFArrayMap_::iterator GetAssociativeIteratorValueEnd();
-
-	//! Pushes back a value into the array list
-	/*!
-	  \param value The value to push back
-	 */
-	void PushBackValue(AMFValue* value);
-
-	//! Pops back the last value in the array list
-	void PopBackValue();
-
-	//! Gets the count of the dense list
-	/*!
-	  \return The dense list size
-	 */
-	uint32_t GetDenseValueSize();
-
-	//! Gets a specific value from the list for the specified index
-	/*!
-	  \param index The index to get
-	 */
-	template <typename T>
-	T* GetValueAt(uint32_t index) {
-		if (index >= this->dense.size()) return nullptr;
-		AMFValue* foundValue = this->dense.at(index);
-		return T::ValueType == foundValue->GetValueType() ? dynamic_cast<T*>(foundValue) : nullptr;
-	};
-
-	//! Returns where the dense iterator begins
-	/*!
-	  \return Where the iterator begins
-	 */
-	_AMFArrayList_::iterator GetDenseIteratorBegin();
-
-	//! Returns where the dense iterator ends
-	/*!
-	  \return Where the iterator ends
-	 */
-	_AMFArrayList_::iterator GetDenseIteratorEnd();
-
-	//! Returns the associative map
-	/*!
-	  \return The associative map
-	 */
-	_AMFArrayMap_ GetAssociativeMap() { return this->associative; };
-
-	//! Returns the dense array
-	/*!
-	  \return The dense array
-	 */
-	_AMFArrayList_ GetDenseArray() { return this->dense; };
-};
-
-//! The anonymous object value AMF type
-class AMFObjectValue : public AMFValue {
-private:
-	_AMFObjectTraits_ traits;           //!< The object traits
-
-	//! Returns the AMF value type
-	/*!
-	 \return The AMF value type
-	 */
-	AMFValueType GetValueType() override { return ValueType; }
-	~AMFObjectValue() override;
-
-public:
-	static const AMFValueType ValueType = AMFObject;
-	//! Constructor
-	/*!
-	  \param traits The traits to set
-	 */
-	AMFObjectValue(std::vector<std::pair<std::string, AMFValueType>> traits);
-
-	//! Gets the object value type
-	/*!
-	  \return The object value type
-	 */
-	virtual AMFObjectValueType GetObjectValueType() { return AMFObjectAnonymous; }
-
-	//! Sets the value of a trait
-	/*!
-	  \param trait The trait to set the value for
-	  \param value The AMF value to set
-	 */
-	void SetTraitValue(const std::string& trait, AMFValue* value);
-
-	//! Gets a trait value
-	/*!
-	  \param trait The trait to get the value for
-	  \return The trait value
-	 */
-	AMFValue* GetTraitValue(const std::string& trait);
-
-	//! Gets the beginning of the object traits iterator
-	/*!
-	  \return The AMF trait array iterator begin
-	 */
-	_AMFObjectTraits_::iterator GetTraitsIteratorBegin();
-
-	//! Gets the end of the object traits iterator
-	/*!
-	  \return The AMF trait array iterator begin
-	 */
-	_AMFObjectTraits_::iterator GetTraitsIteratorEnd();
-
-	//! Gets the amount of traits
-	/*!
-	  \return The amount of traits
-	 */
-	uint32_t GetTraitArrayCount();
-};

dCommon/AMFFormat_BitStream.cpp

@@ -1,259 +0,0 @@
-#include "AMFFormat_BitStream.h"
-
-// Writes an AMFValue pointer to a RakNet::BitStream
-template<>
-void RakNet::BitStream::Write<AMFValue*>(AMFValue* value) {
-	if (value != nullptr) {
-		AMFValueType type = value->GetValueType();
-
-		switch (type) {
-		case AMFUndefined: {
-			AMFUndefinedValue* v = (AMFUndefinedValue*)value;
-			this->Write(*v);
-			break;
-		}
-
-		case AMFNull: {
-			AMFNullValue* v = (AMFNullValue*)value;
-			this->Write(*v);
-			break;
-		}
-
-		case AMFFalse: {
-			AMFFalseValue* v = (AMFFalseValue*)value;
-			this->Write(*v);
-			break;
-		}
-
-		case AMFTrue: {
-			AMFTrueValue* v = (AMFTrueValue*)value;
-			this->Write(*v);
-			break;
-		}
-
-		case AMFInteger: {
-			AMFIntegerValue* v = (AMFIntegerValue*)value;
-			this->Write(*v);
-			break;
-		}
-
-		case AMFDouble: {
-			AMFDoubleValue* v = (AMFDoubleValue*)value;
-			this->Write(*v);
-			break;
-		}
-
-		case AMFString: {
-			AMFStringValue* v = (AMFStringValue*)value;
-			this->Write(*v);
-			break;
-		}
-
-		case AMFXMLDoc: {
-			AMFXMLDocValue* v = (AMFXMLDocValue*)value;
-			this->Write(*v);
-			break;
-		}
-
-		case AMFDate: {
-			AMFDateValue* v = (AMFDateValue*)value;
-			this->Write(*v);
-			break;
-		}
-
-		case AMFArray: {
-			this->Write((AMFArrayValue*)value);
-			break;
-		}
-		case AMFObject:
-		case AMFXML:
-		case AMFByteArray:
-		case AMFVectorInt:
-		case AMFVectorUInt:
-		case AMFVectorDouble:
-		case AMFVectorObject:
-		case AMFDictionary:
-			break;
-		}
-	}
-}
-
-/**
- * A private function to write an value to a RakNet::BitStream
- * RakNet writes in the correct byte order - do not reverse this.
- */
-void WriteUInt29(RakNet::BitStream* bs, uint32_t v) {
-	unsigned char b4 = (unsigned char)v;
-	if (v < 0x00200000) {
-		b4 = b4 & 0x7F;
-		if (v > 0x7F) {
-			unsigned char b3;
-			v = v >> 7;
-			b3 = ((unsigned char)(v)) | 0x80;
-			if (v > 0x7F) {
-				unsigned char b2;
-				v = v >> 7;
-				b2 = ((unsigned char)(v)) | 0x80;
-				bs->Write(b2);
-			}
-
-			bs->Write(b3);
-		}
-	} else {
-		unsigned char b1;
-		unsigned char b2;
-		unsigned char b3;
-
-		v = v >> 8;
-		b3 = ((unsigned char)(v)) | 0x80;
-		v = v >> 7;
-		b2 = ((unsigned char)(v)) | 0x80;
-		v = v >> 7;
-		b1 = ((unsigned char)(v)) | 0x80;
-
-		bs->Write(b1);
-		bs->Write(b2);
-		bs->Write(b3);
-	}
-
-	bs->Write(b4);
-}
-
-/**
- * Writes a flag number to a RakNet::BitStream
- * RakNet writes in the correct byte order - do not reverse this.
- */
-void WriteFlagNumber(RakNet::BitStream* bs, uint32_t v) {
-	v = (v << 1) | 0x01;
-	WriteUInt29(bs, v);
-}
-
-/**
- * Writes an AMFString to a RakNet::BitStream
- *
- * RakNet writes in the correct byte order - do not reverse this.
- */
-void WriteAMFString(RakNet::BitStream* bs, const std::string& str) {
-	WriteFlagNumber(bs, (uint32_t)str.size());
-	bs->Write(str.c_str(), (uint32_t)str.size());
-}
-
-/**
- * Writes an U16 to a bitstream
- *
- * RakNet writes in the correct byte order - do not reverse this.
- */
-void WriteAMFU16(RakNet::BitStream* bs, uint16_t value) {
-	bs->Write(value);
-}
-
-/**
- * Writes an U32 to a bitstream
- *
- * RakNet writes in the correct byte order - do not reverse this.
- */
-void WriteAMFU32(RakNet::BitStream* bs, uint32_t value) {
-	bs->Write(value);
-}
-
-/**
- * Writes an U64 to a bitstream
- *
- * RakNet writes in the correct byte order - do not reverse this.
- */
-void WriteAMFU64(RakNet::BitStream* bs, uint64_t value) {
-	bs->Write(value);
-}
-
-
-// Writes an AMFUndefinedValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFUndefinedValue>(AMFUndefinedValue value) {
-	this->Write(AMFUndefined);
-}
-
-// Writes an AMFNullValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFNullValue>(AMFNullValue value) {
-	this->Write(AMFNull);
-}
-
-// Writes an AMFFalseValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFFalseValue>(AMFFalseValue value) {
-	this->Write(AMFFalse);
-}
-
-// Writes an AMFTrueValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFTrueValue>(AMFTrueValue value) {
-	this->Write(AMFTrue);
-}
-
-// Writes an AMFIntegerValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFIntegerValue>(AMFIntegerValue value) {
-	this->Write(AMFInteger);
-	WriteUInt29(this, value.GetIntegerValue());
-}
-
-// Writes an AMFDoubleValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFDoubleValue>(AMFDoubleValue value) {
-	this->Write(AMFDouble);
-	double d = value.GetDoubleValue();
-	WriteAMFU64(this, *((unsigned long long*) & d));
-}
-
-// Writes an AMFStringValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFStringValue>(AMFStringValue value) {
-	this->Write(AMFString);
-	std::string v = value.GetStringValue();
-	WriteAMFString(this, v);
-}
-
-// Writes an AMFXMLDocValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFXMLDocValue>(AMFXMLDocValue value) {
-	this->Write(AMFXMLDoc);
-	std::string v = value.GetXMLDocValue();
-	WriteAMFString(this, v);
-}
-
-// Writes an AMFDateValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFDateValue>(AMFDateValue value) {
-	this->Write(AMFDate);
-	uint64_t date = value.GetDateValue();
-	WriteAMFU64(this, date);
-}
-
-// Writes an AMFArrayValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFArrayValue*>(AMFArrayValue* value) {
-	this->Write(AMFArray);
-	uint32_t denseSize = value->GetDenseValueSize();
-	WriteFlagNumber(this, denseSize);
-
-	_AMFArrayMap_::iterator it = value->GetAssociativeIteratorValueBegin();
-	_AMFArrayMap_::iterator end = value->GetAssociativeIteratorValueEnd();
-
-	while (it != end) {
-		WriteAMFString(this, it->first);
-		this->Write(it->second);
-		it++;
-	}
-
-	this->Write(AMFNull);
-
-	if (denseSize > 0) {
-		_AMFArrayList_::iterator it2 = value->GetDenseIteratorBegin();
-		_AMFArrayList_::iterator end2 = value->GetDenseIteratorEnd();
-
-		while (it2 != end2) {
-			this->Write(*it2);
-			it2++;
-		}
-	}
-}

dCommon/AMFFormat_BitStream.h

@@ -1,92 +0,0 @@
-#pragma once
-
-// Custom Classes
-#include "AMFFormat.h"
-
-// RakNet
-#include <BitStream.h>
-
-/*!
- \file AMFFormat_BitStream.h
- \brief A class that implements native writing of AMF values to RakNet::BitStream
- */
-
- // We are using the RakNet namespace
-namespace RakNet {
-	//! Writes an AMFValue pointer to a RakNet::BitStream
-	/*!
-	 \param value The value to write
-	 */
-	template <>
-	void RakNet::BitStream::Write<AMFValue*>(AMFValue* value);
-
-	//! Writes an AMFUndefinedValue to a RakNet::BitStream
-	/*!
-	 \param value The value to write
-	 */
-	template <>
-	void RakNet::BitStream::Write<AMFUndefinedValue>(AMFUndefinedValue value);
-
-	//! Writes an AMFNullValue to a RakNet::BitStream
-	/*!
-	 \param value The value to write
-	 */
-	template <>
-	void RakNet::BitStream::Write<AMFNullValue>(AMFNullValue value);
-
-	//! Writes an AMFFalseValue to a RakNet::BitStream
-	/*!
-	 \param value The value to write
-	 */
-	template <>
-	void RakNet::BitStream::Write<AMFFalseValue>(AMFFalseValue value);
-
-	//! Writes an AMFTrueValue to a RakNet::BitStream
-	/*!
-	 \param value The value to write
-	 */
-	template <>
-	void RakNet::BitStream::Write<AMFTrueValue>(AMFTrueValue value);
-
-	//! Writes an AMFIntegerValue to a RakNet::BitStream
-	/*!
-	 \param value The value to write
-	 */
-	template <>
-	void RakNet::BitStream::Write<AMFIntegerValue>(AMFIntegerValue value);
-
-	//! Writes an AMFDoubleValue to a RakNet::BitStream
-	/*!
-	 \param value The value to write
-	 */
-	template <>
-	void RakNet::BitStream::Write<AMFDoubleValue>(AMFDoubleValue value);
-
-	//! Writes an AMFStringValue to a RakNet::BitStream
-	/*!
-	 \param value The value to write
-	 */
-	template <>
-	void RakNet::BitStream::Write<AMFStringValue>(AMFStringValue value);
-
-	//! Writes an AMFXMLDocValue to a RakNet::BitStream
-	/*!
-	 \param value The value to write
-	 */
-	template <>
-	void RakNet::BitStream::Write<AMFXMLDocValue>(AMFXMLDocValue value);
-
-	//! Writes an AMFDateValue to a RakNet::BitStream
-	/*!
-	 \param value The value to write
-	 */
-	template <>
-	void RakNet::BitStream::Write<AMFDateValue>(AMFDateValue value);
-
-	//! Writes an AMFArrayValue to a RakNet::BitStream
-	/*!
-	 \param value The value to write
-	 */
-	template <>
-	void RakNet::BitStream::Write<AMFArrayValue*>(AMFArrayValue* value);
-} // namespace RakNet

dCommon/Amf3.h

@@ -0,0 +1,367 @@
+#ifndef __AMF3__H__
+#define __AMF3__H__
+
+#include "dCommonVars.h"
+#include "dLogger.h"
+#include "Game.h"
+
+#include <unordered_map>
+#include <vector>
+
+enum class eAmf : uint8_t {
+	Undefined = 0x00,            // An undefined AMF Value
+	Null = 0x01,                 // A null AMF value
+	False = 0x02,                // A false AMF value
+	True = 0x03,                 // A true AMF value
+	Integer = 0x04,              // An integer AMF value
+	Double = 0x05,               // A double AMF value
+	String = 0x06,               // A string AMF value
+	XMLDoc = 0x07,               // Unused in the live client and cannot be serialized without modification.  An XML Doc AMF value
+	Date = 0x08,                 // Unused in the live client and cannot be serialized without modification.  A date AMF value
+	Array = 0x09,                // An array AMF value
+	Object = 0x0A,               // Unused in the live client and cannot be serialized without modification.  An object AMF value
+	XML = 0x0B,                  // Unused in the live client and cannot be serialized without modification.  An XML AMF value
+	ByteArray = 0x0C,            // Unused in the live client and cannot be serialized without modification.  A byte array AMF value
+	VectorInt = 0x0D,            // Unused in the live client and cannot be serialized without modification.  An integer vector AMF value
+	VectorUInt = 0x0E,           // Unused in the live client and cannot be serialized without modification.  An unsigned integer AMF value
+	VectorDouble = 0x0F,         // Unused in the live client and cannot be serialized without modification.  A double vector AMF value
+	VectorObject = 0x10,         // Unused in the live client and cannot be serialized without modification.  An object vector AMF value
+	Dictionary = 0x11            // Unused in the live client and cannot be serialized without modification.  A dictionary AMF value
+};
+
+class AMFBaseValue {
+public:
+	virtual eAmf GetValueType() { return eAmf::Undefined; };
+	AMFBaseValue() {};
+	virtual ~AMFBaseValue() {};
+};
+
+template<typename ValueType>
+class AMFValue : public AMFBaseValue {
+public:
+	AMFValue() {};
+	AMFValue(ValueType value) { SetValue(value); };
+	virtual ~AMFValue() override {};
+
+	eAmf GetValueType() override { return eAmf::Undefined; };
+
+	const ValueType& GetValue() { return data; };
+	void SetValue(ValueType value) { data = value; };
+protected:
+	ValueType data;
+};
+
+// As a string this is much easier to write and read from a BitStream.
+template<>
+class AMFValue<const char*> : public AMFBaseValue {
+public:
+	AMFValue() {};
+	AMFValue(const char* value) { SetValue(std::string(value)); };
+	virtual ~AMFValue() override {};
+
+	eAmf GetValueType() override { return eAmf::String; };
+
+	const std::string& GetValue() { return data; };
+	void SetValue(std::string value) { data = value; };
+protected:
+	std::string data;
+};
+
+typedef AMFValue<std::nullptr_t> AMFNullValue;
+typedef AMFValue<bool> AMFBoolValue;
+typedef AMFValue<int32_t> AMFIntValue;
+typedef AMFValue<std::string> AMFStringValue;
+typedef AMFValue<double> AMFDoubleValue;
+
+template<> inline eAmf AMFValue<std::nullptr_t>::GetValueType() { return eAmf::Null; };
+template<> inline eAmf AMFValue<bool>::GetValueType() { return this->data ? eAmf::True : eAmf::False; };
+template<> inline eAmf AMFValue<int32_t>::GetValueType() { return eAmf::Integer; };
+template<> inline eAmf AMFValue<uint32_t>::GetValueType() { return eAmf::Integer; };
+template<> inline eAmf AMFValue<std::string>::GetValueType() { return eAmf::String; };
+template<> inline eAmf AMFValue<double>::GetValueType() { return eAmf::Double; };
+
+/**
+ * The AMFArrayValue object holds 2 types of lists:
+ * An associative list where a key maps to a value
+ * A Dense list where elements are stored back to back
+ *
+ * Objects that are Registered are owned by this object
+ * and are not to be deleted by a caller.
+ */
+class AMFArrayValue : public AMFBaseValue {
+
+	typedef std::unordered_map<std::string, AMFBaseValue*> AMFAssociative;
+	typedef std::vector<AMFBaseValue*> AMFDense;
+
+public:
+	eAmf GetValueType() override { return eAmf::Array; };
+
+	~AMFArrayValue() override {
+		for (auto valueToDelete : GetDense()) {
+			if (valueToDelete) {
+				delete valueToDelete;
+				valueToDelete = nullptr;
+			}
+		}
+		for (auto valueToDelete : GetAssociative()) {
+			if (valueToDelete.second) {
+				delete valueToDelete.second;
+				valueToDelete.second = nullptr;
+			}
+		}
+	};
+
+	/**
+	 * Returns the Associative portion of the object
+	 */
+	inline AMFAssociative& GetAssociative() { return this->associative; };
+
+	/**
+	 * Returns the dense portion of the object
+	 */
+	inline AMFDense& GetDense() { return this->dense; };
+
+	/**
+	 * Inserts an AMFValue into the associative portion with the given key.
+	 * If a duplicate is attempted to be inserted, it is ignored and the
+	 * first value with that key is kept in the map.
+	 *
+	 * These objects are not to be deleted by the caller as they are owned by
+	 * the AMFArray object which manages its own memory.
+	 *
+	 * @param key The key to associate with the value
+	 * @param value The value to insert
+	 *
+	 * @return The inserted element if the type matched,
+	 * or nullptr if a key existed and was not the same type
+	 */
+	template<typename ValueType>
+	std::pair<AMFValue<ValueType>*, bool> Insert(const std::string& key, ValueType value) {
+		auto element = associative.find(key);
+		AMFValue<ValueType>* val = nullptr;
+		bool found = true;
+		if (element == associative.end()) {
+			val = new AMFValue<ValueType>(value);
+			associative.insert(std::make_pair(key, val));
+		} else {
+			val = dynamic_cast<AMFValue<ValueType>*>(element->second);
+			found = false;
+		}
+		return std::make_pair(val, found);
+	};
+
+	// Associates an array with a string key
+	std::pair<AMFBaseValue*, bool> Insert(const std::string& key) {
+		auto element = associative.find(key);
+		AMFArrayValue* val = nullptr;
+		bool found = true;
+		if (element == associative.end()) {
+			val = new AMFArrayValue();
+			associative.insert(std::make_pair(key, val));
+		} else {
+			val = dynamic_cast<AMFArrayValue*>(element->second);
+			found = false;
+		}
+		return std::make_pair(val, found);
+	};
+
+	// Associates an array with an integer key
+	std::pair<AMFBaseValue*, bool> Insert(const uint32_t& index) {
+		AMFArrayValue* val = nullptr;
+		bool inserted = false;
+		if (index >= dense.size()) {
+			dense.resize(index + 1);
+			val = new AMFArrayValue();
+			dense.at(index) = val;
+			inserted = true;
+		}
+		return std::make_pair(dynamic_cast<AMFArrayValue*>(dense.at(index)), inserted);
+	};
+
+	/**
+	 * @brief Inserts an AMFValue into the AMFArray key'd by index.
+	 * Attempting to insert the same key to the same value twice overwrites
+	 * the previous value with the new one.
+	 *
+	 * @param index The index to associate with the value
+	 * @param value The value to insert
+	 * @return The inserted element, or nullptr if the type did not match
+	 * what was at the index.
+	 */
+	template<typename ValueType>
+	std::pair<AMFValue<ValueType>*, bool> Insert(const uint32_t& index, ValueType value) {
+		AMFValue<ValueType>* val = nullptr;
+		bool inserted = false;
+		if (index >= this->dense.size()) {
+			this->dense.resize(index + 1);
+			val = new AMFValue<ValueType>(value);
+			this->dense.at(index) = val;
+			inserted = true;
+		}
+		return std::make_pair(dynamic_cast<AMFValue<ValueType>*>(this->dense.at(index)), inserted);
+	};
+
+	/**
+	 * Inserts an AMFValue into the associative portion with the given key.
+	 * If a duplicate is attempted to be inserted, it replaces the original
+	 *
+	 * The inserted element is now owned by this object and is not to be deleted
+	 *
+	 * @param key The key to associate with the value
+	 * @param value The value to insert
+	 */
+	void Insert(const std::string& key, AMFBaseValue* value) {
+		auto element = associative.find(key);
+		if (element != associative.end() && element->second) {
+			delete element->second;
+			element->second = value;
+		} else {
+			associative.insert(std::make_pair(key, value));
+		}
+	};
+
+	/**
+	 * Inserts an AMFValue into the associative portion with the given index.
+	 * If a duplicate is attempted to be inserted, it replaces the original
+	 *
+	 * The inserted element is now owned by this object and is not to be deleted
+	 *
+	 * @param key The key to associate with the value
+	 * @param value The value to insert
+	 */
+	void Insert(const uint32_t index, AMFBaseValue* value) {
+		if (index < dense.size()) {
+			AMFDense::iterator itr = dense.begin() + index;
+			if (*itr) delete dense.at(index);
+		} else {
+			dense.resize(index + 1);
+		}
+		dense.at(index) = value;
+	};
+
+	/**
+	 * Pushes an AMFValue into the back of the dense portion.
+	 *
+	 * These objects are not to be deleted by the caller as they are owned by
+	 * the AMFArray object which manages its own memory.
+	 *
+	 * @param value The value to insert
+	 *
+	 * @return The inserted pointer, or nullptr should the key already be in use.
+	 */
+	template<typename ValueType>
+	inline AMFValue<ValueType>* Push(ValueType value) {
+		return Insert(this->dense.size(), value).first;
+	};
+
+	/**
+	 * Removes the key from the associative portion
+	 *
+	 * The pointer removed is now no longer managed by this container
+	 *
+	 * @param key The key to remove from the associative portion
+	 */
+	void Remove(const std::string& key, bool deleteValue = true) {
+		AMFAssociative::iterator it = this->associative.find(key);
+		if (it != this->associative.end()) {
+			if (deleteValue) delete it->second;
+			this->associative.erase(it);
+		}
+	}
+
+	/**
+	 * Pops the last element in the dense portion, deleting it in the process.
+	 */
+	void Remove(const uint32_t index) {
+		if (!this->dense.empty() && index < this->dense.size()) {
+			auto itr = this->dense.begin() + index;
+			if (*itr) delete (*itr);
+			this->dense.erase(itr);
+		}
+	}
+
+	void Pop() {
+		if (!this->dense.empty()) Remove(this->dense.size() - 1);
+	}
+
+	AMFArrayValue* GetArray(const std::string& key) {
+		AMFAssociative::const_iterator it = this->associative.find(key);
+		if (it != this->associative.end()) {
+			return dynamic_cast<AMFArrayValue*>(it->second);
+		}
+		return nullptr;
+	};
+
+	AMFArrayValue* GetArray(const uint32_t index) {
+		return index >= this->dense.size() ? nullptr : dynamic_cast<AMFArrayValue*>(this->dense.at(index));
+	};
+
+	inline AMFArrayValue* InsertArray(const std::string& key) {
+		return static_cast<AMFArrayValue*>(Insert(key).first);
+	};
+
+	inline AMFArrayValue* InsertArray(const uint32_t index) {
+		return static_cast<AMFArrayValue*>(Insert(index).first);
+	};
+
+	inline AMFArrayValue* PushArray() {
+		return static_cast<AMFArrayValue*>(Insert(this->dense.size()).first);
+	};
+
+	/**
+	 * Gets an AMFValue by the key from the associative portion and converts it
+	 * to the AmfValue template type.  If the key did not exist, it is inserted.
+	 *
+	 * @tparam The target object type
+	 * @param key The key to lookup
+	 *
+	 * @return The AMFValue
+	 */
+	template <typename AmfType>
+	AMFValue<AmfType>* Get(const std::string& key) const {
+		AMFAssociative::const_iterator it = this->associative.find(key);
+		return it != this->associative.end() ?
+			dynamic_cast<AMFValue<AmfType>*>(it->second) :
+			nullptr;
+	};
+
+	// Get from the array but dont cast it
+	AMFBaseValue* Get(const std::string& key) const {
+		AMFAssociative::const_iterator it = this->associative.find(key);
+		return it != this->associative.end() ? it->second : nullptr;
+	};
+
+	/**
+	 * @brief Get an AMFValue object at a position in the dense portion.
+	 * Gets an AMFValue by the index from the dense portion and converts it
+	 * to the AmfValue template type.  If the index did not exist, it is inserted.
+	 *
+	 * @tparam The target object type
+	 * @param index The index to get
+	 * @return The casted object, or nullptr.
+	 */
+	template <typename AmfType>
+	AMFValue<AmfType>* Get(uint32_t index) const {
+		return index < this->dense.size() ?
+			dynamic_cast<AMFValue<AmfType>*>(this->dense.at(index)) :
+			nullptr;
+	};
+
+	// Get from the dense but dont cast it
+	AMFBaseValue* Get(const uint32_t index) const {
+		return index < this->dense.size() ? this->dense.at(index) : nullptr;
+	};
+private:
+	/**
+	 * The associative portion.  These values are key'd with strings to an AMFValue.
+	 */
+	AMFAssociative associative;
+
+	/**
+	 * The dense portion.  These AMFValue's are stored one after
+	 * another with the most recent addition being at the back.
+	 */
+	AMFDense dense;
+};
+
+#endif  //!__AMF3__H__

dCommon/AmfSerialize.cpp

@@ -0,0 +1,184 @@
+#include "AmfSerialize.h"
+
+#include "Game.h"
+#include "dLogger.h"
+
+// Writes an AMFValue pointer to a RakNet::BitStream
+template<>
+void RakNet::BitStream::Write<AMFBaseValue&>(AMFBaseValue& value) {
+	eAmf type = value.GetValueType();
+	this->Write(type);
+	switch (type) {
+	case eAmf::Integer: {
+		this->Write<AMFIntValue&>(*static_cast<AMFIntValue*>(&value));
+		break;
+	}
+
+	case eAmf::Double: {
+		this->Write<AMFDoubleValue&>(*static_cast<AMFDoubleValue*>(&value));
+		break;
+	}
+
+	case eAmf::String: {
+		this->Write<AMFStringValue&>(*static_cast<AMFStringValue*>(&value));
+		break;
+	}
+
+	case eAmf::Array: {
+		this->Write<AMFArrayValue&>(*static_cast<AMFArrayValue*>(&value));
+		break;
+	}
+	default: {
+		Game::logger->Log("AmfSerialize", "Encountered unwritable AMFType %i!", type);
+	}
+	case eAmf::Undefined:
+	case eAmf::Null:
+	case eAmf::False:
+	case eAmf::True:
+	case eAmf::Date:
+	case eAmf::Object:
+	case eAmf::XML:
+	case eAmf::XMLDoc:
+	case eAmf::ByteArray:
+	case eAmf::VectorInt:
+	case eAmf::VectorUInt:
+	case eAmf::VectorDouble:
+	case eAmf::VectorObject:
+	case eAmf::Dictionary:
+		break;
+	}
+}
+
+/**
+ * A private function to write an value to a RakNet::BitStream
+ * RakNet writes in the correct byte order - do not reverse this.
+ */
+void WriteUInt29(RakNet::BitStream* bs, uint32_t v) {
+	unsigned char b4 = (unsigned char)v;
+	if (v < 0x00200000) {
+		b4 = b4 & 0x7F;
+		if (v > 0x7F) {
+			unsigned char b3;
+			v = v >> 7;
+			b3 = ((unsigned char)(v)) | 0x80;
+			if (v > 0x7F) {
+				unsigned char b2;
+				v = v >> 7;
+				b2 = ((unsigned char)(v)) | 0x80;
+				bs->Write(b2);
+			}
+
+			bs->Write(b3);
+		}
+	} else {
+		unsigned char b1;
+		unsigned char b2;
+		unsigned char b3;
+
+		v = v >> 8;
+		b3 = ((unsigned char)(v)) | 0x80;
+		v = v >> 7;
+		b2 = ((unsigned char)(v)) | 0x80;
+		v = v >> 7;
+		b1 = ((unsigned char)(v)) | 0x80;
+
+		bs->Write(b1);
+		bs->Write(b2);
+		bs->Write(b3);
+	}
+
+	bs->Write(b4);
+}
+
+/**
+ * Writes a flag number to a RakNet::BitStream
+ * RakNet writes in the correct byte order - do not reverse this.
+ */
+void WriteFlagNumber(RakNet::BitStream* bs, uint32_t v) {
+	v = (v << 1) | 0x01;
+	WriteUInt29(bs, v);
+}
+
+/**
+ * Writes an AMFString to a RakNet::BitStream
+ *
+ * RakNet writes in the correct byte order - do not reverse this.
+ */
+void WriteAMFString(RakNet::BitStream* bs, const std::string& str) {
+	WriteFlagNumber(bs, (uint32_t)str.size());
+	bs->Write(str.c_str(), (uint32_t)str.size());
+}
+
+/**
+ * Writes an U16 to a bitstream
+ *
+ * RakNet writes in the correct byte order - do not reverse this.
+ */
+void WriteAMFU16(RakNet::BitStream* bs, uint16_t value) {
+	bs->Write(value);
+}
+
+/**
+ * Writes an U32 to a bitstream
+ *
+ * RakNet writes in the correct byte order - do not reverse this.
+ */
+void WriteAMFU32(RakNet::BitStream* bs, uint32_t value) {
+	bs->Write(value);
+}
+
+/**
+ * Writes an U64 to a bitstream
+ *
+ * RakNet writes in the correct byte order - do not reverse this.
+ */
+void WriteAMFU64(RakNet::BitStream* bs, uint64_t value) {
+	bs->Write(value);
+}
+
+// Writes an AMFIntegerValue to BitStream
+template<>
+void RakNet::BitStream::Write<AMFIntValue&>(AMFIntValue& value) {
+	WriteUInt29(this, value.GetValue());
+}
+
+// Writes an AMFDoubleValue to BitStream
+template<>
+void RakNet::BitStream::Write<AMFDoubleValue&>(AMFDoubleValue& value) {
+	double d = value.GetValue();
+	WriteAMFU64(this, *reinterpret_cast<uint64_t*>(&d));
+}
+
+// Writes an AMFStringValue to BitStream
+template<>
+void RakNet::BitStream::Write<AMFStringValue&>(AMFStringValue& value) {
+	WriteAMFString(this, value.GetValue());
+}
+
+// Writes an AMFArrayValue to BitStream
+template<>
+void RakNet::BitStream::Write<AMFArrayValue&>(AMFArrayValue& value) {
+	uint32_t denseSize = value.GetDense().size();
+	WriteFlagNumber(this, denseSize);
+
+	auto it = value.GetAssociative().begin();
+	auto end = value.GetAssociative().end();
+
+	while (it != end) {
+		WriteAMFString(this, it->first);
+		this->Write<AMFBaseValue&>(*it->second);
+		it++;
+	}
+
+	this->Write(eAmf::Null);
+
+	if (denseSize > 0) {
+		auto it2 = value.GetDense().begin();
+		auto end2 = value.GetDense().end();
+
+		while (it2 != end2) {
+			this->Write<AMFBaseValue&>(**it2);
+			it2++;
+		}
+	}
+}

dCommon/AmfSerialize.h

@@ -0,0 +1,50 @@
+#pragma once
+
+// Custom Classes
+#include "Amf3.h"
+
+// RakNet
+#include <BitStream.h>
+
+/*!
+ \file AmfSerialize.h
+ \brief A class that implements native writing of AMF values to RakNet::BitStream
+ */
+
+ // We are using the RakNet namespace
+namespace RakNet {
+	//! Writes an AMFValue pointer to a RakNet::BitStream
+	/*!
+	 \param value The value to write
+	 */
+	template <>
+	void RakNet::BitStream::Write<AMFBaseValue&>(AMFBaseValue& value);
+
+	//! Writes an AMFIntegerValue to a RakNet::BitStream
+	/*!
+	 \param value The value to write
+	 */
+	template <>
+	void RakNet::BitStream::Write<AMFIntValue&>(AMFIntValue& value);
+
+	//! Writes an AMFDoubleValue to a RakNet::BitStream
+	/*!
+	 \param value The value to write
+	 */
+	template <>
+	void RakNet::BitStream::Write<AMFDoubleValue&>(AMFDoubleValue& value);
+
+	//! Writes an AMFStringValue to a RakNet::BitStream
+	/*!
+	 \param value The value to write
+	 */
+	template <>
+	void RakNet::BitStream::Write<AMFStringValue&>(AMFStringValue& value);
+
+	//! Writes an AMFArrayValue to a RakNet::BitStream
+	/*!
+	 \param value The value to write
+	 */
+	template <>
+	void RakNet::BitStream::Write<AMFArrayValue&>(AMFArrayValue& value);
+} // namespace RakNet

dCommon/CMakeLists.txt

@@ -1,6 +1,6 @@
-set(DCOMMON_SOURCES "AMFFormat.cpp"
+set(DCOMMON_SOURCES
 		"AMFDeserialize.cpp"
-		"AMFFormat_BitStream.cpp"
+		"AmfSerialize.cpp"
 		"BinaryIO.cpp"
 		"dConfig.cpp"
 		"Diagnostics.cpp"

dCommon/DluAssert.h

@@ -0,0 +1,12 @@
+#ifndef __DLUASSERT__H__
+#define __DLUASSERT__H__
+
+#include <assert.h>
+
+#ifdef _DEBUG
+#	define DluAssert(expression) assert(expression)
+#else
+#	define DluAssert(expression)
+#endif
+
+#endif  //!__DLUASSERT__H__

dCommon/dEnums/dCommonVars.h

@@ -7,6 +7,8 @@
 #include <string>
 #include <set>
 #include "BitStream.h"
+#include "eConnectionType.h"
+#include "eClientMessageType.h"
 
 #pragma warning (disable:4251) //Disables SQL warnings
 
@@ -26,9 +28,11 @@ constexpr uint32_t lowFrameDelta = FRAMES_TO_MS(lowFramerate);
 
 //========== MACROS ===========
 
+#define HEADER_SIZE 8
 #define CBITSTREAM RakNet::BitStream bitStream;
 #define CINSTREAM RakNet::BitStream inStream(packet->data, packet->length, false);
-#define CMSGHEADER PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_GAME_MSG);
+#define CINSTREAM_SKIP_HEADER CINSTREAM if (inStream.GetNumberOfUnreadBits() >= BYTES_TO_BITS(HEADER_SIZE)) inStream.IgnoreBytes(HEADER_SIZE); else inStream.IgnoreBits(inStream.GetNumberOfUnreadBits());
+#define CMSGHEADER PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::GAME_MSG);
 #define SEND_PACKET Game::server->Send(&bitStream, sysAddr, false);
 #define SEND_PACKET_BROADCAST Game::server->Send(&bitStream, UNASSIGNED_SYSTEM_ADDRESS, true);
 

dCommon/dEnums/dMessageIdentifiers.h

@@ -1,564 +0,0 @@
-#pragma once
-#include "MessageIdentifiers.h"
-
-enum CONNECTION_TYPE {
-	SERVER = 0,         //!< Means it is used throughout all servers
-	AUTH,               //!< Means it is sent from the client authentication
-	CHAT,               //!< Means it is sent from and to the chat server
-	CHAT_INTERNAL,      //!< Unused - We can potentially use this in the future for various things
-	WORLD,              //!< Means it is sent from the client world
-	CLIENT,             //!< Means it is sent to the client from the world server
-	MASTER              //!< Means it is sent to and from the master server
-};
-
-//! The Internal Server Packet Identifiers
-enum SERVER {
-	MSG_SERVER_VERSION_CONFIRM = 0,     /*!< Sent during a handshake to confirm the server/client version */
-	MSG_SERVER_DISCONNECT_NOTIFY,       /*!< Sent when a user disconnected */
-	MSG_SERVER_GENERAL_NOTIFY           /*!< A general notification */
-};
-
-//! The Internal Authentication Packet Identifiers
-enum AUTH {
-	MSG_AUTH_LOGIN_REQUEST = 0,             /*!< Sent from the client when a user logs in */
-	MSG_AUTH_LOGOUT_REQUEST,                /*!< Sent from the client when a user logs out */
-	MSG_AUTH_CREATE_NEW_ACCOUNT_REQUEST,    /*!< Sent from the client when a user creates a new account */
-	MSG_AUTH_LEGOINTERFACE_AUTH_RESPONSE,   /*!< Unknown */
-	MSG_AUTH_SESSIONKEY_RECEIVED_CONFIRM,   /*!< Sent when the server recieved the session key (?) */
-	MSG_AUTH_RUNTIME_CONFIG                 /*!< Unknown */
-};
-
-//! The Internal Chat Packet Identifiers
-enum CHAT {
-	MSG_CHAT_LOGIN_SESSION_NOTIFY = 0,      /*!< When a user logs in */
-	MSG_CHAT_GENERAL_CHAT_MESSAGE,          /*!< Used for global chat messages */
-	MSG_CHAT_PRIVATE_CHAT_MESSAGE,          /*!< Used for private chat messages */
-	MSG_CHAT_USER_CHANNEL_CHAT_MESSAGE,     /*!< Unknown */
-	MSG_CHAT_WORLD_DISCONNECT_REQUEST,      /*!< Unknown */
-	MSG_CHAT_WORLD_PROXIMITY_RESPONSE,      /*!< Unknown */
-	MSG_CHAT_WORLD_PARCEL_RESPONSE,         /*!< Unknown */
-	MSG_CHAT_ADD_FRIEND_REQUEST,            /*!< When the client requests to add a friend */
-	MSG_CHAT_ADD_FRIEND_RESPONSE,           /*!< Sent from the server when the client adds a friend */
-	MSG_CHAT_REMOVE_FRIEND,                 /*!< When the client removes a friend */
-	MSG_CHAT_GET_FRIENDS_LIST,              /*!< Sent when the client requests a user's friends list */
-	MSG_CHAT_ADD_IGNORE,                    /*!< Sent when the client adds a friend to the "ignore" list */
-	MSG_CHAT_REMOVE_IGNORE,                 /*!< Sent when the client removes a friend from the "ignore" list */
-	MSG_CHAT_GET_IGNORE_LIST,               /*!< Sent when the client requests a user's ignored list */
-	MSG_CHAT_TEAM_MISSED_INVITE_CHECK,      /*!< Unknown (Something with an unresponded-to friend request probably) */
-	MSG_CHAT_TEAM_INVITE,                   /*!< When the client invites a user to a team */
-	MSG_CHAT_TEAM_INVITE_RESPONSE,          /*!< Sent from the server when the client invites someone to the team */
-	MSG_CHAT_TEAM_KICK,                     /*!< Sent when the client kicks a member from a team */
-	MSG_CHAT_TEAM_LEAVE,                    /*!< Sent when the client leaves a team */
-	MSG_CHAT_TEAM_SET_LOOT,                 /*!< Unknown (Something to do with team loot) */
-	MSG_CHAT_TEAM_SET_LEADER,               /*!< Unknown (Probably sets the team leader or something) */
-	MSG_CHAT_TEAM_GET_STATUS,               /*!< Check to see if we are in a team or not, sent on world join */
-	MSG_CHAT_GUILD_CREATE,                  /*!< Guild Creation */
-	MSG_CHAT_GUILD_INVITE,                  /*!< Guild Invitation */
-	MSG_CHAT_GUILD_INVITE_RESPONSE,         /*!< Guild Invite Response */
-	MSG_CHAT_GUILD_LEAVE,                   /*!< Guild Leave */
-	MSG_CHAT_GUILD_KICK,                    /*!< Guild Kick */
-	MSG_CHAT_GUILD_GET_STATUS,              /*!< Guild Get Status */
-	MSG_CHAT_GUILD_GET_ALL,                 /*!< Guild Get All */
-	MSG_CHAT_SHOW_ALL,
-	MSG_CHAT_BLUEPRINT_MODERATED,
-	MSG_CHAT_BLUEPRINT_MODEL_READY,
-	MSG_CHAT_PROPERTY_READY_FOR_APPROVAL,
-	MSG_CHAT_PROPERTY_MODERATION_CHANGED,
-	MSG_CHAT_PROPERTY_BUILDMODE_CHANGED,
-	MSG_CHAT_PROPERTY_BUILDMODE_CHANGED_REPORT,
-	MSG_CHAT_MAIL,
-	MSG_CHAT_WORLD_INSTANCE_LOCATION_REQUEST,
-	MSG_CHAT_REPUTATION_UPDATE,
-	MSG_CHAT_SEND_CANNED_TEXT,
-	MSG_CHAT_GMLEVEL_UPDATE,
-	MSG_CHAT_CHARACTER_NAME_CHANGE_REQUEST,
-	MSG_CHAT_CSR_REQUEST,
-	MSG_CHAT_CSR_REPLY,
-	MSG_CHAT_GM_KICK,
-	MSG_CHAT_GM_ANNOUNCE,
-	MSG_CHAT_GM_MUTE,
-	MSG_CHAT_ACTIVITY_UPDATE,
-	MSG_CHAT_WORLD_ROUTE_PACKET,
-	MSG_CHAT_GET_ZONE_POPULATIONS,
-	MSG_CHAT_REQUEST_MINIMUM_CHAT_MODE,
-	MSG_CHAT_REQUEST_MINIMUM_CHAT_MODE_PRIVATE,
-	MSG_CHAT_MATCH_REQUEST,
-	MSG_CHAT_UGCMANIFEST_REPORT_MISSING_FILE,
-	MSG_CHAT_UGCMANIFEST_REPORT_DONE_FILE,
-	MSG_CHAT_UGCMANIFEST_REPORT_DONE_BLUEPRINT,
-	MSG_CHAT_UGCC_REQUEST,
-	MSG_CHAT_WHO,
-	MSG_CHAT_WORLD_PLAYERS_PET_MODERATED_ACKNOWLEDGE,
-	MSG_CHAT_ACHIEVEMENT_NOTIFY,
-	MSG_CHAT_GM_CLOSE_PRIVATE_CHAT_WINDOW,
-	MSG_CHAT_UNEXPECTED_DISCONNECT,
-	MSG_CHAT_PLAYER_READY,
-	MSG_CHAT_GET_DONATION_TOTAL,
-	MSG_CHAT_UPDATE_DONATION,
-	MSG_CHAT_PRG_CSR_COMMAND,
-	MSG_CHAT_HEARTBEAT_REQUEST_FROM_WORLD,
-	MSG_CHAT_UPDATE_FREE_TRIAL_STATUS
-};
-
-//! Used for packets related to chatting
-enum CHAT_INTERNAL {
-	MSG_CHAT_INTERNAL_PLAYER_ADDED_NOTIFICATION = 0,
-	MSG_CHAT_INTERNAL_PLAYER_REMOVED_NOTIFICATION,
-	MSG_CHAT_INTERNAL_ADD_FRIEND,
-	MSG_CHAT_INTERNAL_ADD_BEST_FRIEND,
-	MSG_CHAT_INTERNAL_ADD_TO_TEAM,
-	MSG_CHAT_INTERNAL_ADD_BLOCK,
-	MSG_CHAT_INTERNAL_REMOVE_FRIEND,
-	MSG_CHAT_INTERNAL_REMOVE_BLOCK,
-	MSG_CHAT_INTERNAL_REMOVE_FROM_TEAM,
-	MSG_CHAT_INTERNAL_DELETE_TEAM,
-	MSG_CHAT_INTERNAL_REPORT,
-	MSG_CHAT_INTERNAL_PRIVATE_CHAT,
-	MSG_CHAT_INTERNAL_PRIVATE_CHAT_RESPONSE,
-	MSG_CHAT_INTERNAL_ANNOUNCEMENT,
-	MSG_CHAT_INTERNAL_MAIL_COUNT_UPDATE,
-	MSG_CHAT_INTERNAL_MAIL_SEND_NOTIFY,
-	MSG_CHAT_INTERNAL_REQUEST_USER_LIST,
-	MSG_CHAT_INTERNAL_FRIEND_LIST,
-	MSG_CHAT_INTERNAL_ROUTE_TO_PLAYER,
-	MSG_CHAT_INTERNAL_TEAM_UPDATE,
-	MSG_CHAT_INTERNAL_MUTE_UPDATE,
-	MSG_CHAT_INTERNAL_CREATE_TEAM,
-};
-
-//! Used for packets send to the world
-enum WORLD {
-	MSG_WORLD_CLIENT_VALIDATION = 1,  // 				Session info
-	MSG_WORLD_CLIENT_CHARACTER_LIST_REQUEST,
-	MSG_WORLD_CLIENT_CHARACTER_CREATE_REQUEST,
-	MSG_WORLD_CLIENT_LOGIN_REQUEST,  // 			Character selected
-	MSG_WORLD_CLIENT_GAME_MSG,
-	MSG_WORLD_CLIENT_CHARACTER_DELETE_REQUEST,
-	MSG_WORLD_CLIENT_CHARACTER_RENAME_REQUEST,
-	MSG_WORLD_CLIENT_HAPPY_FLOWER_MODE_NOTIFY,
-	MSG_WORLD_CLIENT_SLASH_RELOAD_MAP,  // 			Reload map cmp
-	MSG_WORLD_CLIENT_SLASH_PUSH_MAP_REQUEST,  // 	Push map req cmd
-	MSG_WORLD_CLIENT_SLASH_PUSH_MAP,  // 			Push map cmd
-	MSG_WORLD_CLIENT_SLASH_PULL_MAP,  // 			Pull map cmd
-	MSG_WORLD_CLIENT_LOCK_MAP_REQUEST,
-	MSG_WORLD_CLIENT_GENERAL_CHAT_MESSAGE,  // 		General chat message
-	MSG_WORLD_CLIENT_HTTP_MONITOR_INFO_REQUEST,
-	MSG_WORLD_CLIENT_SLASH_DEBUG_SCRIPTS,  // 		Debug scripts cmd
-	MSG_WORLD_CLIENT_MODELS_CLEAR,
-	MSG_WORLD_CLIENT_EXHIBIT_INSERT_MODEL,
-	MSG_WORLD_CLIENT_LEVEL_LOAD_COMPLETE,  // 		Character data request
-	MSG_WORLD_CLIENT_TMP_GUILD_CREATE,
-	MSG_WORLD_CLIENT_ROUTE_PACKET,  // 				Social?
-	MSG_WORLD_CLIENT_POSITION_UPDATE,
-	MSG_WORLD_CLIENT_MAIL,
-	MSG_WORLD_CLIENT_WORD_CHECK, // 				Whitelist word check
-	MSG_WORLD_CLIENT_STRING_CHECK,  // 				Whitelist string check
-	MSG_WORLD_CLIENT_GET_PLAYERS_IN_ZONE,
-	MSG_WORLD_CLIENT_REQUEST_UGC_MANIFEST_INFO,
-	MSG_WORLD_CLIENT_BLUEPRINT_GET_ALL_DATA_REQUEST,
-	MSG_WORLD_CLIENT_CANCEL_MAP_QUEUE,
-	MSG_WORLD_CLIENT_HANDLE_FUNNESS,
-	MSG_WORLD_CLIENT_FAKE_PRG_CSR_MESSAGE,
-	MSG_WORLD_CLIENT_REQUEST_FREE_TRIAL_REFRESH,
-	MSG_WORLD_CLIENT_GM_SET_FREE_TRIAL_STATUS
-};
-
-//! An enum for packets sent to the client
-enum CLIENT {
-	MSG_CLIENT_LOGIN_RESPONSE = 0,
-	MSG_CLIENT_LOGOUT_RESPONSE,
-	MSG_CLIENT_LOAD_STATIC_ZONE,
-	MSG_CLIENT_CREATE_OBJECT,
-	MSG_CLIENT_CREATE_CHARACTER,
-	MSG_CLIENT_CREATE_CHARACTER_EXTENDED,
-	MSG_CLIENT_CHARACTER_LIST_RESPONSE,
-	MSG_CLIENT_CHARACTER_CREATE_RESPONSE,
-	MSG_CLIENT_CHARACTER_RENAME_RESPONSE,
-	MSG_CLIENT_CHAT_CONNECT_RESPONSE,
-	MSG_CLIENT_AUTH_ACCOUNT_CREATE_RESPONSE,
-	MSG_CLIENT_DELETE_CHARACTER_RESPONSE,
-	MSG_CLIENT_GAME_MSG,
-	MSG_CLIENT_CONNECT_CHAT,
-	MSG_CLIENT_TRANSFER_TO_WORLD,
-	MSG_CLIENT_IMPENDING_RELOAD_NOTIFY,
-	MSG_CLIENT_MAKE_GM_RESPONSE,
-	MSG_CLIENT_HTTP_MONITOR_INFO_RESPONSE,
-	MSG_CLIENT_SLASH_PUSH_MAP_RESPONSE,
-	MSG_CLIENT_SLASH_PULL_MAP_RESPONSE,
-	MSG_CLIENT_SLASH_LOCK_MAP_RESPONSE,
-	MSG_CLIENT_BLUEPRINT_SAVE_RESPONSE,
-	MSG_CLIENT_BLUEPRINT_LUP_SAVE_RESPONSE,
-	MSG_CLIENT_BLUEPRINT_LOAD_RESPONSE_ITEMID,
-	MSG_CLIENT_BLUEPRINT_GET_ALL_DATA_RESPONSE,
-	MSG_CLIENT_MODEL_INSTANTIATE_RESPONSE,
-	MSG_CLIENT_DEBUG_OUTPUT,
-	MSG_CLIENT_ADD_FRIEND_REQUEST,
-	MSG_CLIENT_ADD_FRIEND_RESPONSE,
-	MSG_CLIENT_REMOVE_FRIEND_RESPONSE,
-	MSG_CLIENT_GET_FRIENDS_LIST_RESPONSE,
-	MSG_CLIENT_UPDATE_FRIEND_NOTIFY,
-	MSG_CLIENT_ADD_IGNORE_RESPONSE,
-	MSG_CLIENT_REMOVE_IGNORE_RESPONSE,
-	MSG_CLIENT_GET_IGNORE_LIST_RESPONSE,
-	MSG_CLIENT_TEAM_INVITE,
-	MSG_CLIENT_TEAM_INVITE_INITIAL_RESPONSE,
-	MSG_CLIENT_GUILD_CREATE_RESPONSE,
-	MSG_CLIENT_GUILD_GET_STATUS_RESPONSE,
-	MSG_CLIENT_GUILD_INVITE,
-	MSG_CLIENT_GUILD_INVITE_INITIAL_RESPONSE,
-	MSG_CLIENT_GUILD_INVITE_FINAL_RESPONSE,
-	MSG_CLIENT_GUILD_INVITE_CONFIRM,
-	MSG_CLIENT_GUILD_ADD_PLAYER,
-	MSG_CLIENT_GUILD_REMOVE_PLAYER,
-	MSG_CLIENT_GUILD_LOGIN_LOGOUT,
-	MSG_CLIENT_GUILD_RANK_CHANGE,
-	MSG_CLIENT_GUILD_DATA,
-	MSG_CLIENT_GUILD_STATUS,
-	MSG_CLIENT_MAIL,
-	MSG_CLIENT_DB_PROXY_RESULT,
-	MSG_CLIENT_SHOW_ALL_RESPONSE,
-	MSG_CLIENT_WHO_RESPONSE,
-	MSG_CLIENT_SEND_CANNED_TEXT,
-	MSG_CLIENT_UPDATE_CHARACTER_NAME,
-	MSG_CLIENT_SET_NETWORK_SIMULATOR,
-	MSG_CLIENT_INVALID_CHAT_MESSAGE,
-	MSG_CLIENT_MINIMUM_CHAT_MODE_RESPONSE,
-	MSG_CLIENT_MINIMUM_CHAT_MODE_RESPONSE_PRIVATE,
-	MSG_CLIENT_CHAT_MODERATION_STRING,
-	MSG_CLIENT_UGC_MANIFEST_RESPONSE,
-	MSG_CLIENT_IN_LOGIN_QUEUE,
-	MSG_CLIENT_SERVER_STATES,
-	MSG_CLIENT_GM_CLOSE_TARGET_CHAT_WINDOW,
-	MSG_CLIENT_GENERAL_TEXT_FOR_LOCALIZATION,
-	MSG_CLIENT_UPDATE_FREE_TRIAL_STATUS,
-	MSG_CLIENT_UGC_DOWNLOAD_FAILED = 120
-};
-
-//! Used for packets sent to the master server
-enum MASTER {
-	MSG_MASTER_REQUEST_PERSISTENT_ID = 1,
-	MSG_MASTER_REQUEST_PERSISTENT_ID_RESPONSE,
-	MSG_MASTER_REQUEST_ZONE_TRANSFER,
-	MSG_MASTER_REQUEST_ZONE_TRANSFER_RESPONSE,
-	MSG_MASTER_SERVER_INFO,
-	MSG_MASTER_REQUEST_SESSION_KEY,
-	MSG_MASTER_SET_SESSION_KEY,
-	MSG_MASTER_SESSION_KEY_RESPONSE,
-	MSG_MASTER_PLAYER_ADDED,
-	MSG_MASTER_PLAYER_REMOVED,
-
-	MSG_MASTER_CREATE_PRIVATE_ZONE,
-	MSG_MASTER_REQUEST_PRIVATE_ZONE,
-
-	MSG_MASTER_WORLD_READY,
-	MSG_MASTER_PREP_ZONE,
-
-	MSG_MASTER_SHUTDOWN,
-	MSG_MASTER_SHUTDOWN_RESPONSE,
-	MSG_MASTER_SHUTDOWN_IMMEDIATE,
-
-	MSG_MASTER_SHUTDOWN_UNIVERSE,
-
-	MSG_MASTER_AFFIRM_TRANSFER_REQUEST,
-	MSG_MASTER_AFFIRM_TRANSFER_RESPONSE,
-
-	MSG_MASTER_NEW_SESSION_ALERT
-};
-
-//! The Game messages
-enum GAME_MSG : unsigned short {
-	GAME_MSG_TELEPORT = 19,
-	GAME_MSG_SET_PLAYER_CONTROL_SCHEME = 26,
-	GAME_MSG_DROP_CLIENT_LOOT = 30,
-	GAME_MSG_DIE = 37,
-	GAME_MSG_REQUEST_DIE = 38,
-	GAME_MSG_PLAY_EMOTE = 41,
-	GAME_MSG_PLAY_ANIMATION = 43,
-	GAME_MSG_CONTROL_BEHAVIOR = 48,
-	GAME_MSG_SET_NAME = 72,
-	GAME_MSG_ECHO_START_SKILL = 118,
-	GAME_MSG_START_SKILL = 119,
-	GAME_MSG_VERIFY_ACK = 121,
-	GAME_MSG_ADD_SKILL = 127,
-	GAME_MSG_REMOVE_SKILL = 128,
-	GAME_MSG_SET_CURRENCY = 133,
-	GAME_MSG_PICKUP_CURRENCY = 137,
-	GAME_MSG_PICKUP_ITEM = 139,
-	GAME_MSG_TEAM_PICKUP_ITEM = 140,
-	GAME_MSG_PLAY_FX_EFFECT = 154,
-	GAME_MSG_STOP_FX_EFFECT = 155,
-	GAME_MSG_REQUEST_RESURRECT = 159,
-	GAME_MSG_RESURRECT = 160,
-	GAME_MSG_PUSH_EQUIPPED_ITEMS_STATE = 191,
-	GAME_MSG_POP_EQUIPPED_ITEMS_STATE = 192,
-	GAME_MSG_SET_GM_LEVEL = 193,
-	GAME_MSG_SET_STUNNED = 198,
-	GAME_MSG_SET_STUN_IMMUNITY = 200,
-	GAME_MSG_KNOCKBACK = 202,
-	GAME_MSG_REBUILD_CANCEL = 209,
-	GAME_MSG_ENABLE_REBUILD = 213,
-	GAME_MSG_MOVE_ITEM_IN_INVENTORY = 224,
-	GAME_MSG_ADD_ITEM_TO_INVENTORY_CLIENT_SYNC = 227,
-	GAME_MSG_REMOVE_ITEM_FROM_INVENTORY = 230,
-	GAME_MSG_EQUIP_ITEM = 231,
-	GAME_MSG_UN_EQUIP_ITEM = 233,
-	GAME_MSG_OFFER_MISSION = 248,
-	GAME_MSG_RESPOND_TO_MISSION = 249,
-	GAME_MSG_NOTIFY_MISSION = 254,
-	GAME_MSG_NOTIFY_MISSION_TASK = 255,
-	GAME_MSG_REBUILD_NOTIFY_STATE = 336,
-	GAME_MSG_TERMINATE_INTERACTION = 357,
-	GAME_MSG_SERVER_TERMINATE_INTERACTION = 358,
-	GAME_MSG_REQUEST_USE = 364,
-	GAME_MSG_VENDOR_OPEN_WINDOW = 369,
-	GAME_MSG_BUY_FROM_VENDOR = 373,
-	GAME_MSG_SELL_TO_VENDOR = 374,
-	GAME_MSG_TEAM_SET_OFF_WORLD_FLAG = 383,
-	GAME_MSG_SET_INVENTORY_SIZE = 389,
-	GAME_MSG_ACKNOWLEDGE_POSSESSION = 391,
-	GAME_MSG_SET_SHOOTING_GALLERY_PARAMS = 400,
-	GAME_MSG_REQUEST_ACTIVITY_START_STOP = 402,
-	GAME_MSG_REQUEST_ACTIVITY_ENTER = 403,
-	GAME_MSG_REQUEST_ACTIVITY_EXIT = 404,
-	GAME_MSG_ACTIVITY_ENTER = 405,
-	GAME_MSG_ACTIVITY_EXIT = 406,
-	GAME_MSG_ACTIVITY_START = 407,
-	GAME_MSG_ACTIVITY_STOP = 408,
-	GAME_MSG_SHOOTING_GALLERY_CLIENT_AIM_UPDATE = 409,
-	GAME_MSG_SHOOTING_GALLERY_FIRE = 411,
-	GAME_MSG_REQUEST_VENDOR_STATUS_UPDATE = 416,
-	GAME_MSG_VENDOR_STATUS_UPDATE = 417,
-	GAME_MSG_NOTIFY_CLIENT_SHOOTING_GALLERY_SCORE = 425,
-	GAME_MSG_CONSUME_CLIENT_ITEM = 427,
-	GAME_MSG_CLIENT_ITEM_CONSUMED = 428,
-	GAME_MSG_UPDATE_SHOOTING_GALLERY_ROTATION = 448,
-	GAME_MSG_SET_FLAG = 471,
-	GAME_MSG_NOTIFY_CLIENT_FLAG_CHANGE = 472,
-	GAME_MSG_VENDOR_TRANSACTION_RESULT = 476,
-	GAME_MSG_HAS_BEEN_COLLECTED = 486,
-	GAME_MSG_DISPLAY_CHAT_BUBBLE = 495,
-	GAME_MSG_SPAWN_PET = 498,
-	GAME_MSG_DESPAWN_PET = 499,
-	GAME_MSG_PLAYER_LOADED = 505,
-	GAME_MSG_PLAYER_READY = 509,
-	GAME_MSG_REQUEST_LINKED_MISSION = 515,
-	GAME_MSG_INVALID_ZONE_TRANSFER_LIST = 519,
-	GAME_MSG_MISSION_DIALOGUE_OK = 520,
-	GAME_MSG_DISPLAY_MESSAGE_BOX = 529,
-	GAME_MSG_MESSAGE_BOX_RESPOND = 530,
-	GAME_MSG_CHOICE_BOX_RESPOND = 531,
-	GAME_MSG_SMASH = 537,
-	GAME_MSG_UNSMASH = 538,
-	GAME_MSG_SET_SHOOTING_GALLERY_RETICULE_EFFECT = 548,
-	GAME_MSG_PLACE_MODEL_RESPONSE = 0x223,
-	GAME_MSG_SET_JET_PACK_MODE = 561,
-	GAME_MSG_REGISTER_PET_ID = 565,
-	GAME_MSG_REGISTER_PET_DBID = 566,
-	GAME_MSG_SHOW_ACTIVITY_COUNTDOWN = 568,
-	GAME_MSG_START_ACTIVITY_TIME = 576,
-	GAME_MSG_ACTIVITY_PAUSE = 602,
-	GAME_MSG_USE_NON_EQUIPMENT_ITEM = 603,
-	GAME_MSG_USE_ITEM_RESULT = 607,
-	GAME_MSG_COMMAND_PET = 640,
-	GAME_MSG_PET_RESPONSE = 641,
-	GAME_MSG_REQUEST_ACTIVITY_SUMMARY_LEADERBOARD_DATA = 648,
-	GAME_MSG_SEND_ACTIVITY_SUMMARY_LEADERBOARD_DATA = 649,
-	GAME_MSG_NOTIFY_OBJECT = 656,
-	GAME_MSG_CLIENT_NOTIFY_PET = 659,
-	GAME_MSG_NOTIFY_PET = 660,
-	GAME_MSG_NOTIFY_PET_TAMING_MINIGAME = 661,
-	GAME_MSG_START_SERVER_PET_MINIGAME_TIMER = 662,
-	GAME_MSG_CLIENT_EXIT_TAMING_MINIGAME = 663,
-	GAME_MSG_PET_NAME_CHANGED = 686,
-	GAME_MSG_PET_TAMING_MINIGAME_RESULT = 667,
-	GAME_MSG_PET_TAMING_TRY_BUILD_RESULT = 668,
-	GAME_MSG_NOTIFY_TAMING_BUILD_SUCCESS = 673,
-	GAME_MSG_NOTIFY_TAMING_MODEL_LOADED_ON_SERVER = 674,
-	GAME_MSG_ACTIVATE_BUBBLE_BUFF = 678,
-	GAME_MSG_DEACTIVATE_BUBBLE_BUFF = 679,
-	GAME_MSG_ADD_PET_TO_PLAYER = 681,
-	GAME_MSG_REQUEST_SET_PET_NAME = 683,
-	GAME_MSG_SET_PET_NAME = 684,
-	GAME_MSG_NOTIFY_PET_TAMING_PUZZLE_SELECTED = 675,
-	GAME_MSG_SHOW_PET_ACTION_BUTTON = 692,
-	GAME_MSG_SET_EMOTE_LOCK_STATE = 693,
-	GAME_MSG_USE_ITEM_REQUIREMENTS_RESPONSE = 703,
-	GAME_MSG_PLAY_EMBEDDED_EFFECT_ON_ALL_CLIENTS_NEAR_OBJECT = 713,
-	GAME_MSG_DOWNLOAD_PROPERTY_DATA = 716,
-	GAME_MSG_QUERY_PROPERTY_DATA = 717,
-	GAME_MSG_PROPERTY_EDITOR_BEGIN = 724,
-	GAME_MSG_PROPERTY_EDITOR_END = 725,
-	GAME_MSG_IS_MINIFIG_IN_A_BUBBLE = 729,
-	GAME_MSG_START_PATHING = 733,
-	GAME_MSG_ACTIVATE_BUBBLE_BUFF_FROM_SERVER = 734,
-	GAME_MSG_DEACTIVATE_BUBBLE_BUFF_FROM_SERVER = 735,
-	GAME_MSG_NOTIFY_CLIENT_ZONE_OBJECT = 737,
-	GAME_MSG_UPDATE_REPUTATION = 746,
-	GAME_MSG_PROPERTY_RENTAL_RESPONSE = 750,
-	GAME_MSG_REQUEST_PLATFORM_RESYNC = 760,
-	GAME_MSG_PLATFORM_RESYNC = 761,
-	GAME_MSG_PLAY_CINEMATIC = 762,
-	GAME_MSG_END_CINEMATIC = 763,
-	GAME_MSG_CINEMATIC_UPDATE = 764,
-	GAME_MSG_TOGGLE_GHOST_REFERENCE_OVERRIDE = 767,
-	GAME_MSG_SET_GHOST_REFERENCE_POSITION = 768,
-	GAME_MSG_FIRE_EVENT_SERVER_SIDE = 770,
-	GAME_MSG_SET_NETWORK_SCRIPT_VAR = 781,
-	GAME_MSG_UPDATE_MODEL_FROM_CLIENT = 793,
-	GAME_MSG_DELETE_MODEL_FROM_CLIENT = 794,
-	GAME_MSG_PLAY_ND_AUDIO_EMITTER = 821,
-	GAME_MSG_PLAY2_DAMBIENT_SOUND = 831,
-	GAME_MSG_ENTER_PROPERTY1 = 840,
-	GAME_MSG_ENTER_PROPERTY2 = 841,
-	GAME_MSG_PROPERTY_ENTRANCE_SYNC = 842,
-	GAME_MSG_PROPERTY_SELECT_QUERY = 845,
-	GAME_MSG_PARSE_CHAT_MESSAGE = 850,
-	GAME_MSG_BROADCAST_TEXT_TO_CHATBOX = 858,
-	GAME_MSG_OPEN_PROPERTY_MANAGEMENT = 860,
-	GAME_MSG_OPEN_PROPERTY_VENDOR = 861,
-	GAME_MSG_UPDATE_PROPERTY_OR_MODEL_FOR_FILTER_CHECK = 863,
-	GAME_MSG_CLIENT_TRADE_REQUEST = 868,
-	GAME_MSG_SERVER_TRADE_REQUEST = 869,
-	GAME_MSG_SERVER_TRADE_INVITE = 870,
-	GAME_MSG_CLIENT_TRADE_REPLY = 871,
-	GAME_MSG_SERVER_TRADE_REPLY = 872,
-	GAME_MSG_SERVER_TRADE_INITIAL_REPLY = 873,
-	GAME_MSG_SERVER_TRADE_FINAL_REPLY = 874,
-	GAME_MSG_CLIENT_TRADE_UPDATE = 875,
-	GAME_MSG_SERVER_SIDE_TRADE_UPDATE = 876,
-	GAME_MSG_SERVER_TRADE_UPDATE = 877,
-	GAME_MSG_CLIENT_TRADE_CANCEL = 878,
-	GAME_MSG_CLIENT_SIDE_TRADE_CANCEL = 879,
-	GAME_MSG_CLIENT_TRADE_ACCEPT = 880,
-	GAME_MSG_SERVER_SIDE_TRADE_ACCEPT = 881,
-	GAME_MSG_SERVER_SIDE_TRADE_CANCEL = 882,
-	GAME_MSG_SERVER_TRADE_CANCEL = 883,
-	GAME_MSG_SERVER_TRADE_ACCEPT = 884,
-	GAME_MSG_READY_FOR_UPDATES = 888,
-	GAME_MSG_ORIENT_TO_OBJECT = 905,
-	GAME_MSG_ORIENT_TO_POSITION = 906,
-	GAME_MSG_ORIENT_TO_ANGLE = 907,
-	GAME_MSG_BOUNCER_ACTIVE_STATUS = 942,
-	GAME_MSG_UN_USE_BBB_MODEL = 999,
-	GAME_MSG_BBB_LOAD_ITEM_REQUEST = 1000,
-	GAME_MSG_BBB_SAVE_REQUEST = 1001,
-	GAME_MSG_BBB_SAVE_RESPONSE = 1006,
-	GAME_MSG_NOTIFY_CLIENT_OBJECT = 1042,
-	GAME_MSG_DISPLAY_ZONE_SUMMARY = 1043,
-	GAME_MSG_ZONE_SUMMARY_DISMISSED = 1044,
-	GAME_MSG_ACTIVITY_STATE_CHANGE_REQUEST = 1053,
-	GAME_MSG_MODIFY_PLAYER_ZONE_STATISTIC = 1046,
-	GAME_MSG_START_BUILDING_WITH_ITEM = 1057,
-	GAME_MSG_START_ARRANGING_WITH_ITEM = 1061,
-	GAME_MSG_FINISH_ARRANGING_WITH_ITEM = 1062,
-	GAME_MSG_DONE_ARRANGING_WITH_ITEM = 1063,
-	GAME_MSG_SET_BUILD_MODE = 1068,
-	GAME_MSG_BUILD_MODE_SET = 1069,
-	GAME_MSG_SET_BUILD_MODE_CONFIRMED = 1073,
-	GAME_MSG_NOTIFY_CLIENT_FAILED_PRECONDITION = 1081,
-	GAME_MSG_MOVE_ITEM_BETWEEN_INVENTORY_TYPES = 1093,
-	GAME_MSG_MODULAR_BUILD_BEGIN = 1094,
-	GAME_MSG_MODULAR_BUILD_END = 1095,
-	GAME_MSG_MODULAR_BUILD_MOVE_AND_EQUIP = 1096,
-	GAME_MSG_MODULAR_BUILD_FINISH = 1097,
-	GAME_MSG_REPORT_BUG = 1198,
-	GAME_MSG_MISSION_DIALOGUE_CANCELLED = 1129,
-	GAME_MSG_ECHO_SYNC_SKILL = 1144,
-	GAME_MSG_SYNC_SKILL = 1145,
-	GAME_MSG_REQUEST_SERVER_PROJECTILE_IMPACT = 1148,
-	GAME_MSG_DO_CLIENT_PROJECTILE_IMPACT = 1151,
-	GAME_MSG_MODULAR_BUILD_CONVERT_MODEL = 1155,
-	GAME_MSG_SET_PLAYER_ALLOWED_RESPAWN = 1165,
-	GAME_MSG_UI_MESSAGE_SERVER_TO_SINGLE_CLIENT = 1184,
-	GAME_MSG_UI_MESSAGE_SERVER_TO_ALL_CLIENTS = 1185,
-	GAME_MSG_PET_TAMING_TRY_BUILD = 1197,
-	GAME_MSG_REQUEST_SMASH_PLAYER = 1202,
-	GAME_MSG_FIRE_EVENT_CLIENT_SIDE = 1213,
-	GAME_MSG_TOGGLE_GM_INVIS = 1218,
-	GAME_MSG_CHANGE_OBJECT_WORLD_STATE = 1223,
-	GAME_MSG_VEHICLE_LOCK_INPUT = 1230,
-	GAME_MSG_VEHICLE_UNLOCK_INPUT = 1231,
-	GAME_MSG_RACING_RESET_PLAYER_TO_LAST_RESET = 1252,
-	GAME_MSG_RACING_SERVER_SET_PLAYER_LAP_AND_PLANE = 1253,
-	GAME_MSG_RACING_SET_PLAYER_RESET_INFO = 1254,
-	GAME_MSG_RACING_PLAYER_INFO_RESET_FINISHED = 1255,
-	GAME_MSG_LOCK_NODE_ROTATION = 1260,
-	GAME_MSG_VEHICLE_SET_WHEEL_LOCK_STATE = 1273,
-	GAME_MSG_NOTIFY_VEHICLE_OF_RACING_OBJECT = 1276,
-	GAME_MSG_SET_NAME_BILLBOARD_STATE = 1284,
-	GAME_MSG_PLAYER_REACHED_RESPAWN_CHECKPOINT = 1296,
-	GAME_MSG_HANDLE_UGC_EQUIP_POST_DELETE_BASED_ON_EDIT_MODE = 1300,
-	GAME_MSG_HANDLE_UGC_EQUIP_PRE_CREATE_BASED_ON_EDIT_MODE = 1301,
-	GAME_MSG_PROPERTY_CONTENTS_FROM_CLIENT = 1305,
-	GAME_MSG_GET_MODELS_ON_PROPERTY = 1306,
-	GAME_MSG_MATCH_REQUEST = 1308,
-	GAME_MSG_MATCH_RESPONSE = 1309,
-	GAME_MSG_MATCH_UPDATE = 1310,
-	GAME_MSG_MODULE_ASSEMBLY_DB_DATA_FOR_CLIENT = 1131,
-	GAME_MSG_MODULE_ASSEMBLY_QUERY_DATA = 1132,
-	GAME_MSG_SHOW_BILLBOARD_INTERACT_ICON = 1337,
-	GAME_MSG_CHANGE_IDLE_FLAGS = 1338,
-	GAME_MSG_VEHICLE_ADD_PASSIVE_BOOST_ACTION = 1340,
-	GAME_MSG_VEHICLE_REMOVE_PASSIVE_BOOST_ACTION = 1341,
-	GAME_MSG_VEHICLE_NOTIFY_SERVER_ADD_PASSIVE_BOOST_ACTION = 1342,
-	GAME_MSG_VEHICLE_NOTIFY_SERVER_REMOVE_PASSIVE_BOOST_ACTION = 1343,
-	GAME_MSG_VEHICLE_ADD_SLOWDOWN_ACTION = 1344,
-	GAME_MSG_VEHICLE_REMOVE_SLOWDOWN_ACTION = 1345,
-	GAME_MSG_VEHICLE_NOTIFY_SERVER_ADD_SLOWDOWN_ACTION = 1346,
-	GAME_MSG_VEHICLE_NOTIFY_SERVER_REMOVE_SLOWDOWN_ACTION = 1347,
-	GAME_MSG_BUYBACK_FROM_VENDOR = 1350,
-	GAME_MSG_SET_PROPERTY_ACCESS = 1366,
-	GAME_MSG_ZONE_PROPERTY_MODEL_PLACED = 1369,
-	GAME_MSG_ZONE_PROPERTY_MODEL_ROTATED = 1370,
-	GAME_MSG_ZONE_PROPERTY_MODEL_REMOVED_WHILE_EQUIPPED = 1371,
-	GAME_MSG_ZONE_PROPERTY_MODEL_EQUIPPED = 1372,
-	GAME_MSG_ZONE_PROPERTY_MODEL_PICKED_UP = 1373,
-	GAME_MSG_ZONE_PROPERTY_MODEL_REMOVED = 1374,
-	GAME_MSG_NOTIFY_RACING_CLIENT = 1390,
-	GAME_MSG_RACING_PLAYER_HACK_CAR = 1391,
-	GAME_MSG_RACING_PLAYER_LOADED = 1392,
-	GAME_MSG_RACING_CLIENT_READY = 1393,
-	GAME_MSG_UPDATE_CHAT_MODE = 1395,
-	GAME_MSG_VEHICLE_NOTIFY_FINISHED_RACE = 1396,
-	GAME_MSG_SET_CONSUMABLE_ITEM = 1409,
-	GAME_MSG_SET_STATUS_IMMUNITY = 1435,
-	GAME_MSG_SET_PET_NAME_MODERATED = 1448,
-	GAME_MSG_MODIFY_LEGO_SCORE = 1459,
-	GAME_MSG_RESTORE_TO_POST_LOAD_STATS = 1468,
-	GAME_MSG_SET_RAIL_MOVEMENT = 1471,
-	GAME_MSG_START_RAIL_MOVEMENT = 1472,
-	GAME_MSG_CANCEL_RAIL_MOVEMENT = 1474,
-	GAME_MSG_CLIENT_RAIL_MOVEMENT_READY = 1476,
-	GAME_MSG_PLAYER_RAIL_ARRIVED_NOTIFICATION = 1477,
-	GAME_MSG_UPDATE_PLAYER_STATISTIC = 1481,
-	GAME_MSG_MODULAR_ASSEMBLY_NIF_COMPLETED = 1498,
-	GAME_MSG_NOTIFY_NOT_ENOUGH_INV_SPACE = 1516,
-	GAME_MSG_TEAM_SET_LEADER = 0x0615,
-	GAME_MSG_TEAM_INVITE_CONFIRM = 0x0616,
-	GAME_MSG_TEAM_GET_STATUS_RESPONSE = 0x0617,
-	GAME_MSG_TEAM_ADD_PLAYER = 0x061a,
-	GAME_MSG_TEAM_REMOVE_PLAYER = 0x061b,
-	GAME_MSG_START_CELEBRATION_EFFECT = 1618,
-	GAME_MSG_ADD_BUFF = 1647,
-	GAME_MSG_SERVER_DONE_LOADING_ALL_OBJECTS = 1642,
-	GAME_MSG_PLACE_PROPERTY_MODEL = 1170,
-	GAME_MSG_VEHICLE_NOTIFY_HIT_IMAGINATION_SERVER = 1606,
-	GAME_MSG_ADD_RUN_SPEED_MODIFIER = 1505,
-	GAME_MSG_HANDLE_HOT_PROPERTY_DATA = 1511,
-	GAME_MSG_SEND_HOT_PROPERTY_DATA = 1510,
-	GAME_MSG_REMOVE_RUN_SPEED_MODIFIER = 1506,
-	GAME_MSG_UPDATE_PROPERTY_PERFORMANCE_COST = 1547,
-	GAME_MSG_PROPERTY_ENTRANCE_BEGIN = 1553,
-	GAME_MSG_SET_RESURRECT_RESTORE_VALUES = 1591,
-	GAME_MSG_VEHICLE_STOP_BOOST = 1617,
-	GAME_MSG_REMOVE_BUFF = 1648,
-	GAME_MSG_REQUEST_MOVE_ITEM_BETWEEN_INVENTORY_TYPES = 1666,
-	GAME_MSG_RESPONSE_MOVE_ITEM_BETWEEN_INVENTORY_TYPES = 1667,
-	GAME_MSG_PLAYER_SET_CAMERA_CYCLING_MODE = 1676,
-	GAME_MSG_SET_MOUNT_INVENTORY_ID = 1726,
-	GAME_MSG_NOTIFY_SERVER_LEVEL_PROCESSING_COMPLETE = 1734,
-	GAME_MSG_NOTIFY_LEVEL_REWARDS = 1735,
-	GAME_MSG_DISMOUNT_COMPLETE = 1756,
-	GAME_MSG_MARK_INVENTORY_ITEM_AS_ACTIVE = 1767,
-	END
-};

dCommon/dEnums/eAuthMessageType.h

@@ -0,0 +1,15 @@
+#ifndef __EAUTHMESSAGETYPE__H__
+#define __EAUTHMESSAGETYPE__H__
+
+#include <cstdint>
+
+enum class eAuthMessageType : uint32_t {
+	LOGIN_REQUEST = 0,
+	LOGOUT_REQUEST,
+	CREATE_NEW_ACCOUNT_REQUEST,
+	LEGOINTERFACE_AUTH_RESPONSE,
+	SESSIONKEY_RECEIVED_CONFIRM,
+	RUNTIME_CONFIG
+};
+
+#endif  //!__EAUTHMESSAGETYPE__H__

dCommon/dEnums/eChatInternalMessageType.h

@@ -0,0 +1,31 @@
+#ifndef __ECHATINTERNALMESSAGETYPE__H__
+#define __ECHATINTERNALMESSAGETYPE__H__
+
+#include <cstdint>
+
+enum eChatInternalMessageType : uint32_t {
+	PLAYER_ADDED_NOTIFICATION = 0,
+	PLAYER_REMOVED_NOTIFICATION,
+	ADD_FRIEND,
+	ADD_BEST_FRIEND,
+	ADD_TO_TEAM,
+	ADD_BLOCK,
+	REMOVE_FRIEND,
+	REMOVE_BLOCK,
+	REMOVE_FROM_TEAM,
+	DELETE_TEAM,
+	REPORT,
+	PRIVATE_CHAT,
+	PRIVATE_CHAT_RESPONSE,
+	ANNOUNCEMENT,
+	MAIL_COUNT_UPDATE,
+	MAIL_SEND_NOTIFY,
+	REQUEST_USER_LIST,
+	FRIEND_LIST,
+	ROUTE_TO_PLAYER,
+	TEAM_UPDATE,
+	MUTE_UPDATE,
+	CREATE_TEAM,
+};
+
+#endif  //!__ECHATINTERNALMESSAGETYPE__H__

dCommon/dEnums/eChatMessageType.h

@@ -0,0 +1,78 @@
+#ifndef __ECHATMESSAGETYPE__H__
+#define __ECHATMESSAGETYPE__H__
+
+#include <cstdint>
+
+//! The Internal Chat Packet Identifiers
+enum class eChatMessageType :uint32_t {
+	LOGIN_SESSION_NOTIFY = 0,
+	GENERAL_CHAT_MESSAGE,
+	PRIVATE_CHAT_MESSAGE,
+	USER_CHANNEL_CHAT_MESSAGE,
+	WORLD_DISCONNECT_REQUEST,
+	WORLD_PROXIMITY_RESPONSE,
+	WORLD_PARCEL_RESPONSE,
+	ADD_FRIEND_REQUEST,
+	ADD_FRIEND_RESPONSE,
+	REMOVE_FRIEND,
+	GET_FRIENDS_LIST,
+	ADD_IGNORE,
+	REMOVE_IGNORE,
+	GET_IGNORE_LIST,
+	TEAM_MISSED_INVITE_CHECK,
+	TEAM_INVITE,
+	TEAM_INVITE_RESPONSE,
+	TEAM_KICK,
+	TEAM_LEAVE,
+	TEAM_SET_LOOT,
+	TEAM_SET_LEADER,
+	TEAM_GET_STATUS,
+	GUILD_CREATE,
+	GUILD_INVITE,
+	GUILD_INVITE_RESPONSE,
+	GUILD_LEAVE,
+	GUILD_KICK,
+	GUILD_GET_STATUS,
+	GUILD_GET_ALL,
+	SHOW_ALL,
+	BLUEPRINT_MODERATED,
+	BLUEPRINT_MODEL_READY,
+	PROPERTY_READY_FOR_APPROVAL,
+	PROPERTY_MODERATION_CHANGED,
+	PROPERTY_BUILDMODE_CHANGED,
+	PROPERTY_BUILDMODE_CHANGED_REPORT,
+	MAIL,
+	WORLD_INSTANCE_LOCATION_REQUEST,
+	REPUTATION_UPDATE,
+	SEND_CANNED_TEXT,
+	GMLEVEL_UPDATE,
+	CHARACTER_NAME_CHANGE_REQUEST,
+	CSR_REQUEST,
+	CSR_REPLY,
+	GM_KICK,
+	GM_ANNOUNCE,
+	GM_MUTE,
+	ACTIVITY_UPDATE,
+	WORLD_ROUTE_PACKET,
+	GET_ZONE_POPULATIONS,
+	REQUEST_MINIMUM_CHAT_MODE,
+	REQUEST_MINIMUM_CHAT_MODE_PRIVATE,
+	MATCH_REQUEST,
+	UGCMANIFEST_REPORT_MISSING_FILE,
+	UGCMANIFEST_REPORT_DONE_FILE,
+	UGCMANIFEST_REPORT_DONE_BLUEPRINT,
+	UGCC_REQUEST,
+	WHO,
+	WORLD_PLAYERS_PET_MODERATED_ACKNOWLEDGE,
+	ACHIEVEMENT_NOTIFY,
+	GM_CLOSE_PRIVATE_CHAT_WINDOW,
+	UNEXPECTED_DISCONNECT,
+	PLAYER_READY,
+	GET_DONATION_TOTAL,
+	UPDATE_DONATION,
+	PRG_CSR_COMMAND,
+	HEARTBEAT_REQUEST_FROM_WORLD,
+	UPDATE_FREE_TRIAL_STATUS
+};
+
+#endif  //!__ECHATMESSAGETYPE__H__

dCommon/dEnums/eClientMessageType.h

@@ -0,0 +1,76 @@
+#ifndef __ECLIENTMESSAGETYPE__H__
+#define __ECLIENTMESSAGETYPE__H__
+
+#include <cstdint>
+
+enum class eClientMessageType : uint32_t {
+	LOGIN_RESPONSE = 0,
+	LOGOUT_RESPONSE,
+	LOAD_STATIC_ZONE,
+	CREATE_OBJECT,
+	CREATE_CHARACTER,
+	CREATE_CHARACTER_EXTENDED,
+	CHARACTER_LIST_RESPONSE,
+	CHARACTER_CREATE_RESPONSE,
+	CHARACTER_RENAME_RESPONSE,
+	CHAT_CONNECT_RESPONSE,
+	AUTH_ACCOUNT_CREATE_RESPONSE,
+	DELETE_CHARACTER_RESPONSE,
+	GAME_MSG,
+	CONNECT_CHAT,
+	TRANSFER_TO_WORLD,
+	IMPENDING_RELOAD_NOTIFY,
+	MAKE_GM_RESPONSE,
+	HTTP_MONITOR_INFO_RESPONSE,
+	SLASH_PUSH_MAP_RESPONSE,
+	SLASH_PULL_MAP_RESPONSE,
+	SLASH_LOCK_MAP_RESPONSE,
+	BLUEPRINT_SAVE_RESPONSE,
+	BLUEPRINT_LUP_SAVE_RESPONSE,
+	BLUEPRINT_LOAD_RESPONSE_ITEMID,
+	BLUEPRINT_GET_ALL_DATA_RESPONSE,
+	MODEL_INSTANTIATE_RESPONSE,
+	DEBUG_OUTPUT,
+	ADD_FRIEND_REQUEST,
+	ADD_FRIEND_RESPONSE,
+	REMOVE_FRIEND_RESPONSE,
+	GET_FRIENDS_LIST_RESPONSE,
+	UPDATE_FRIEND_NOTIFY,
+	ADD_IGNORE_RESPONSE,
+	REMOVE_IGNORE_RESPONSE,
+	GET_IGNORE_LIST_RESPONSE,
+	TEAM_INVITE,
+	TEAM_INVITE_INITIAL_RESPONSE,
+	GUILD_CREATE_RESPONSE,
+	GUILD_GET_STATUS_RESPONSE,
+	GUILD_INVITE,
+	GUILD_INVITE_INITIAL_RESPONSE,
+	GUILD_INVITE_FINAL_RESPONSE,
+	GUILD_INVITE_CONFIRM,
+	GUILD_ADD_PLAYER,
+	GUILD_REMOVE_PLAYER,
+	GUILD_LOGIN_LOGOUT,
+	GUILD_RANK_CHANGE,
+	GUILD_DATA,
+	GUILD_STATUS,
+	MAIL,
+	DB_PROXY_RESULT,
+	SHOW_ALL_RESPONSE,
+	WHO_RESPONSE,
+	SEND_CANNED_TEXT,
+	UPDATE_CHARACTER_NAME,
+	SET_NETWORK_SIMULATOR,
+	INVALID_CHAT_MESSAGE,
+	MINIMUM_CHAT_MODE_RESPONSE,
+	MINIMUM_CHAT_MODE_RESPONSE_PRIVATE,
+	CHAT_MODERATION_STRING,
+	UGC_MANIFEST_RESPONSE,
+	IN_LOGIN_QUEUE,
+	SERVER_STATES,
+	GM_CLOSE_TARGET_CHAT_WINDOW,
+	GENERAL_TEXT_FOR_LOCALIZATION,
+	UPDATE_FREE_TRIAL_STATUS,
+	UGC_DOWNLOAD_FAILED = 120
+};
+
+#endif  //!__ECLIENTMESSAGETYPE__H__

dCommon/dEnums/eConnectionType.h

@@ -0,0 +1,14 @@
+#ifndef __ECONNECTIONTYPE__H__
+#define __ECONNECTIONTYPE__H__
+
+enum class eConnectionType : uint16_t {
+	SERVER = 0,
+	AUTH,
+	CHAT,
+	CHAT_INTERNAL,
+	WORLD,
+	CLIENT,
+	MASTER
+};
+
+#endif  //!__ECONNECTIONTYPE__H__

dCommon/dEnums/eGameMessageType.h

@@ -0,0 +1,303 @@
+#ifndef __EGAMEMESSAGETYPE__H__
+#define __EGAMEMESSAGETYPE__H__
+
+#include <cstdint>
+
+enum class eGameMessageType : uint16_t {
+	TELEPORT = 19,
+	SET_PLAYER_CONTROL_SCHEME = 26,
+	DROP_CLIENT_LOOT = 30,
+	DIE = 37,
+	REQUEST_DIE = 38,
+	PLAY_EMOTE = 41,
+	PLAY_ANIMATION = 43,
+	CONTROL_BEHAVIOR = 48,
+	SET_NAME = 72,
+	ECHO_START_SKILL = 118,
+	START_SKILL = 119,
+	VERIFY_ACK = 121,
+	ADD_SKILL = 127,
+	REMOVE_SKILL = 128,
+	SET_CURRENCY = 133,
+	PICKUP_CURRENCY = 137,
+	PICKUP_ITEM = 139,
+	TEAM_PICKUP_ITEM = 140,
+	PLAY_FX_EFFECT = 154,
+	STOP_FX_EFFECT = 155,
+	REQUEST_RESURRECT = 159,
+	RESURRECT = 160,
+	PUSH_EQUIPPED_ITEMS_STATE = 191,
+	POP_EQUIPPED_ITEMS_STATE = 192,
+	SET_GM_LEVEL = 193,
+	SET_STUNNED = 198,
+	SET_STUN_IMMUNITY = 200,
+	KNOCKBACK = 202,
+	REBUILD_CANCEL = 209,
+	ENABLE_REBUILD = 213,
+	MOVE_ITEM_IN_INVENTORY = 224,
+	ADD_ITEM_TO_INVENTORY_CLIENT_SYNC = 227,
+	REMOVE_ITEM_FROM_INVENTORY = 230,
+	EQUIP_ITEM = 231,
+	UN_EQUIP_ITEM = 233,
+	OFFER_MISSION = 248,
+	RESPOND_TO_MISSION = 249,
+	NOTIFY_MISSION = 254,
+	NOTIFY_MISSION_TASK = 255,
+	REBUILD_NOTIFY_STATE = 336,
+	TERMINATE_INTERACTION = 357,
+	SERVER_TERMINATE_INTERACTION = 358,
+	REQUEST_USE = 364,
+	VENDOR_OPEN_WINDOW = 369,
+	BUY_FROM_VENDOR = 373,
+	SELL_TO_VENDOR = 374,
+	TEAM_SET_OFF_WORLD_FLAG = 383,
+	SET_INVENTORY_SIZE = 389,
+	ACKNOWLEDGE_POSSESSION = 391,
+	SET_SHOOTING_GALLERY_PARAMS = 400,
+	REQUEST_ACTIVITY_START_STOP = 402,
+	REQUEST_ACTIVITY_ENTER = 403,
+	REQUEST_ACTIVITY_EXIT = 404,
+	ACTIVITY_ENTER = 405,
+	ACTIVITY_EXIT = 406,
+	ACTIVITY_START = 407,
+	ACTIVITY_STOP = 408,
+	SHOOTING_GALLERY_CLIENT_AIM_UPDATE = 409,
+	SHOOTING_GALLERY_FIRE = 411,
+	REQUEST_VENDOR_STATUS_UPDATE = 416,
+	VENDOR_STATUS_UPDATE = 417,
+	NOTIFY_CLIENT_SHOOTING_GALLERY_SCORE = 425,
+	CONSUME_CLIENT_ITEM = 427,
+	CLIENT_ITEM_CONSUMED = 428,
+	UPDATE_SHOOTING_GALLERY_ROTATION = 448,
+	SET_FLAG = 471,
+	NOTIFY_CLIENT_FLAG_CHANGE = 472,
+	VENDOR_TRANSACTION_RESULT = 476,
+	HAS_BEEN_COLLECTED = 486,
+	DISPLAY_CHAT_BUBBLE = 495,
+	SPAWN_PET = 498,
+	DESPAWN_PET = 499,
+	PLAYER_LOADED = 505,
+	PLAYER_READY = 509,
+	REQUEST_LINKED_MISSION = 515,
+	INVALID_ZONE_TRANSFER_LIST = 519,
+	MISSION_DIALOGUE_OK = 520,
+	DISPLAY_MESSAGE_BOX = 529,
+	MESSAGE_BOX_RESPOND = 530,
+	CHOICE_BOX_RESPOND = 531,
+	SMASH = 537,
+	UNSMASH = 538,
+	PLACE_MODEL_RESPONSE = 547,
+	SET_SHOOTING_GALLERY_RETICULE_EFFECT = 548,
+	SET_JET_PACK_MODE = 561,
+	REGISTER_PET_ID = 565,
+	REGISTER_PET_DBID = 566,
+	SHOW_ACTIVITY_COUNTDOWN = 568,
+	START_ACTIVITY_TIME = 576,
+	ACTIVITY_PAUSE = 602,
+	USE_NON_EQUIPMENT_ITEM = 603,
+	USE_ITEM_RESULT = 607,
+	COMMAND_PET = 640,
+	PET_RESPONSE = 641,
+	REQUEST_ACTIVITY_SUMMARY_LEADERBOARD_DATA = 648,
+	SEND_ACTIVITY_SUMMARY_LEADERBOARD_DATA = 649,
+	NOTIFY_OBJECT = 656,
+	CLIENT_NOTIFY_PET = 659,
+	NOTIFY_PET = 660,
+	NOTIFY_PET_TAMING_MINIGAME = 661,
+	START_SERVER_PET_MINIGAME_TIMER = 662,
+	CLIENT_EXIT_TAMING_MINIGAME = 663,
+	PET_NAME_CHANGED = 686,
+	PET_TAMING_MINIGAME_RESULT = 667,
+	PET_TAMING_TRY_BUILD_RESULT = 668,
+	NOTIFY_TAMING_BUILD_SUCCESS = 673,
+	NOTIFY_TAMING_MODEL_LOADED_ON_SERVER = 674,
+	ACTIVATE_BUBBLE_BUFF = 678,
+	DEACTIVATE_BUBBLE_BUFF = 679,
+	ADD_PET_TO_PLAYER = 681,
+	REQUEST_SET_PET_NAME = 683,
+	SET_PET_NAME = 684,
+	NOTIFY_PET_TAMING_PUZZLE_SELECTED = 675,
+	SHOW_PET_ACTION_BUTTON = 692,
+	SET_EMOTE_LOCK_STATE = 693,
+	USE_ITEM_REQUIREMENTS_RESPONSE = 703,
+	PLAY_EMBEDDED_EFFECT_ON_ALL_CLIENTS_NEAR_OBJECT = 713,
+	DOWNLOAD_PROPERTY_DATA = 716,
+	QUERY_PROPERTY_DATA = 717,
+	PROPERTY_EDITOR_BEGIN = 724,
+	PROPERTY_EDITOR_END = 725,
+	IS_MINIFIG_IN_A_BUBBLE = 729,
+	START_PATHING = 733,
+	ACTIVATE_BUBBLE_BUFF_FROM_SERVER = 734,
+	DEACTIVATE_BUBBLE_BUFF_FROM_SERVER = 735,
+	NOTIFY_CLIENT_ZONE_OBJECT = 737,
+	UPDATE_REPUTATION = 746,
+	PROPERTY_RENTAL_RESPONSE = 750,
+	REQUEST_PLATFORM_RESYNC = 760,
+	PLATFORM_RESYNC = 761,
+	PLAY_CINEMATIC = 762,
+	END_CINEMATIC = 763,
+	CINEMATIC_UPDATE = 764,
+	TOGGLE_GHOST_REFERENCE_OVERRIDE = 767,
+	SET_GHOST_REFERENCE_POSITION = 768,
+	FIRE_EVENT_SERVER_SIDE = 770,
+	SET_NETWORK_SCRIPT_VAR = 781,
+	UPDATE_MODEL_FROM_CLIENT = 793,
+	DELETE_MODEL_FROM_CLIENT = 794,
+	PLAY_ND_AUDIO_EMITTER = 821,
+	PLAY2_DAMBIENT_SOUND = 831,
+	ENTER_PROPERTY1 = 840,
+	ENTER_PROPERTY2 = 841,
+	PROPERTY_ENTRANCE_SYNC = 842,
+	PROPERTY_SELECT_QUERY = 845,
+	PARSE_CHAT_MESSAGE = 850,
+	BROADCAST_TEXT_TO_CHATBOX = 858,
+	OPEN_PROPERTY_MANAGEMENT = 860,
+	OPEN_PROPERTY_VENDOR = 861,
+	UPDATE_PROPERTY_OR_MODEL_FOR_FILTER_CHECK = 863,
+	CLIENT_TRADE_REQUEST = 868,
+	SERVER_TRADE_REQUEST = 869,
+	SERVER_TRADE_INVITE = 870,
+	CLIENT_TRADE_REPLY = 871,
+	SERVER_TRADE_REPLY = 872,
+	SERVER_TRADE_INITIAL_REPLY = 873,
+	SERVER_TRADE_FINAL_REPLY = 874,
+	CLIENT_TRADE_UPDATE = 875,
+	SERVER_SIDE_TRADE_UPDATE = 876,
+	SERVER_TRADE_UPDATE = 877,
+	CLIENT_TRADE_CANCEL = 878,
+	CLIENT_SIDE_TRADE_CANCEL = 879,
+	CLIENT_TRADE_ACCEPT = 880,
+	SERVER_SIDE_TRADE_ACCEPT = 881,
+	SERVER_SIDE_TRADE_CANCEL = 882,
+	SERVER_TRADE_CANCEL = 883,
+	SERVER_TRADE_ACCEPT = 884,
+	READY_FOR_UPDATES = 888,
+	ORIENT_TO_OBJECT = 905,
+	ORIENT_TO_POSITION = 906,
+	ORIENT_TO_ANGLE = 907,
+	BOUNCER_ACTIVE_STATUS = 942,
+	UN_USE_BBB_MODEL = 999,
+	BBB_LOAD_ITEM_REQUEST = 1000,
+	BBB_SAVE_REQUEST = 1001,
+	BBB_SAVE_RESPONSE = 1006,
+	NOTIFY_CLIENT_OBJECT = 1042,
+	DISPLAY_ZONE_SUMMARY = 1043,
+	ZONE_SUMMARY_DISMISSED = 1044,
+	ACTIVITY_STATE_CHANGE_REQUEST = 1053,
+	MODIFY_PLAYER_ZONE_STATISTIC = 1046,
+	START_BUILDING_WITH_ITEM = 1057,
+	START_ARRANGING_WITH_ITEM = 1061,
+	FINISH_ARRANGING_WITH_ITEM = 1062,
+	DONE_ARRANGING_WITH_ITEM = 1063,
+	SET_BUILD_MODE = 1068,
+	BUILD_MODE_SET = 1069,
+	SET_BUILD_MODE_CONFIRMED = 1073,
+	NOTIFY_CLIENT_FAILED_PRECONDITION = 1081,
+	MOVE_ITEM_BETWEEN_INVENTORY_TYPES = 1093,
+	MODULAR_BUILD_BEGIN = 1094,
+	MODULAR_BUILD_END = 1095,
+	MODULAR_BUILD_MOVE_AND_EQUIP = 1096,
+	MODULAR_BUILD_FINISH = 1097,
+	REPORT_BUG = 1198,
+	MISSION_DIALOGUE_CANCELLED = 1129,
+	ECHO_SYNC_SKILL = 1144,
+	SYNC_SKILL = 1145,
+	REQUEST_SERVER_PROJECTILE_IMPACT = 1148,
+	DO_CLIENT_PROJECTILE_IMPACT = 1151,
+	MODULAR_BUILD_CONVERT_MODEL = 1155,
+	SET_PLAYER_ALLOWED_RESPAWN = 1165,
+	UI_MESSAGE_SERVER_TO_SINGLE_CLIENT = 1184,
+	UI_MESSAGE_SERVER_TO_ALL_CLIENTS = 1185,
+	PET_TAMING_TRY_BUILD = 1197,
+	REQUEST_SMASH_PLAYER = 1202,
+	FIRE_EVENT_CLIENT_SIDE = 1213,
+	TOGGLE_GM_INVIS = 1218,
+	CHANGE_OBJECT_WORLD_STATE = 1223,
+	VEHICLE_LOCK_INPUT = 1230,
+	VEHICLE_UNLOCK_INPUT = 1231,
+	RACING_RESET_PLAYER_TO_LAST_RESET = 1252,
+	RACING_SERVER_SET_PLAYER_LAP_AND_PLANE = 1253,
+	RACING_SET_PLAYER_RESET_INFO = 1254,
+	RACING_PLAYER_INFO_RESET_FINISHED = 1255,
+	LOCK_NODE_ROTATION = 1260,
+	VEHICLE_SET_WHEEL_LOCK_STATE = 1273,
+	NOTIFY_VEHICLE_OF_RACING_OBJECT = 1276,
+	SET_NAME_BILLBOARD_STATE = 1284,
+	PLAYER_REACHED_RESPAWN_CHECKPOINT = 1296,
+	HANDLE_UGC_EQUIP_POST_DELETE_BASED_ON_EDIT_MODE = 1300,
+	HANDLE_UGC_EQUIP_PRE_CREATE_BASED_ON_EDIT_MODE = 1301,
+	PROPERTY_CONTENTS_FROM_CLIENT = 1305,
+	GET_MODELS_ON_PROPERTY = 1306,
+	MATCH_REQUEST = 1308,
+	MATCH_RESPONSE = 1309,
+	MATCH_UPDATE = 1310,
+	MODULE_ASSEMBLY_DB_DATA_FOR_CLIENT = 1131,
+	MODULE_ASSEMBLY_QUERY_DATA = 1132,
+	SHOW_BILLBOARD_INTERACT_ICON = 1337,
+	CHANGE_IDLE_FLAGS = 1338,
+	VEHICLE_ADD_PASSIVE_BOOST_ACTION = 1340,
+	VEHICLE_REMOVE_PASSIVE_BOOST_ACTION = 1341,
+	VEHICLE_NOTIFY_SERVER_ADD_PASSIVE_BOOST_ACTION = 1342,
+	VEHICLE_NOTIFY_SERVER_REMOVE_PASSIVE_BOOST_ACTION = 1343,
+	VEHICLE_ADD_SLOWDOWN_ACTION = 1344,
+	VEHICLE_REMOVE_SLOWDOWN_ACTION = 1345,
+	VEHICLE_NOTIFY_SERVER_ADD_SLOWDOWN_ACTION = 1346,
+	VEHICLE_NOTIFY_SERVER_REMOVE_SLOWDOWN_ACTION = 1347,
+	BUYBACK_FROM_VENDOR = 1350,
+	SET_PROPERTY_ACCESS = 1366,
+	ZONE_PROPERTY_MODEL_PLACED = 1369,
+	ZONE_PROPERTY_MODEL_ROTATED = 1370,
+	ZONE_PROPERTY_MODEL_REMOVED_WHILE_EQUIPPED = 1371,
+	ZONE_PROPERTY_MODEL_EQUIPPED = 1372,
+	ZONE_PROPERTY_MODEL_PICKED_UP = 1373,
+	ZONE_PROPERTY_MODEL_REMOVED = 1374,
+	NOTIFY_RACING_CLIENT = 1390,
+	RACING_PLAYER_HACK_CAR = 1391,
+	RACING_PLAYER_LOADED = 1392,
+	RACING_CLIENT_READY = 1393,
+	UPDATE_CHAT_MODE = 1395,
+	VEHICLE_NOTIFY_FINISHED_RACE = 1396,
+	SET_CONSUMABLE_ITEM = 1409,
+	SET_STATUS_IMMUNITY = 1435,
+	SET_PET_NAME_MODERATED = 1448,
+	MODIFY_LEGO_SCORE = 1459,
+	RESTORE_TO_POST_LOAD_STATS = 1468,
+	SET_RAIL_MOVEMENT = 1471,
+	START_RAIL_MOVEMENT = 1472,
+	CANCEL_RAIL_MOVEMENT = 1474,
+	CLIENT_RAIL_MOVEMENT_READY = 1476,
+	PLAYER_RAIL_ARRIVED_NOTIFICATION = 1477,
+	UPDATE_PLAYER_STATISTIC = 1481,
+	MODULAR_ASSEMBLY_NIF_COMPLETED = 1498,
+	NOTIFY_NOT_ENOUGH_INV_SPACE = 1516,
+	TEAM_SET_LEADER = 1557,
+	TEAM_INVITE_CONFIRM = 1558,
+	TEAM_GET_STATUS_RESPONSE = 1559,
+	TEAM_ADD_PLAYER = 1562,
+	TEAM_REMOVE_PLAYER = 1563,
+	START_CELEBRATION_EFFECT = 1618,
+	ADD_BUFF = 1647,
+	SERVER_DONE_LOADING_ALL_OBJECTS = 1642,
+	PLACE_PROPERTY_MODEL = 1170,
+	VEHICLE_NOTIFY_HIT_IMAGINATION_SERVER = 1606,
+	ADD_RUN_SPEED_MODIFIER = 1505,
+	HANDLE_HOT_PROPERTY_DATA = 1511,
+	SEND_HOT_PROPERTY_DATA = 1510,
+	REMOVE_RUN_SPEED_MODIFIER = 1506,
+	UPDATE_PROPERTY_PERFORMANCE_COST = 1547,
+	PROPERTY_ENTRANCE_BEGIN = 1553,
+	SET_RESURRECT_RESTORE_VALUES = 1591,
+	VEHICLE_STOP_BOOST = 1617,
+	REMOVE_BUFF = 1648,
+	REQUEST_MOVE_ITEM_BETWEEN_INVENTORY_TYPES = 1666,
+	RESPONSE_MOVE_ITEM_BETWEEN_INVENTORY_TYPES = 1667,
+	PLAYER_SET_CAMERA_CYCLING_MODE = 1676,
+	SET_MOUNT_INVENTORY_ID = 1726,
+	NOTIFY_SERVER_LEVEL_PROCESSING_COMPLETE = 1734,
+	NOTIFY_LEVEL_REWARDS = 1735,
+	DISMOUNT_COMPLETE = 1756,
+	MARK_INVENTORY_ITEM_AS_ACTIVE = 1767,
+	END
+};
+
+#endif  //!__EGAMEMESSAGETYPE__H__

dCommon/dEnums/eMasterMessageType.h

@@ -0,0 +1,36 @@
+#ifndef __EMASTERMESSAGETYPE__H__
+#define __EMASTERMESSAGETYPE__H__
+
+#include <cstdint>
+
+enum class eMasterMessageType : uint32_t {
+	REQUEST_PERSISTENT_ID = 1,
+	REQUEST_PERSISTENT_ID_RESPONSE,
+	REQUEST_ZONE_TRANSFER,
+	REQUEST_ZONE_TRANSFER_RESPONSE,
+	SERVER_INFO,
+	REQUEST_SESSION_KEY,
+	SET_SESSION_KEY,
+	SESSION_KEY_RESPONSE,
+	PLAYER_ADDED,
+	PLAYER_REMOVED,
+
+	CREATE_PRIVATE_ZONE,
+	REQUEST_PRIVATE_ZONE,
+
+	WORLD_READY,
+	PREP_ZONE,
+
+	SHUTDOWN,
+	SHUTDOWN_RESPONSE,
+	SHUTDOWN_IMMEDIATE,
+
+	SHUTDOWN_UNIVERSE,
+
+	AFFIRM_TRANSFER_REQUEST,
+	AFFIRM_TRANSFER_RESPONSE,
+
+	NEW_SESSION_ALERT
+};
+
+#endif  //!__EMASTERMESSAGETYPE__H__

dCommon/dEnums/eReplicaComponentType.h

@@ -107,7 +107,7 @@ enum class eReplicaComponentType : uint32_t {
 	DONATION_VENDOR,
 	COMBAT_MEDIATOR,
 	COMMENDATION_VENDOR,
-	UNKNOWN_103,
+	GATE_RUSH_CONTROL,
 	RAIL_ACTIVATOR,
 	ROLLER,
 	PLAYER_FORCED_MOVEMENT,
@@ -119,7 +119,7 @@ enum class eReplicaComponentType : uint32_t {
 	UNKNOWN_112,
 	PROPERTY_PLAQUE,
 	BUILD_BORDER,
-	UNKOWN_115,
+	UNKNOWN_115,
 	CULLING_PLANE,
 	DESTROYABLE = 1000 // Actually 7
 };

dCommon/dEnums/eServerMessageType.h

@@ -0,0 +1,12 @@
+#ifndef __ESERVERMESSAGETYPE__H__
+#define __ESERVERMESSAGETYPE__H__
+
+#include <cstdint>
+//! The Internal Server Packet Identifiers
+enum class eServerMessageType : uint32_t {
+	VERSION_CONFIRM = 0,
+	DISCONNECT_NOTIFY,
+	GENERAL_NOTIFY
+};
+
+#endif  //!__ESERVERMESSAGETYPE__H__

dCommon/dEnums/eWorldMessageType.h

@@ -0,0 +1,42 @@
+#ifndef __EWORLDMESSAGETYPE__H__
+#define __EWORLDMESSAGETYPE__H__
+
+#include <cstdint>
+
+enum class eWorldMessageType : uint32_t {
+	VALIDATION = 1,  // 				Session info
+	CHARACTER_LIST_REQUEST,
+	CHARACTER_CREATE_REQUEST,
+	LOGIN_REQUEST,  // 			Character selected
+	GAME_MSG,
+	CHARACTER_DELETE_REQUEST,
+	CHARACTER_RENAME_REQUEST,
+	HAPPY_FLOWER_MODE_NOTIFY,
+	SLASH_RELOAD_MAP,  // 			Reload map cmp
+	SLASH_PUSH_MAP_REQUEST,  // 	Push map req cmd
+	SLASH_PUSH_MAP,  // 			Push map cmd
+	SLASH_PULL_MAP,  // 			Pull map cmd
+	LOCK_MAP_REQUEST,
+	GENERAL_CHAT_MESSAGE,  // 		General chat message
+	HTTP_MONITOR_INFO_REQUEST,
+	SLASH_DEBUG_SCRIPTS,  // 		Debug scripts cmd
+	MODELS_CLEAR,
+	EXHIBIT_INSERT_MODEL,
+	LEVEL_LOAD_COMPLETE,  // 		Character data request
+	TMP_GUILD_CREATE,
+	ROUTE_PACKET,  // 				Social?
+	POSITION_UPDATE,
+	MAIL,
+	WORD_CHECK, // 				Whitelist word check
+	STRING_CHECK,  // 				Whitelist string check
+	GET_PLAYERS_IN_ZONE,
+	REQUEST_UGC_MANIFEST_INFO,
+	BLUEPRINT_GET_ALL_DATA_REQUEST,
+	CANCEL_MAP_QUEUE,
+	HANDLE_FUNNESS,
+	FAKE_PRG_CSR_MESSAGE,
+	REQUEST_FREE_TRIAL_REFRESH,
+	GM_SET_FREE_TRIAL_STATUS
+};
+
+#endif  //!__EWORLDMESSAGETYPE__H__

dDatabase/CDClientDatabase.h

@@ -16,9 +16,6 @@
  // Enable this to cache all entries in each table for fast access, comes with more memory cost
  //#define CDCLIENT_CACHE_ALL
 
- // Enable this to skip some unused columns in some tables
-#define UNUSED(v)
-
 /*!
   \file CDClientDatabase.hpp
   \brief An interface between the CDClient.sqlite file and the server

dDatabase/CDClientManager.cpp

@@ -40,7 +40,7 @@
 
 CDClientManager::CDClientManager() {
 	CDActivityRewardsTable::Instance();
-	UNUSED(CDAnimationsTable::Instance());
+	CDAnimationsTable::Instance();
 	CDBehaviorParameterTable::Instance();
 	CDBehaviorTemplateTable::Instance();
 	CDComponentsRegistryTable::Instance();

dDatabase/CDClientManager.h

@@ -4,6 +4,8 @@
 
 #include "Singleton.h"
 
+#define UNUSED_TABLE(v)
+
 /**
  * Initialize the CDClient tables so they are all loaded into memory.
  */

dDatabase/Tables/CDAnimationsTable.cpp

@@ -1,56 +1,83 @@
 #include "CDAnimationsTable.h"
+#include "GeneralUtils.h"
+#include "Game.h"
 
-CDAnimationsTable::CDAnimationsTable(void) {
+bool CDAnimationsTable::CacheData(CppSQLite3Statement& queryToCache) {
+	auto tableData = queryToCache.execQuery();
+	// If we received a bad lookup, cache it anyways so we do not run the query again.
+	if (tableData.eof()) return false;
 
-	// First, get the size of the table
+	do {
-	unsigned int size = 0;
+		std::string animation_type = tableData.getStringField("animation_type", "");
-	auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM Animations");
+		DluAssert(!animation_type.empty());
-	while (!tableSize.eof()) {
+		AnimationGroupID animationGroupID = tableData.getIntField("animationGroupID", -1);
-		size = tableSize.getIntField(0, 0);
+		DluAssert(animationGroupID != -1);
 
-		tableSize.nextRow();
+		CDAnimation entry;
-	}
-
-	tableSize.finalize();
-
-	// Reserve the size
-	this->entries.reserve(size);
-
-	// Now get the data
-	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM Animations");
-	while (!tableData.eof()) {
-		CDAnimations entry;
-		entry.animationGroupID = tableData.getIntField("animationGroupID", -1);
-		entry.animation_type = tableData.getStringField("animation_type", "");
 		entry.animation_name = tableData.getStringField("animation_name", "");
-		entry.chance_to_play = tableData.getFloatField("chance_to_play", -1.0f);
+		entry.chance_to_play = tableData.getFloatField("chance_to_play", 1.0f);
-		entry.min_loops = tableData.getIntField("min_loops", -1);
+		UNUSED_COLUMN(entry.min_loops = tableData.getIntField("min_loops", 0);)
-		entry.max_loops = tableData.getIntField("max_loops", -1);
+		UNUSED_COLUMN(entry.max_loops = tableData.getIntField("max_loops", 0);)
-		entry.animation_length = tableData.getFloatField("animation_length", -1.0f);
+		entry.animation_length = tableData.getFloatField("animation_length", 0.0f);
-		entry.hideEquip = tableData.getIntField("hideEquip", -1) == 1 ? true : false;
+		UNUSED_COLUMN(entry.hideEquip = tableData.getIntField("hideEquip", 0) == 1;)
-		entry.ignoreUpperBody = tableData.getIntField("ignoreUpperBody", -1) == 1 ? true : false;
+		UNUSED_COLUMN(entry.ignoreUpperBody = tableData.getIntField("ignoreUpperBody", 0) == 1;)
-		entry.restartable = tableData.getIntField("restartable", -1) == 1 ? true : false;
+		UNUSED_COLUMN(entry.restartable = tableData.getIntField("restartable", 0) == 1;)
-		entry.face_animation_name = tableData.getStringField("face_animation_name", "");
+		UNUSED_COLUMN(entry.face_animation_name = tableData.getStringField("face_animation_name", "");)
-		entry.priority = tableData.getFloatField("priority", -1.0f);
+		UNUSED_COLUMN(entry.priority = tableData.getFloatField("priority", 0.0f);)
-		entry.blendTime = tableData.getFloatField("blendTime", -1.0f);
+		UNUSED_COLUMN(entry.blendTime = tableData.getFloatField("blendTime", 0.0f);)
 
-		this->entries.push_back(entry);
+		this->animations[CDAnimationKey(animation_type, animationGroupID)].push_back(entry);
 		tableData.nextRow();
-	}
+	} while (!tableData.eof());
 
 	tableData.finalize();
+
+	return true;
 }
 
-std::vector<CDAnimations> CDAnimationsTable::Query(std::function<bool(CDAnimations)> predicate) {
+void CDAnimationsTable::CacheAnimations(const CDAnimationKey animationKey) {
-
+	auto query = CDClientDatabase::CreatePreppedStmt("SELECT * FROM Animations WHERE animationGroupID = ? and animation_type = ?");
-	std::vector<CDAnimations> data = cpplinq::from(this->entries)
+	query.bind(1, static_cast<int32_t>(animationKey.second));
-		>> cpplinq::where(predicate)
+	query.bind(2, animationKey.first.c_str());
-		>> cpplinq::to_vector();
+	// If we received a bad lookup, cache it anyways so we do not run the query again.
-
+	if (!CacheData(query)) {
-	return data;
+		this->animations[animationKey];
+	}
 }
 
-std::vector<CDAnimations> CDAnimationsTable::GetEntries(void) const {
+void CDAnimationsTable::CacheAnimationGroup(AnimationGroupID animationGroupID) {
-	return this->entries;
+	auto animationEntryCached = this->animations.find(CDAnimationKey("", animationGroupID));
+	if (animationEntryCached != this->animations.end()) {
+		return;
+	}
+
+	auto query = CDClientDatabase::CreatePreppedStmt("SELECT * FROM Animations WHERE animationGroupID = ?");
+	query.bind(1, static_cast<int32_t>(animationGroupID));
+
+	// Cache the query so we don't run the query again.
+	CacheData(query);
+	this->animations[CDAnimationKey("", animationGroupID)];
 }
 
+CDAnimationLookupResult CDAnimationsTable::GetAnimation(const AnimationID& animationType, const std::string& previousAnimationName, const AnimationGroupID animationGroupID) {
+	CDAnimationKey animationKey(animationType, animationGroupID);
+	auto animationEntryCached = this->animations.find(animationKey);
+	if (animationEntryCached == this->animations.end()) {
+		this->CacheAnimations(animationKey);
+	}
+
+	auto animationEntry = this->animations.find(animationKey);
+	// If we have only one animation, return it regardless of the chance to play.
+	if (animationEntry->second.size() == 1) {
+		return CDAnimationLookupResult(animationEntry->second.front());
+	}
+	auto randomAnimation = GeneralUtils::GenerateRandomNumber<float>(0, 1);
+
+	for (auto& animationEntry : animationEntry->second) {
+		randomAnimation -= animationEntry.chance_to_play;
+		// This is how the client gets the random animation.
+		if (animationEntry.animation_name != previousAnimationName && randomAnimation <= 0.0f) return CDAnimationLookupResult(animationEntry);
+	}
+
+	return CDAnimationLookupResult();
+}

dDatabase/Tables/CDAnimationsTable.h

@@ -1,33 +1,66 @@
 #pragma once
 
-// Custom Classes
 #include "CDTable.h"
+#include <list>
 
-struct CDAnimations {
+struct CDAnimation {
-	unsigned int animationGroupID;          //!< The animation group ID
+	// unsigned int animationGroupID;
-	std::string animation_type;        //!< The animation type
+	// std::string animation_type;
+	// The above two are a pair to represent a primary key in the map.
 	std::string animation_name;        //!< The animation name
 	float chance_to_play;           //!< The chance to play the animation
-	unsigned int min_loops;                 //!< The minimum number of loops
+	UNUSED_COLUMN(unsigned int min_loops;)                 //!< The minimum number of loops
-	unsigned int max_loops;                 //!< The maximum number of loops
+	UNUSED_COLUMN(unsigned int max_loops;)                 //!< The maximum number of loops
 	float animation_length;         //!< The animation length
-	bool hideEquip;                 //!< Whether or not to hide the equip
+	UNUSED_COLUMN(bool hideEquip;)                 //!< Whether or not to hide the equip
-	bool ignoreUpperBody;           //!< Whether or not to ignore the upper body
+	UNUSED_COLUMN(bool ignoreUpperBody;)           //!< Whether or not to ignore the upper body
-	bool restartable;               //!< Whether or not the animation is restartable
+	UNUSED_COLUMN(bool restartable;)               //!< Whether or not the animation is restartable
-	std::string face_animation_name;   //!< The face animation name
+	UNUSED_COLUMN(std::string face_animation_name;)   //!< The face animation name
-	float priority;                 //!< The priority
+	UNUSED_COLUMN(float priority;)                 //!< The priority
-	float blendTime;                //!< The blend time
+	UNUSED_COLUMN(float blendTime;)                //!< The blend time
 };
 
+typedef LookupResult<CDAnimation> CDAnimationLookupResult;
 
 class CDAnimationsTable : public CDTable<CDAnimationsTable> {
-private:
+	typedef int32_t AnimationGroupID;
-	std::vector<CDAnimations> entries;
+	typedef std::string AnimationID;
-
+	typedef std::pair<std::string, AnimationGroupID> CDAnimationKey;
 public:
-	CDAnimationsTable();
+	/**
-	// Queries the table with a custom "where" clause
+	 * Given an animationType and the previousAnimationName played, return the next animationType to play.
-	std::vector<CDAnimations> Query(std::function<bool(CDAnimations)> predicate);
+	 * If there are more than 1 animationTypes that can be played, one is selected at random but also does not allow
+	 * the previousAnimationName to be played twice.
+	 * 
+	 * @param animationType The animationID to lookup
+	 * @param previousAnimationName The previously played animation
+	 * @param animationGroupID The animationGroupID to lookup
+	 * @return CDAnimationLookupResult 
+	 */
+	[[nodiscard]] CDAnimationLookupResult GetAnimation(const AnimationID& animationType, const std::string& previousAnimationName, const AnimationGroupID animationGroupID);
 
-	std::vector<CDAnimations> GetEntries(void) const;
+	/**
+	 * Cache a full AnimationGroup by its ID.
+	 */
+	void CacheAnimationGroup(AnimationGroupID animationGroupID);
+private:
+
+	/**
+	 * Cache all animations given a premade key
+	 */
+	void CacheAnimations(const CDAnimationKey animationKey);
+
+	/**
+	 * Run the query responsible for caching the data.
+	 * @param queryToCache 
+	 * @return true 
+	 * @return false 
+	 */
+	bool CacheData(CppSQLite3Statement& queryToCache);
+
+	/**
+	 * Each animation is key'd by its animationName and its animationGroupID.  Each
+	 * animation has a possible list of animations.  This is because there can be animations have a percent chance to play so one is selected at random.
+	 */
+	std::map<CDAnimationKey, std::list<CDAnimation>> animations;
 };

dDatabase/Tables/CDTable.h

@@ -2,6 +2,7 @@
 
 #include "CDClientDatabase.h"
 #include "Singleton.h"
+#include "DluAssert.h"
 
 #include <functional>
 #include <string>
@@ -15,6 +16,12 @@
 #endif
 #include "cpplinq.hpp"
 
+// Used for legacy
+#define UNUSED(x)
+
+// Enable this to skip some unused columns in some tables
+#define UNUSED_COLUMN(v)
+
 #pragma warning (disable : 4244) //Disable double to float conversion warnings
 #pragma warning (disable : 4715) //Disable "not all control paths return a value"
 
@@ -23,3 +30,15 @@ class CDTable : public Singleton<Table> {
 protected:
 	virtual ~CDTable() = default;
 };
+
+template<class T>
+class LookupResult {
+	typedef std::pair<T, bool> DataType;
+public:
+	LookupResult() { m_data.first = T(); m_data.second = false; };
+	LookupResult(T& data) { m_data.first = data; m_data.second = true; };
+	inline const T& Data() { return m_data.first; };
+	inline const bool& FoundData() { return m_data.second; };
+private:
+	DataType m_data;
+};

dGame/Character.cpp

@@ -373,7 +373,7 @@ void Character::SaveXMLToDatabase() {
 
 	//Call upon the entity to update our xmlDoc:
 	if (!m_OurEntity) {
-		Game::logger->Log("Character", "We didn't have an entity set while saving! CHARACTER WILL NOT BE SAVED!");
+		Game::logger->Log("Character", "%i:%s didn't have an entity set while saving! CHARACTER WILL NOT BE SAVED!", this->GetID(), this->GetName().c_str());
 		return;
 	}
 
@@ -384,7 +384,7 @@ void Character::SaveXMLToDatabase() {
 	//For metrics, log the time it took to save:
 	auto end = std::chrono::system_clock::now();
 	std::chrono::duration<double> elapsed = end - start;
-	Game::logger->Log("Character", "Saved character to Database in: %fs", elapsed.count());
+	Game::logger->Log("Character", "%i:%s Saved character to Database in: %fs", this->GetID(), this->GetName().c_str(), elapsed.count());
 }
 
 void Character::SetIsNewLogin() {
@@ -396,7 +396,7 @@ void Character::SetIsNewLogin() {
 	while (currentChild) {
 		if (currentChild->Attribute("si")) {
 			flags->DeleteChild(currentChild);
-			Game::logger->Log("Character", "Removed isLoggedIn flag from character %i, saving character to database", GetID());
+			Game::logger->Log("Character", "Removed isLoggedIn flag from character %i:%s, saving character to database", GetID(), GetName().c_str());
 			WriteToDatabase();
 		}
 		currentChild = currentChild->NextSiblingElement();

dGame/Entity.cpp

@@ -595,8 +595,9 @@ void Entity::Initialize() {
 		m_Components.insert(std::make_pair(eReplicaComponentType::BOUNCER, comp));
 	}
 
-	if ((compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::RENDER) > 0 && m_TemplateID != 2365) || m_Character) {
+	int32_t renderComponentId = compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::RENDER);
-		RenderComponent* render = new RenderComponent(this);
+	if ((renderComponentId > 0 && m_TemplateID != 2365) || m_Character) {
+		RenderComponent* render = new RenderComponent(this, renderComponentId);
 		m_Components.insert(std::make_pair(eReplicaComponentType::RENDER, render));
 	}
 
@@ -707,6 +708,13 @@ void Entity::Initialize() {
 				// TODO: create movementAIcomp and set path
 			}
 		}*/
+	} else {
+		// else we still need to setup moving platform if it has a moving platform comp but no path
+		int32_t movingPlatformComponentId = compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::MOVING_PLATFORM, -1);
+		if (movingPlatformComponentId >= 0) {
+			MovingPlatformComponent* plat = new MovingPlatformComponent(this, pathName);
+			m_Components.insert(std::make_pair(eReplicaComponentType::MOVING_PLATFORM, plat));
+		}
 	}
 
 	int proximityMonitorID = compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::PROXIMITY_MONITOR);
@@ -1485,6 +1493,12 @@ void Entity::OnChoiceBoxResponse(Entity* sender, int32_t button, const std::u16s
 	}
 }
 
+void Entity::RequestActivityExit(Entity* sender, LWOOBJID player, bool canceled) {
+	for (CppScripts::Script* script : CppScripts::GetEntityScripts(this)) {
+		script->OnRequestActivityExit(sender, player, canceled);
+	}
+}
+
 void Entity::Smash(const LWOOBJID source, const eKillType killType, const std::u16string& deathType) {
 	if (!m_PlayerIsReadyForUpdates) return;
 

dGame/Entity.h

@@ -207,6 +207,7 @@ public:
 
 	void OnMessageBoxResponse(Entity* sender, int32_t button, const std::u16string& identifier, const std::u16string& userData);
 	void OnChoiceBoxResponse(Entity* sender, int32_t button, const std::u16string& buttonIdentifier, const std::u16string& identifier);
+	void RequestActivityExit(Entity* sender, LWOOBJID player, bool canceled);
 
 	void Smash(const LWOOBJID source = LWOOBJID_EMPTY, const eKillType killType = eKillType::VIOLENT, const std::u16string& deathType = u"");
 	void Kill(Entity* murderer = nullptr);

dGame/EntityManager.cpp

@@ -161,9 +161,7 @@ void EntityManager::DestroyEntity(const LWOOBJID& objectID) {
 }
 
 void EntityManager::DestroyEntity(Entity* entity) {
-	if (entity == nullptr) {
+	if (!entity) return;
-		return;
-	}
 
 	entity->TriggerEvent(eTriggerEventType::DESTROY, entity);
 
@@ -182,15 +180,11 @@ void EntityManager::DestroyEntity(Entity* entity) {
 	ScheduleForDeletion(id);
 }
 
-void EntityManager::UpdateEntities(const float deltaTime) {
+void EntityManager::SerializeEntities() {
-	for (const auto& e : m_Entities) {
-		e.second->Update(deltaTime);
-	}
-
 	for (auto entry = m_EntitiesToSerialize.begin(); entry != m_EntitiesToSerialize.end(); entry++) {
 		auto* entity = GetEntity(*entry);
 
-		if (entity == nullptr) continue;
+		if (!entity) continue;
 
 		m_SerializationCounter++;
 
@@ -212,11 +206,16 @@ void EntityManager::UpdateEntities(const float deltaTime) {
 		}
 	}
 	m_EntitiesToSerialize.clear();
+}
 
+void EntityManager::KillEntities() {
 	for (auto entry = m_EntitiesToKill.begin(); entry != m_EntitiesToKill.end(); entry++) {
 		auto* entity = GetEntity(*entry);
 
-		if (!entity) continue;
+		if (!entity) {
+			Game::logger->Log("EntityManager", "Attempting to kill null entity %llu", *entry);
+			continue;
+		}
 
 		if (entity->GetScheduledKiller()) {
 			entity->Smash(entity->GetScheduledKiller()->GetObjectID(), eKillType::SILENT);
@@ -225,32 +224,41 @@ void EntityManager::UpdateEntities(const float deltaTime) {
 		}
 	}
 	m_EntitiesToKill.clear();
+}
 
+void EntityManager::DeleteEntities() {
 	for (auto entry = m_EntitiesToDelete.begin(); entry != m_EntitiesToDelete.end(); entry++) {
-
-		// Get all this info first before we delete the player.
 		auto entityToDelete = GetEntity(*entry);
-		auto networkIdToErase = entityToDelete->GetNetworkId();
-		const auto& ghostingToDelete = std::find(m_EntitiesToGhost.begin(), m_EntitiesToGhost.end(), entityToDelete);
-
 		if (entityToDelete) {
-			// If we are a player run through the player destructor.
+			// Get all this info first before we delete the player.
-			if (entityToDelete->IsPlayer()) {
+			auto networkIdToErase = entityToDelete->GetNetworkId();
-				delete dynamic_cast<Player*>(entityToDelete);
+			const auto& ghostingToDelete = std::find(m_EntitiesToGhost.begin(), m_EntitiesToGhost.end(), entityToDelete);
-			} else {
+
-				delete entityToDelete;
+			delete entityToDelete;
-			}
+
 			entityToDelete = nullptr;
+
 			if (networkIdToErase != 0) m_LostNetworkIds.push(networkIdToErase);
+
+			if (ghostingToDelete != m_EntitiesToGhost.end()) m_EntitiesToGhost.erase(ghostingToDelete);
+		} else {
+			Game::logger->Log("EntityManager", "Attempted to delete non-existent entity %llu", *entry);
 		}
-
-		if (ghostingToDelete != m_EntitiesToGhost.end()) m_EntitiesToGhost.erase(ghostingToDelete);
-
 		m_Entities.erase(*entry);
 	}
 	m_EntitiesToDelete.clear();
 }
 
+void EntityManager::UpdateEntities(const float deltaTime) {
+	for (const auto& e : m_Entities) {
+		e.second->Update(deltaTime);
+	}
+
+	SerializeEntities();
+	KillEntities();
+	DeleteEntities();
+}
+
 Entity* EntityManager::GetEntity(const LWOOBJID& objectId) const {
 	const auto& index = m_Entities.find(objectId);
 
@@ -316,6 +324,11 @@ const std::unordered_map<std::string, LWOOBJID>& EntityManager::GetSpawnPointEnt
 }
 
 void EntityManager::ConstructEntity(Entity* entity, const SystemAddress& sysAddr, const bool skipChecks) {
+	if (!entity) {
+		Game::logger->Log("EntityManager", "Attempted to construct null entity");
+		return;
+	}
+
 	if (entity->GetNetworkId() == 0) {
 		uint16_t networkId;
 
@@ -395,9 +408,7 @@ void EntityManager::ConstructAllEntities(const SystemAddress& sysAddr) {
 }
 
 void EntityManager::DestructEntity(Entity* entity, const SystemAddress& sysAddr) {
-	if (entity->GetNetworkId() == 0) {
+	if (!entity || entity->GetNetworkId() == 0) return;
-		return;
-	}
 
 	RakNet::BitStream stream;
 
@@ -414,9 +425,7 @@ void EntityManager::DestructEntity(Entity* entity, const SystemAddress& sysAddr)
 }
 
 void EntityManager::SerializeEntity(Entity* entity) {
-	if (entity->GetNetworkId() == 0) {
+	if (!entity || entity->GetNetworkId() == 0) return;
-		return;
-	}
 
 	if (std::find(m_EntitiesToSerialize.begin(), m_EntitiesToSerialize.end(), entity->GetObjectID()) == m_EntitiesToSerialize.end()) {
 		m_EntitiesToSerialize.push_back(entity->GetObjectID());

dGame/EntityManager.h

@@ -85,6 +85,10 @@ public:
 	const uint32_t GetHardcoreUscoreEnemiesMultiplier() { return m_HardcoreUscoreEnemiesMultiplier; };
 
 private:
+	void SerializeEntities();
+	void KillEntities();
+	void DeleteEntities();
+
 	static EntityManager* m_Address; //For singleton method
 	static std::vector<LWOMAPID> m_GhostingExcludedZones;
 	static std::vector<LOT> m_GhostingExcludedLOTs;

dGame/UserManager.cpp

@@ -22,11 +22,12 @@
 #include "SkillComponent.h"
 #include "AssetManager.h"
 #include "CDClientDatabase.h"
-#include "dMessageIdentifiers.h"
 #include "eObjectBits.h"
 #include "eGameMasterLevel.h"
 #include "eCharacterCreationResponse.h"
 #include "eRenameResponse.h"
+#include "eConnectionType.h"
+#include "eChatInternalMessageType.h"
 
 UserManager* UserManager::m_Address = nullptr;
 
@@ -422,7 +423,7 @@ void UserManager::DeleteCharacter(const SystemAddress& sysAddr, Packet* packet)
 			stmt->execute();
 			delete stmt;
 			CBITSTREAM;
-			PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_PLAYER_REMOVED_NOTIFICATION);
+			PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::PLAYER_REMOVED_NOTIFICATION);
 			bitStream.Write(objectID);
 			Game::chatServer->Send(&bitStream, SYSTEM_PRIORITY, RELIABLE, 0, Game::chatSysAddr, false);
 		}

dGame/dBehaviors/Behavior.cpp

@@ -61,6 +61,7 @@
 #include "SpeedBehavior.h"
 #include "DamageReductionBehavior.h"
 #include "JetPackBehavior.h"
+#include "FallSpeedBehavior.h"
 #include "ChangeIdleFlagsBehavior.h"
 #include "DarkInspirationBehavior.h"
 
@@ -164,7 +165,9 @@ Behavior* Behavior::CreateBehavior(const uint32_t behaviorId) {
 	case BehaviorTemplates::BEHAVIOR_CAR_BOOST:
 		behavior = new CarBoostBehavior(behaviorId);
 		break;
-	case BehaviorTemplates::BEHAVIOR_FALL_SPEED: break;
+	case BehaviorTemplates::BEHAVIOR_FALL_SPEED:
+		behavior = new FallSpeedBehavior(behaviorId);
+		break;
 	case BehaviorTemplates::BEHAVIOR_SHIELD: break;
 	case BehaviorTemplates::BEHAVIOR_REPAIR_ARMOR:
 		behavior = new RepairBehavior(behaviorId);

dGame/dBehaviors/BehaviorContext.cpp

@@ -10,12 +10,12 @@
 
 #include <sstream>
 
-#include "dMessageIdentifiers.h"
 #include "DestroyableComponent.h"
 #include "EchoSyncSkill.h"
 #include "PhantomPhysicsComponent.h"
 #include "RebuildComponent.h"
 #include "eReplicaComponentType.h"
+#include "eConnectionType.h"
 
 BehaviorSyncEntry::BehaviorSyncEntry() {
 }
@@ -253,7 +253,7 @@ bool BehaviorContext::CalculateUpdate(const float deltaTime) {
 			// Write message
 			RakNet::BitStream message;
 
-			PacketUtils::WriteHeader(message, CLIENT, MSG_CLIENT_GAME_MSG);
+			PacketUtils::WriteHeader(message, eConnectionType::CLIENT, eClientMessageType::GAME_MSG);
 			message.Write(this->originator);
 			echo.Serialize(&message);
 

dGame/dBehaviors/CMakeLists.txt

@@ -22,6 +22,7 @@ set(DGAME_DBEHAVIORS_SOURCES "AirMovementBehavior.cpp"
 	"DurationBehavior.cpp"
 	"EmptyBehavior.cpp"
 	"EndBehavior.cpp"
+	"FallSpeedBehavior.cpp"
 	"ForceMovementBehavior.cpp"
 	"HealBehavior.cpp"
 	"ImaginationBehavior.cpp"

dGame/dBehaviors/FallSpeedBehavior.cpp

@@ -0,0 +1,50 @@
+#include "FallSpeedBehavior.h"
+
+#include "ControllablePhysicsComponent.h"
+#include "BehaviorContext.h"
+#include "BehaviorBranchContext.h"
+
+
+void FallSpeedBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
+	// make sure required parameter has non-default value
+	if (m_PercentSlowed == 0.0f) return;
+	auto* target = EntityManager::Instance()->GetEntity(branch.target);
+	if (!target) return;
+
+	auto* controllablePhysicsComponent = target->GetComponent<ControllablePhysicsComponent>();
+	if (!controllablePhysicsComponent) return;
+	controllablePhysicsComponent->SetGravityScale(m_PercentSlowed);
+	EntityManager::Instance()->SerializeEntity(target);
+
+	if (branch.duration > 0.0f) {
+		context->RegisterTimerBehavior(this, branch);
+	} else if (branch.start > 0) {
+		context->RegisterEndBehavior(this, branch);
+	}
+}
+
+void FallSpeedBehavior::Calculate(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
+	Handle(context, bitStream, branch);
+}
+
+void FallSpeedBehavior::Timer(BehaviorContext* context, BehaviorBranchContext branch, LWOOBJID second) {
+	End(context, branch, second);
+}
+
+void FallSpeedBehavior::UnCast(BehaviorContext* context, BehaviorBranchContext branch) {
+	End(context, branch, LWOOBJID_EMPTY);
+}
+
+void FallSpeedBehavior::End(BehaviorContext* context, BehaviorBranchContext branch, LWOOBJID second) {
+	auto* target = EntityManager::Instance()->GetEntity(branch.target);
+	if (!target) return;
+
+	auto* controllablePhysicsComponent = target->GetComponent<ControllablePhysicsComponent>();
+	if (!controllablePhysicsComponent) return;
+	controllablePhysicsComponent->SetGravityScale(1);
+	EntityManager::Instance()->SerializeEntity(target);
+}
+
+void FallSpeedBehavior::Load(){
+	m_PercentSlowed = GetFloat("percent_slowed");
+}

dGame/dBehaviors/FallSpeedBehavior.h

@@ -0,0 +1,18 @@
+#pragma once
+#include "Behavior.h"
+
+class FallSpeedBehavior final : public Behavior
+{
+public:
+	explicit FallSpeedBehavior(const uint32_t behaviorId) : Behavior(behaviorId) {}
+
+	void Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) override;
+	void Calculate(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) override;
+	void Timer(BehaviorContext* context, BehaviorBranchContext branch, LWOOBJID second) override;
+	void End(BehaviorContext* context, BehaviorBranchContext branch, LWOOBJID second) override;
+	void UnCast(BehaviorContext* context, BehaviorBranchContext branch) override;
+	void Load() override;
+
+private:
+	float m_PercentSlowed;
+};

dGame/dBehaviors/SwitchBehavior.cpp

@@ -30,7 +30,7 @@ void SwitchBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStre
 
 	Game::logger->LogDebug("SwitchBehavior", "[%i] State: (%d), imagination: (%i) / (%f)", entity->GetLOT(), state, destroyableComponent->GetImagination(), destroyableComponent->GetMaxImagination());
 
-	if (state || (entity->GetLOT() == 8092 && destroyableComponent->GetImagination() >= m_imagination)) {
+	if (state) {
 		this->m_actionTrue->Handle(context, bitStream, branch);
 	} else {
 		this->m_actionFalse->Handle(context, bitStream, branch);

dGame/dComponents/CharacterComponent.cpp

@@ -13,7 +13,7 @@
 #include "VehiclePhysicsComponent.h"
 #include "GameMessages.h"
 #include "Item.h"
-#include "AMFFormat.h"
+#include "Amf3.h"
 #include "eGameMasterLevel.h"
 #include "eGameActivity.h"
 
@@ -734,6 +734,6 @@ void CharacterComponent::RemoveVentureVisionEffect(std::string ventureVisionType
 void CharacterComponent::UpdateClientMinimap(bool showFaction, std::string ventureVisionType) const {
 	if (!m_Parent) return;
 	AMFArrayValue arrayToSend;
-	arrayToSend.InsertValue(ventureVisionType, showFaction ? static_cast<AMFValue*>(new AMFTrueValue()) : static_cast<AMFValue*>(new AMFFalseValue()));
+	arrayToSend.Insert(ventureVisionType, showFaction);
-	GameMessages::SendUIMessageServerToSingleClient(m_Parent, m_Parent ? m_Parent->GetSystemAddress() : UNASSIGNED_SYSTEM_ADDRESS, "SetFactionVisibility", &arrayToSend);
+	GameMessages::SendUIMessageServerToSingleClient(m_Parent, m_Parent ? m_Parent->GetSystemAddress() : UNASSIGNED_SYSTEM_ADDRESS, "SetFactionVisibility", arrayToSend);
 }

dGame/dComponents/ControllablePhysicsComponent.cpp

@@ -320,7 +320,7 @@ void ControllablePhysicsComponent::RemoveSpeedboost(float value) {
 
 	// Recalculate speedboost since we removed one
 	m_SpeedBoost = 0.0f;
-	if (m_ActiveSpeedBoosts.size() == 0) { // no active speed boosts left, so return to base speed
+	if (m_ActiveSpeedBoosts.empty()) { // no active speed boosts left, so return to base speed
 		auto* levelProgressionComponent = m_Parent->GetComponent<LevelProgressionComponent>();
 		if (levelProgressionComponent) m_SpeedBoost = levelProgressionComponent->GetSpeedBase();
 	} else { // Used the last applied speedboost

dGame/dComponents/ControllablePhysicsComponent.h

@@ -276,7 +276,7 @@ public:
 	 * The speed boosts of this component.
 	 * @return All active Speed boosts for this component.
 	 */
-	std::vector<float> GetActiveSpeedboosts() { return m_ActivePickupRadiusScales; };
+	std::vector<float> GetActiveSpeedboosts() { return m_ActiveSpeedBoosts; };
 
 	/**
 	* Activates the Bubble Buff

dGame/dComponents/DestroyableComponent.cpp

@@ -4,8 +4,8 @@
 #include "Game.h"
 #include "dConfig.h"
 
-#include "AMFFormat.h"
+#include "Amf3.h"
-#include "AMFFormat_BitStream.h"
+#include "AmfSerialize.h"
 #include "GameMessages.h"
 #include "User.h"
 #include "CDClientManager.h"
@@ -245,16 +245,12 @@ void DestroyableComponent::SetMaxHealth(float value, bool playAnim) {
 	if (playAnim) {
 		// Now update the player bar
 		if (!m_Parent->GetParentUser()) return;
-		AMFStringValue* amount = new AMFStringValue();
-		amount->SetStringValue(std::to_string(difference));
-		AMFStringValue* type = new AMFStringValue();
-		type->SetStringValue("health");
 
 		AMFArrayValue args;
-		args.InsertValue("amount", amount);
+		args.Insert("amount", std::to_string(difference));
-		args.InsertValue("type", type);
+		args.Insert("type", "health");
 
-		GameMessages::SendUIMessageServerToSingleClient(m_Parent, m_Parent->GetParentUser()->GetSystemAddress(), "MaxPlayerBarUpdate", &args);
+		GameMessages::SendUIMessageServerToSingleClient(m_Parent, m_Parent->GetParentUser()->GetSystemAddress(), "MaxPlayerBarUpdate", args);
 	}
 
 	EntityManager::Instance()->SerializeEntity(m_Parent);
@@ -290,16 +286,12 @@ void DestroyableComponent::SetMaxArmor(float value, bool playAnim) {
 	if (playAnim) {
 		// Now update the player bar
 		if (!m_Parent->GetParentUser()) return;
-		AMFStringValue* amount = new AMFStringValue();
-		amount->SetStringValue(std::to_string(value));
-		AMFStringValue* type = new AMFStringValue();
-		type->SetStringValue("armor");
 
 		AMFArrayValue args;
-		args.InsertValue("amount", amount);
+		args.Insert("amount", std::to_string(value));
-		args.InsertValue("type", type);
+		args.Insert("type", "armor");
 
-		GameMessages::SendUIMessageServerToSingleClient(m_Parent, m_Parent->GetParentUser()->GetSystemAddress(), "MaxPlayerBarUpdate", &args);
+		GameMessages::SendUIMessageServerToSingleClient(m_Parent, m_Parent->GetParentUser()->GetSystemAddress(), "MaxPlayerBarUpdate", args);
 	}
 
 	EntityManager::Instance()->SerializeEntity(m_Parent);
@@ -334,16 +326,12 @@ void DestroyableComponent::SetMaxImagination(float value, bool playAnim) {
 	if (playAnim) {
 		// Now update the player bar
 		if (!m_Parent->GetParentUser()) return;
-		AMFStringValue* amount = new AMFStringValue();
-		amount->SetStringValue(std::to_string(difference));
-		AMFStringValue* type = new AMFStringValue();
-		type->SetStringValue("imagination");
 
 		AMFArrayValue args;
-		args.InsertValue("amount", amount);
+		args.Insert("amount", std::to_string(difference));
-		args.InsertValue("type", type);
+		args.Insert("type", "imagination");
 
-		GameMessages::SendUIMessageServerToSingleClient(m_Parent, m_Parent->GetParentUser()->GetSystemAddress(), "MaxPlayerBarUpdate", &args);
+		GameMessages::SendUIMessageServerToSingleClient(m_Parent, m_Parent->GetParentUser()->GetSystemAddress(), "MaxPlayerBarUpdate", args);
 	}
 	EntityManager::Instance()->SerializeEntity(m_Parent);
 }

dGame/dComponents/MissionComponent.cpp

@@ -13,7 +13,7 @@
 #include "InventoryComponent.h"
 #include "GameMessages.h"
 #include "Game.h"
-#include "AMFFormat.h"
+#include "Amf3.h"
 #include "dZoneManager.h"
 #include "Mail.h"
 #include "MissionPrerequisites.h"

dGame/dComponents/ModuleAssemblyComponent.h

@@ -14,7 +14,7 @@ class ModuleAssemblyComponent : public Component {
 public:
 	static const eReplicaComponentType ComponentType = eReplicaComponentType::MODULE_ASSEMBLY;
 
-	ModuleAssemblyComponent(Entity* MSG_CHAT_INTERNAL_PLAYER_REMOVED_NOTIFICATION);
+	ModuleAssemblyComponent(Entity* parent);
 	~ModuleAssemblyComponent() override;
 
 	void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate, unsigned int& flags);

dGame/dComponents/MovementAIComponent.cpp

@@ -307,13 +307,14 @@ float MovementAIComponent::GetBaseSpeed(LOT lot) {
 
 foundComponent:
 
-	float speed;
+	// Client defaults speed to 10 and if the speed is also null in the table, it defaults to 10.
+	float speed = 10.0f;
 
-	if (physicsComponent == nullptr) {
+	if (physicsComponent) speed = physicsComponent->speed;
-		speed = 8;
+
-	} else {
+	float delta = fabs(speed) - 1.0f;
-		speed = physicsComponent->speed;
+
-	}
+	if (delta <= std::numeric_limits<float>::epsilon()) speed = 10.0f;
 
 	m_PhysicsSpeedCache[lot] = speed;
 

dGame/dComponents/PetComponent.cpp

@@ -26,6 +26,7 @@
 #include "Database.h"
 #include "EntityInfo.h"
 #include "eMissionTaskType.h"
+#include "RenderComponent.h"
 #include "eObjectBits.h"
 #include "eGameMasterLevel.h"
 
@@ -530,7 +531,7 @@ void PetComponent::NotifyTamingBuildSuccess(NiPoint3 position) {
 	}
 
 	GameMessages::SendPlayFXEffect(tamer, -1, u"petceleb", "", LWOOBJID_EMPTY, 1, 1, true);
-	GameMessages::SendPlayAnimation(tamer, u"rebuild-celebrate");
+	RenderComponent::PlayAnimation(tamer, u"rebuild-celebrate");
 
 	EntityInfo info{};
 	info.lot = cached->second.puzzleModelLot;

dGame/dComponents/PropertyEntranceComponent.cpp

@@ -11,7 +11,7 @@
 #include "CharacterComponent.h"
 #include "UserManager.h"
 #include "dLogger.h"
-#include "AMFFormat.h"
+#include "Amf3.h"
 #include "eObjectBits.h"
 #include "eGameMasterLevel.h"
 
@@ -36,12 +36,9 @@ void PropertyEntranceComponent::OnUse(Entity* entity) {
 
 	AMFArrayValue args;
 
-	auto* state = new AMFStringValue();
+	args.Insert("state", "property_menu");
-	state->SetStringValue("property_menu");
 
-	args.InsertValue("state", state);
+	GameMessages::SendUIMessageServerToSingleClient(entity, entity->GetSystemAddress(), "pushGameState", args);
-
-	GameMessages::SendUIMessageServerToSingleClient(entity, entity->GetSystemAddress(), "pushGameState", &args);
 }
 
 void PropertyEntranceComponent::OnEnterProperty(Entity* entity, uint32_t index, bool returnToZone, const SystemAddress& sysAddr) {

dGame/dComponents/RacingControlComponent.cpp

@@ -24,6 +24,8 @@
 #include "Loot.h"
 #include "eMissionTaskType.h"
 #include "LeaderboardManager.h"
+#include "dZoneManager.h"
+#include "CDActivitiesTable.h"
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846264338327950288
@@ -46,36 +48,14 @@ RacingControlComponent::RacingControlComponent(Entity* parent)
 	m_EmptyTimer = 0;
 	m_SoloRacing = Game::config->GetValue("solo_racing") == "1";
 
-	// Select the main world ID as fallback when a player fails to load.
+	m_MainWorld = 1200;
-
 	const auto worldID = Game::server->GetZoneID();
+	if (dZoneManager::Instance()->CheckIfAccessibleZone((worldID/10)*10)) m_MainWorld = (worldID/10)*10;
 
-	switch (worldID) {
+	m_ActivityID = 42;
-	case 1203:
+	CDActivitiesTable* activitiesTable = CDClientManager::Instance().GetTable<CDActivitiesTable>();
-		m_ActivityID = 42;
+	std::vector<CDActivities> activities = activitiesTable->Query([=](CDActivities entry) {return (entry.instanceMapID == worldID); });
-		m_MainWorld = 1200;
+	for (CDActivities activity : activities) m_ActivityID = activity.ActivityID;
-		break;
-
-	case 1261:
-		m_ActivityID = 60;
-		m_MainWorld = 1260;
-		break;
-
-	case 1303:
-		m_ActivityID = 39;
-		m_MainWorld = 1300;
-		break;
-
-	case 1403:
-		m_ActivityID = 54;
-		m_MainWorld = 1400;
-		break;
-
-	default:
-		m_ActivityID = 42;
-		m_MainWorld = 1200;
-		break;
-	}
 }
 
 RacingControlComponent::~RacingControlComponent() {}
@@ -383,8 +363,7 @@ void RacingControlComponent::OnRacingPlayerInfoResetFinished(Entity* player) {
 	}
 }
 
-void RacingControlComponent::HandleMessageBoxResponse(Entity* player,
+void RacingControlComponent::HandleMessageBoxResponse(Entity* player, int32_t button, const std::string& id) {
-	const std::string& id) {
 	auto* data = GetPlayerData(player->GetObjectID());
 
 	if (data == nullptr) {
@@ -426,7 +405,7 @@ void RacingControlComponent::HandleMessageBoxResponse(Entity* player,
 				missionComponent->Progress(eMissionTaskType::RACING, dZoneManager::Instance()->GetZone()->GetWorldID(), (LWOOBJID)eRacingTaskParam::LAST_PLACE_FINISH); // Finished first place in specific world.
 			}
 		}
-	} else if (id == "ACT_RACE_EXIT_THE_RACE?" || id == "Exit") {
+	} else if ((id == "ACT_RACE_EXIT_THE_RACE?" || id == "Exit") && button == m_ActivityExitConfirm) {
 		auto* vehicle = EntityManager::Instance()->GetEntity(data->vehicleID);
 
 		if (vehicle == nullptr) {

dGame/dComponents/RacingControlComponent.h

@@ -144,7 +144,7 @@ public:
 	/**
 	 * Invoked when the player responds to the GUI.
 	 */
-	void HandleMessageBoxResponse(Entity* player, const std::string& id);
+	void HandleMessageBoxResponse(Entity* player, int32_t button, const std::string& id);
 
 	/**
 	 * Get the racing data from a player's LWOOBJID.
@@ -246,4 +246,9 @@ private:
 	float m_EmptyTimer;
 
 	bool m_SoloRacing;
+
+	/**
+	 * Value for message box response to know if we are exiting the race via the activity dialogue
+	 */
+	const int32_t m_ActivityExitConfirm = 1;
 };

dGame/dComponents/RailActivatorComponent.cpp

@@ -7,6 +7,8 @@
 #include "RebuildComponent.h"
 #include "Game.h"
 #include "dLogger.h"
+#include "RenderComponent.h"
+#include "EntityManager.h"
 #include "eStateChangeType.h"
 
 RailActivatorComponent::RailActivatorComponent(Entity* parent, int32_t componentID) : Component(parent) {
@@ -57,23 +59,10 @@ void RailActivatorComponent::OnUse(Entity* originator) {
 		GameMessages::SendPlayFXEffect(originator->GetObjectID(), m_StartEffect.first, m_StartEffect.second,
 			std::to_string(m_StartEffect.first));
 	}
-
+	
+	float animationLength = 0.5f;
 	if (!m_StartAnimation.empty()) {
-		GameMessages::SendPlayAnimation(originator, m_StartAnimation);
+		animationLength = RenderComponent::PlayAnimation(originator, m_StartAnimation);
-	}
-
-	float animationLength;
-
-	if (m_StartAnimation == u"whirlwind-rail-up-earth") {
-		animationLength = 1.5f;
-	} else if (m_StartAnimation == u"whirlwind-rail-up-lightning") {
-		animationLength = 0.5f;
-	} else if (m_StartAnimation == u"whirlwind-rail-up-ice") {
-		animationLength = 0.5f;
-	} else if (m_StartAnimation == u"whirlwind-rail-up-fire") {
-		animationLength = 0.5f;
-	} else {
-		animationLength = 0.5f;
 	}
 
 	const auto originatorID = originator->GetObjectID();
@@ -112,7 +101,7 @@ void RailActivatorComponent::OnRailMovementReady(Entity* originator) const {
 		}
 
 		if (!m_LoopAnimation.empty()) {
-			GameMessages::SendPlayAnimation(originator, m_LoopAnimation);
+			RenderComponent::PlayAnimation(originator, m_LoopAnimation);
 		}
 
 		GameMessages::SendSetRailMovement(originator->GetObjectID(), m_PathDirection, m_Path, m_PathStart,
@@ -147,7 +136,7 @@ void RailActivatorComponent::OnCancelRailMovement(Entity* originator) {
 		}
 
 		if (!m_StopAnimation.empty()) {
-			GameMessages::SendPlayAnimation(originator, m_StopAnimation);
+			RenderComponent::PlayAnimation(originator, m_StopAnimation);
 		}
 
 		// Remove the player after they've signalled they're done railing

dGame/dComponents/RebuildComponent.cpp

@@ -20,6 +20,7 @@
 #include "Preconditions.h"
 #include "Loot.h"
 #include "TeamManager.h"
+#include "RenderComponent.h"
 
 #include "CppScripts.h"
 
@@ -196,18 +197,18 @@ void RebuildComponent::Update(float deltaTime) {
 			DestroyableComponent* destComp = builder->GetComponent<DestroyableComponent>();
 			if (!destComp) break;
 
-			int newImagination = destComp->GetImagination() - 1;
+			int newImagination = destComp->GetImagination();
+			if (newImagination <= 0) {
+				CancelRebuild(builder, eQuickBuildFailReason::OUT_OF_IMAGINATION, true);
+				break;
+			}
 
+			++m_DrainedImagination;
+			--newImagination;
 			destComp->SetImagination(newImagination);
 			EntityManager::Instance()->SerializeEntity(builder);
 
-			++m_DrainedImagination;
 
-			if (newImagination == 0 && m_DrainedImagination < m_TakeImagination) {
-				CancelRebuild(builder, eQuickBuildFailReason::OUT_OF_IMAGINATION, true);
-
-				break;
-			}
 		}
 
 		if (m_Timer >= m_CompleteTime && m_DrainedImagination >= m_TakeImagination) {
@@ -517,7 +518,7 @@ void RebuildComponent::CompleteRebuild(Entity* user) {
 			character->SetPlayerFlag(flagNumber, true);
 		}
 	}
-	GameMessages::SendPlayAnimation(user, u"rebuild-celebrate", 1.09f);
+	RenderComponent::PlayAnimation(user, u"rebuild-celebrate", 1.09f);
 }
 
 void RebuildComponent::ResetRebuild(bool failed) {
@@ -527,7 +528,7 @@ void RebuildComponent::ResetRebuild(bool failed) {
 		GameMessages::SendEnableRebuild(m_Parent, false, false, failed, eQuickBuildFailReason::NOT_GIVEN, m_ResetTime, builder->GetObjectID());
 
 		if (failed) {
-			GameMessages::SendPlayAnimation(builder, u"rebuild-fail");
+			RenderComponent::PlayAnimation(builder, u"rebuild-fail");
 		}
 	}
 

dGame/dComponents/RenderComponent.cpp

@@ -11,72 +11,36 @@
 #include "GameMessages.h"
 #include "Game.h"
 #include "dLogger.h"
+#include "CDAnimationsTable.h"
 
 std::unordered_map<int32_t, float> RenderComponent::m_DurationCache{};
 
-RenderComponent::RenderComponent(Entity* parent) : Component(parent) {
+RenderComponent::RenderComponent(Entity* parent, int32_t componentId): Component(parent) {
 	m_Effects = std::vector<Effect*>();
+	m_LastAnimationName = "";
+	if (componentId == -1) return;
 
-	return;
+	auto query = CDClientDatabase::CreatePreppedStmt("SELECT * FROM RenderComponent WHERE id = ?;");
+	query.bind(1, componentId);
+	auto result = query.execQuery();
 
-	/*
+	if (!result.eof()) {
-	auto* table = CDClientManager::Instance().GetTable<CDComponentsRegistryTable>();
+		auto animationGroupIDs = std::string(result.getStringField("animationGroupIDs", ""));
-
+		if (!animationGroupIDs.empty()) {
-	const auto entry = table->GetByIDAndType(parent->GetLOT(), eReplicaComponentType::RENDER);
+			auto* animationsTable = CDClientManager::Instance().GetTable<CDAnimationsTable>();
-
+			auto groupIdsSplit = GeneralUtils::SplitString(animationGroupIDs, ',');
-	std::stringstream query;
+			for (auto& groupId : groupIdsSplit) {
-
+				int32_t groupIdInt;
-	query << "SELECT effect1, effect2, effect3, effect4, effect5, effect6 FROM RenderComponent WHERE id = " << std::to_string(entry) << ";";
+				if (!GeneralUtils::TryParse(groupId, groupIdInt)) {
-
+					Game::logger->Log("RenderComponent", "bad animation group Id %s", groupId.c_str());
-	auto result = CDClientDatabase::ExecuteQuery(query.str());
+					continue;
-
+				}
-	if (result.eof())
+				m_animationGroupIds.push_back(groupIdInt);
-	{
+				animationsTable->CacheAnimationGroup(groupIdInt);
-		return;
+			}
-	}
-
-	for (auto i = 0; i < 6; ++i)
-	{
-		if (result.fieldIsNull(i))
-		{
-			continue;
-		}
-
-		const auto id = result.getIntField(i);
-
-		if (id <= 0)
-		{
-			continue;
-		}
-
-		query.clear();
-
-		query << "SELECT effectType, effectName FROM BehaviorEffect WHERE effectID = " << std::to_string(id) << ";";
-
-		auto effectResult = CDClientDatabase::ExecuteQuery(query.str());
-
-		while (!effectResult.eof())
-		{
-			const auto type = effectResult.fieldIsNull(0) ? "" : std::string(effectResult.getStringField(0));
-
-			const auto name = effectResult.fieldIsNull(1) ? "" : std::string(effectResult.getStringField(1));
-
-			auto* effect = new Effect();
-
-			effect->name = name;
-			effect->type = GeneralUtils::ASCIIToUTF16(type);
-			effect->scale = 1;
-			effect->effectID = id;
-			effect->secondary = LWOOBJID_EMPTY;
-
-			m_Effects.push_back(effect);
-
-			effectResult.nextRow();
 		}
 	}
-
 	result.finalize();
-	*/
 }
 
 RenderComponent::~RenderComponent() {
@@ -224,3 +188,45 @@ void RenderComponent::StopEffect(const std::string& name, const bool killImmedia
 std::vector<Effect*>& RenderComponent::GetEffects() {
 	return m_Effects;
 }
+
+
+float RenderComponent::PlayAnimation(Entity* self, const std::u16string& animation, float priority, float scale) {
+	if (!self) return 0.0f;
+	return RenderComponent::PlayAnimation(self, GeneralUtils::UTF16ToWTF8(animation), priority, scale);
+}
+
+float RenderComponent::PlayAnimation(Entity* self, const std::string& animation, float priority, float scale) {
+	if (!self) return 0.0f;
+	return RenderComponent::DoAnimation(self, animation, true, priority, scale);
+}
+
+float RenderComponent::GetAnimationTime(Entity* self, const std::u16string& animation) {
+	if (!self) return 0.0f;
+	return RenderComponent::GetAnimationTime(self, GeneralUtils::UTF16ToWTF8(animation));
+}
+
+float RenderComponent::GetAnimationTime(Entity* self, const std::string& animation) {
+	if (!self) return 0.0f;
+	return RenderComponent::DoAnimation(self, animation, false);
+}
+
+
+float RenderComponent::DoAnimation(Entity* self, const std::string& animation, bool sendAnimation, float priority, float scale) {
+	float returnlength = 0.0f;
+	if (!self) return returnlength;
+	auto* renderComponent = self->GetComponent<RenderComponent>();
+	if (!renderComponent) return returnlength;
+
+	auto* animationsTable = CDClientManager::Instance().GetTable<CDAnimationsTable>();
+	for (auto& groupId : renderComponent->m_animationGroupIds) {
+		auto animationGroup = animationsTable->GetAnimation(animation, renderComponent->GetLastAnimationName(), groupId);
+		if (animationGroup.FoundData()) {
+			auto data = animationGroup.Data();
+			renderComponent->SetLastAnimationName(data.animation_name);
+			returnlength = data.animation_length;
+		}
+	}
+	if (sendAnimation) GameMessages::SendPlayAnimation(self, GeneralUtils::ASCIIToUTF16(animation), priority, scale);
+	if (returnlength == 0.0f) Game::logger->Log("RenderComponent", "WARNING: Unable to find animation %s for lot %i in any group.", animation.c_str(), self->GetLOT());
+	return returnlength;
+}

dGame/dComponents/RenderComponent.h

@@ -6,7 +6,7 @@
 #include <string>
 #include <unordered_map>
 
-#include "AMFFormat.h"
+#include "Amf3.h"
 #include "Component.h"
 #include "eReplicaComponentType.h"
 
@@ -58,7 +58,7 @@ class RenderComponent : public Component {
 public:
 	static const eReplicaComponentType ComponentType = eReplicaComponentType::RENDER;
 
-	RenderComponent(Entity* entity);
+	RenderComponent(Entity* entity, int32_t componentId = -1);
 	~RenderComponent() override;
 
 	void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate, unsigned int& flags);
@@ -104,6 +104,32 @@ public:
 	 */
 	std::vector<Effect*>& GetEffects();
 
+	/**
+	 * Verifies that an animation can be played on this entity by checking
+	 * if it has the animation assigned to its group.  If it does, the animation is echo'd
+	 * down to all clients to be played and the duration of the played animation is returned.
+	 * If the animation did not exist or the function was called in an invalid state, 0 is returned.
+	 * 
+	 * The logic here matches the exact client logic.
+	 * 
+	 * @param self The entity that wants to play an animation
+	 * @param animation The animation_type (animationID in the client) to be played.
+	 * @param sendAnimation Whether or not to echo the animation down to all clients.
+	 * @param priority The priority of the animation.  Only used if sendAnimation is true.
+	 * @param scale	The scale of the animation.  Only used if sendAnimation is true.
+	 * 
+	 * @return The duration of the animation that was played.
+	 */
+	static float DoAnimation(Entity* self, const std::string& animation, bool sendAnimation, float priority = 0.0f, float scale = 1.0f);
+
+	static float PlayAnimation(Entity* self, const std::u16string& animation, float priority = 0.0f, float scale = 1.0f);
+	static float PlayAnimation(Entity* self, const std::string& animation, float priority = 0.0f, float scale = 1.0f);
+	static float GetAnimationTime(Entity* self, const std::string& animation);
+	static float GetAnimationTime(Entity* self, const std::u16string& animation);
+
+	const std::string& GetLastAnimationName() const { return m_LastAnimationName; };
+	void SetLastAnimationName(const std::string& name) { m_LastAnimationName = name; };
+
 private:
 
 	/**
@@ -111,6 +137,11 @@ private:
 	 */
 	std::vector<Effect*> m_Effects;
 
+	std::vector<int32_t> m_animationGroupIds;
+
+	// The last animationName that was played
+	std::string m_LastAnimationName;
+
 	/**
 	 * Cache of queries that look for the length of each effect, indexed by effect ID
 	 */

dGame/dComponents/RocketLaunchpadControlComponent.cpp

@@ -15,9 +15,10 @@
 #include "PropertyEntranceComponent.h"
 #include "RocketLaunchLupComponent.h"
 #include "dServer.h"
-#include "dMessageIdentifiers.h"
 #include "PacketUtils.h"
 #include "eObjectWorldState.h"
+#include "eConnectionType.h"
+#include "eMasterMessageType.h"
 
 RocketLaunchpadControlComponent::RocketLaunchpadControlComponent(Entity* parent, int rocketId) : Component(parent) {
 	auto query = CDClientDatabase::CreatePreppedStmt(
@@ -136,7 +137,7 @@ LWOCLONEID RocketLaunchpadControlComponent::GetSelectedCloneId(LWOOBJID player)
 
 void RocketLaunchpadControlComponent::TellMasterToPrepZone(int zoneID) {
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, MASTER, MSG_MASTER_PREP_ZONE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::PREP_ZONE);
 	bitStream.Write(zoneID);
 	Game::server->SendToMaster(&bitStream);
 }

dGame/dComponents/ScriptedActivityComponent.cpp

@@ -18,14 +18,16 @@
 #include "dConfig.h"
 #include "InventoryComponent.h"
 #include "DestroyableComponent.h"
-#include "dMessageIdentifiers.h"
 #include "Loot.h"
 #include "eMissionTaskType.h"
 #include "eMatchUpdate.h"
+#include "eConnectionType.h"
+#include "eChatInternalMessageType.h"
 
 #include "CDCurrencyTableTable.h"
 #include "CDActivityRewardsTable.h"
 #include "CDActivitiesTable.h"
+#include "LeaderboardManager.h"
 
 ScriptedActivityComponent::ScriptedActivityComponent(Entity* parent, int activityID) : Component(parent) {
 	m_ActivityID = activityID;
@@ -34,10 +36,7 @@ ScriptedActivityComponent::ScriptedActivityComponent(Entity* parent, int activit
 
 	for (CDActivities activity : activities) {
 		m_ActivityInfo = activity;
-
+		if (static_cast<LeaderboardType>(activity.leaderboardType) == LeaderboardType::Racing && Game::config->GetValue("solo_racing") == "1") {
-		const auto mapID = m_ActivityInfo.instanceMapID;
-
-		if ((mapID == 1203 || mapID == 1261 || mapID == 1303 || mapID == 1403) && Game::config->GetValue("solo_racing") == "1") {
 			m_ActivityInfo.minTeamSize = 1;
 			m_ActivityInfo.minTeams = 1;
 		}
@@ -517,7 +516,7 @@ void ActivityInstance::StartZone() {
 	// only make a team if we have more than one participant
 	if (participants.size() > 1) {
 		CBITSTREAM;
-		PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_CREATE_TEAM);
+		PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::CREATE_TEAM);
 
 		bitStream.Write(leader->GetObjectID());
 		bitStream.Write(m_Participants.size());

dGame/dComponents/SkillComponent.cpp

@@ -20,11 +20,11 @@
 #include "ScriptComponent.h"
 #include "BuffComponent.h"
 #include "EchoStartSkill.h"
-#include "dMessageIdentifiers.h"
 #include "DoClientProjectileImpact.h"
 #include "CDClientManager.h"
-
 #include "CDSkillBehaviorTable.h"
+#include "eConnectionType.h"
+#include "eClientMessageType.h"
 
 ProjectileSyncEntry::ProjectileSyncEntry() {
 }
@@ -304,7 +304,7 @@ SkillExecutionResult SkillComponent::CalculateBehavior(const uint32_t skillId, c
 		// Write message
 		RakNet::BitStream message;
 
-		PacketUtils::WriteHeader(message, CLIENT, MSG_CLIENT_GAME_MSG);
+		PacketUtils::WriteHeader(message, eConnectionType::CLIENT, eClientMessageType::GAME_MSG);
 		message.Write(this->m_Parent->GetObjectID());
 		start.Serialize(&message);
 
@@ -437,7 +437,7 @@ void SkillComponent::SyncProjectileCalculation(const ProjectileSyncEntry& entry)
 
 	RakNet::BitStream message;
 
-	PacketUtils::WriteHeader(message, CLIENT, MSG_CLIENT_GAME_MSG);
+	PacketUtils::WriteHeader(message, eConnectionType::CLIENT, eClientMessageType::GAME_MSG);
 	message.Write(this->m_Parent->GetObjectID());
 	projectileImpact.Serialize(&message);
 

dGame/dComponents/SwitchComponent.cpp

@@ -1,6 +1,7 @@
 #include "SwitchComponent.h"
 #include "EntityManager.h"
 #include "eTriggerEventType.h"
+#include "RenderComponent.h"
 
 std::vector<SwitchComponent*> SwitchComponent::petSwitches;
 
@@ -59,7 +60,7 @@ void SwitchComponent::EntityEnter(Entity* entity) {
 
 		if (m_PetBouncer != nullptr) {
 			GameMessages::SendPlayFXEffect(m_Parent->GetObjectID(), 2602, u"pettriggeractive", "BounceEffect", LWOOBJID_EMPTY, 1, 1, true);
-			GameMessages::SendPlayAnimation(m_Parent, u"engaged", 0, 1);
+			RenderComponent::PlayAnimation(m_Parent, u"engaged");
 			m_PetBouncer->SetPetBouncerEnabled(true);
 		} else {
 			EntityManager::Instance()->SerializeEntity(m_Parent);

dGame/dComponents/TriggerComponent.cpp

@@ -235,6 +235,8 @@ void TriggerComponent::HandleRotateObject(Entity* targetEntity, std::vector<std:
 }
 
 void TriggerComponent::HandlePushObject(Entity* targetEntity, std::vector<std::string> argArray){
+	if (argArray.size() < 3) return;
+
 	auto* phantomPhysicsComponent = m_Parent->GetComponent<PhantomPhysicsComponent>();
 	if (!phantomPhysicsComponent) {
 		Game::logger->LogDebug("TriggerComponent::HandlePushObject", "Phantom Physics component not found!");

dGame/dGameMessages/DoClientProjectileImpact.h

@@ -1,13 +1,10 @@
 #ifndef __DOCLIENTPROJECTILEIMPACT__H__
 #define __DOCLIENTPROJECTILEIMPACT__H__
 
-#include "dMessageIdentifiers.h"
 #include "dCommonVars.h"
 
 /*  Tell a client local projectile to impact */
 class DoClientProjectileImpact {
-	static const GAME_MSG MsgID = GAME_MSG_DO_CLIENT_PROJECTILE_IMPACT;
-
 public:
 	DoClientProjectileImpact() {
 		i64OrgID = LWOOBJID_EMPTY;
@@ -30,7 +27,7 @@ public:
 	}
 
 	void Serialize(RakNet::BitStream* stream) {
-		stream->Write(MsgID);
+		stream->Write(eGameMessageType::DO_CLIENT_PROJECTILE_IMPACT);
 
 		stream->Write(i64OrgID != LWOOBJID_EMPTY);
 		if (i64OrgID != LWOOBJID_EMPTY) stream->Write(i64OrgID);

dGame/dGameMessages/EchoStartSkill.h

@@ -2,14 +2,12 @@
 #define __ECHOSTARTSKILL__H__
 
 #include "dCommonVars.h"
-#include "dMessageIdentifiers.h"
 #include "NiPoint3.h"
 #include "NiQuaternion.h"
+#include "eGameMessageType.h"
 
 /*  Same as start skill but with different network options. An echo down to other clients that need to play the skill. */
 class EchoStartSkill {
-	static const GAME_MSG MsgID = GAME_MSG_ECHO_START_SKILL;
-
 public:
 	EchoStartSkill() {
 		bUsedMouse = false;
@@ -42,7 +40,7 @@ public:
 	}
 
 	void Serialize(RakNet::BitStream* stream) {
-		stream->Write(MsgID);
+		stream->Write(eGameMessageType::ECHO_START_SKILL);
 
 		stream->Write(bUsedMouse);
 

dGame/dGameMessages/EchoSyncSkill.h

@@ -4,13 +4,11 @@
 #include <string>
 
 #include "BitStream.h"
+#include "eGameMessageType.h"
 
-#include "dMessageIdentifiers.h"
 
 /*  Message to synchronize a skill cast */
 class EchoSyncSkill {
-	static const GAME_MSG MsgID = GAME_MSG_ECHO_SYNC_SKILL;
-
 public:
 	EchoSyncSkill() {
 		bDone = false;
@@ -31,7 +29,7 @@ public:
 	}
 
 	void Serialize(RakNet::BitStream* stream) {
-		stream->Write(MsgID);
+		stream->Write(eGameMessageType::ECHO_SYNC_SKILL);
 
 		stream->Write(bDone);
 		uint32_t sBitStreamLength = sBitStream.length();

dGame/dGameMessages/GameMessageHandler.cpp

@@ -33,10 +33,11 @@
 #include "EchoSyncSkill.h"
 #include "eMissionTaskType.h"
 #include "eReplicaComponentType.h"
+#include "eConnectionType.h"
 
 using namespace std;
 
-void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const SystemAddress& sysAddr, LWOOBJID objectID, GAME_MSG messageID) {
+void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const SystemAddress& sysAddr, LWOOBJID objectID, eGameMessageType messageID) {
 
 	CBITSTREAM;
 
@@ -53,54 +54,54 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const System
 
 	switch (messageID) {
 
-	case GAME_MSG_UN_USE_BBB_MODEL: {
+	case eGameMessageType::UN_USE_BBB_MODEL: {
 		GameMessages::HandleUnUseModel(inStream, entity, sysAddr);
 		break;
 	}
-	case GAME_MSG_PLAY_EMOTE: {
+	case eGameMessageType::PLAY_EMOTE: {
 		GameMessages::HandlePlayEmote(inStream, entity);
 		break;
 	}
 
-	case GAME_MSG_MOVE_ITEM_IN_INVENTORY: {
+	case eGameMessageType::MOVE_ITEM_IN_INVENTORY: {
 		GameMessages::HandleMoveItemInInventory(inStream, entity);
 		break;
 	}
 
-	case GAME_MSG_REMOVE_ITEM_FROM_INVENTORY: {
+	case eGameMessageType::REMOVE_ITEM_FROM_INVENTORY: {
 		GameMessages::HandleRemoveItemFromInventory(inStream, entity, sysAddr);
 		break;
 	}
 
-	case GAME_MSG_EQUIP_ITEM:
+	case eGameMessageType::EQUIP_ITEM:
 		GameMessages::HandleEquipItem(inStream, entity);
 		break;
 
-	case GAME_MSG_UN_EQUIP_ITEM:
+	case eGameMessageType::UN_EQUIP_ITEM:
 		GameMessages::HandleUnequipItem(inStream, entity);
 		break;
 
-	case GAME_MSG_RESPOND_TO_MISSION: {
+	case eGameMessageType::RESPOND_TO_MISSION: {
 		GameMessages::HandleRespondToMission(inStream, entity);
 		break;
 	}
 
-	case GAME_MSG_REQUEST_USE: {
+	case eGameMessageType::REQUEST_USE: {
 		GameMessages::HandleRequestUse(inStream, entity, sysAddr);
 		break;
 	}
 
-	case GAME_MSG_SET_FLAG: {
+	case eGameMessageType::SET_FLAG: {
 		GameMessages::HandleSetFlag(inStream, entity);
 		break;
 	}
 
-	case GAME_MSG_HAS_BEEN_COLLECTED: {
+	case eGameMessageType::HAS_BEEN_COLLECTED: {
 		GameMessages::HandleHasBeenCollected(inStream, entity);
 		break;
 	}
 
-	case GAME_MSG_PLAYER_LOADED: {
+	case eGameMessageType::PLAYER_LOADED: {
 		GameMessages::SendRestoreToPostLoadStats(entity, sysAddr);
 		entity->SetPlayerReadyForUpdates();
 
@@ -174,73 +175,73 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const System
 		break;
 	}
 
-	case GAME_MSG_REQUEST_LINKED_MISSION: {
+	case eGameMessageType::REQUEST_LINKED_MISSION: {
 		GameMessages::HandleRequestLinkedMission(inStream, entity);
 		break;
 	}
 
-	case GAME_MSG_MISSION_DIALOGUE_OK: {
+	case eGameMessageType::MISSION_DIALOGUE_OK: {
 		GameMessages::HandleMissionDialogOK(inStream, entity);
 		break;
 	}
 
-	case GAME_MSG_MISSION_DIALOGUE_CANCELLED: {
+	case eGameMessageType::MISSION_DIALOGUE_CANCELLED: {
 		//This message is pointless for our implementation, as the client just carries on after
 		//rejecting a mission offer. We dont need to do anything. This is just here to remove a warning in our logs :)
 		break;
 	}
 
-	case GAME_MSG_REQUEST_PLATFORM_RESYNC: {
+	case eGameMessageType::REQUEST_PLATFORM_RESYNC: {
 		GameMessages::HandleRequestPlatformResync(inStream, entity, sysAddr);
 		break;
 	}
 
-	case GAME_MSG_FIRE_EVENT_SERVER_SIDE: {
+	case eGameMessageType::FIRE_EVENT_SERVER_SIDE: {
 		GameMessages::HandleFireEventServerSide(inStream, entity, sysAddr);
 		break;
 	}
 
-	case GAME_MSG_SEND_ACTIVITY_SUMMARY_LEADERBOARD_DATA: {
+	case eGameMessageType::SEND_ACTIVITY_SUMMARY_LEADERBOARD_DATA: {
 		GameMessages::HandleActivitySummaryLeaderboardData(inStream, entity, sysAddr);
 		break;
 	}
 
-	case GAME_MSG_REQUEST_ACTIVITY_SUMMARY_LEADERBOARD_DATA: {
+	case eGameMessageType::REQUEST_ACTIVITY_SUMMARY_LEADERBOARD_DATA: {
 		GameMessages::HandleRequestActivitySummaryLeaderboardData(inStream, entity, sysAddr);
 		break;
 	}
 
-	case GAME_MSG_ACTIVITY_STATE_CHANGE_REQUEST: {
+	case eGameMessageType::ACTIVITY_STATE_CHANGE_REQUEST: {
 		GameMessages::HandleActivityStateChangeRequest(inStream, entity);
 		break;
 	}
 
-	case GAME_MSG_PARSE_CHAT_MESSAGE: {
+	case eGameMessageType::PARSE_CHAT_MESSAGE: {
 		GameMessages::HandleParseChatMessage(inStream, entity, sysAddr);
 		break;
 	}
 
-	case GAME_MSG_NOTIFY_SERVER_LEVEL_PROCESSING_COMPLETE: {
+	case eGameMessageType::NOTIFY_SERVER_LEVEL_PROCESSING_COMPLETE: {
 		GameMessages::HandleNotifyServerLevelProcessingComplete(inStream, entity);
 		break;
 	}
 
-	case GAME_MSG_PICKUP_CURRENCY: {
+	case eGameMessageType::PICKUP_CURRENCY: {
 		GameMessages::HandlePickupCurrency(inStream, entity);
 		break;
 	}
 
-	case GAME_MSG_PICKUP_ITEM: {
+	case eGameMessageType::PICKUP_ITEM: {
 		GameMessages::HandlePickupItem(inStream, entity);
 		break;
 	}
 
-	case GAME_MSG_RESURRECT: {
+	case eGameMessageType::RESURRECT: {
 		GameMessages::HandleResurrect(inStream, entity);
 		break;
 	}
 
-	case GAME_MSG_REQUEST_RESURRECT: {
+	case eGameMessageType::REQUEST_RESURRECT: {
 		GameMessages::SendResurrect(entity);
 		/*auto* dest = static_cast<DestroyableComponent*>(entity->GetComponent(eReplicaComponentType::DESTROYABLE));
 		if (dest) {
@@ -251,12 +252,12 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const System
 		}*/
 		break;
 	}
-	case GAME_MSG_HANDLE_HOT_PROPERTY_DATA: {
+	case eGameMessageType::HANDLE_HOT_PROPERTY_DATA: {
 		GameMessages::HandleGetHotPropertyData(inStream, entity, sysAddr);
 		break;
 	}
 
-	case GAME_MSG_REQUEST_SERVER_PROJECTILE_IMPACT:
+	case eGameMessageType::REQUEST_SERVER_PROJECTILE_IMPACT:
 	{
 		auto message = RequestServerProjectileImpact();
 
@@ -275,7 +276,7 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const System
 		break;
 	}
 
-	case GAME_MSG_START_SKILL: {
+	case eGameMessageType::START_SKILL: {
 		StartSkill startSkill = StartSkill();
 		startSkill.Deserialize(inStream); // inStream replaces &bitStream
 
@@ -313,7 +314,7 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const System
 		if (success) {
 			//Broadcast our startSkill:
 			RakNet::BitStream bitStreamLocal;
-			PacketUtils::WriteHeader(bitStreamLocal, CLIENT, MSG_CLIENT_GAME_MSG);
+			PacketUtils::WriteHeader(bitStreamLocal, eConnectionType::CLIENT, eClientMessageType::GAME_MSG);
 			bitStreamLocal.Write(entity->GetObjectID());
 
 			EchoStartSkill echoStartSkill;
@@ -333,11 +334,11 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const System
 		}
 	} break;
 
-	case GAME_MSG_SYNC_SKILL: {
+	case eGameMessageType::SYNC_SKILL: {
 		RakNet::BitStream bitStreamLocal;
-		PacketUtils::WriteHeader(bitStreamLocal, CLIENT, MSG_CLIENT_GAME_MSG);
+		PacketUtils::WriteHeader(bitStreamLocal, eConnectionType::CLIENT, eClientMessageType::GAME_MSG);
 		bitStreamLocal.Write(entity->GetObjectID());
-		//bitStreamLocal.Write((unsigned short)GAME_MSG_ECHO_SYNC_SKILL);
+		//bitStreamLocal.Write((unsigned short)eGameMessageType::ECHO_SYNC_SKILL);
 		//bitStreamLocal.Write(inStream);
 
 		SyncSkill sync = SyncSkill(inStream); // inStream replaced &bitStream
@@ -374,308 +375,311 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const System
 		Game::server->Send(&bitStreamLocal, sysAddr, true);
 	} break;
 
-	case GAME_MSG_REQUEST_SMASH_PLAYER:
+	case eGameMessageType::REQUEST_SMASH_PLAYER:
 		entity->Smash(entity->GetObjectID());
 		break;
 
-	case GAME_MSG_MOVE_ITEM_BETWEEN_INVENTORY_TYPES:
+	case eGameMessageType::MOVE_ITEM_BETWEEN_INVENTORY_TYPES:
 		GameMessages::HandleMoveItemBetweenInventoryTypes(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_MODULAR_BUILD_FINISH:
+	case eGameMessageType::MODULAR_BUILD_FINISH:
 		GameMessages::HandleModularBuildFinish(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_PUSH_EQUIPPED_ITEMS_STATE:
+	case eGameMessageType::PUSH_EQUIPPED_ITEMS_STATE:
 		GameMessages::HandlePushEquippedItemsState(inStream, entity);
 		break;
 
-	case GAME_MSG_POP_EQUIPPED_ITEMS_STATE:
+	case eGameMessageType::POP_EQUIPPED_ITEMS_STATE:
 		GameMessages::HandlePopEquippedItemsState(inStream, entity);
 		break;
 
-	case GAME_MSG_BUY_FROM_VENDOR:
+	case eGameMessageType::BUY_FROM_VENDOR:
 		GameMessages::HandleBuyFromVendor(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_SELL_TO_VENDOR:
+	case eGameMessageType::SELL_TO_VENDOR:
 		GameMessages::HandleSellToVendor(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_BUYBACK_FROM_VENDOR:
+	case eGameMessageType::BUYBACK_FROM_VENDOR:
 		GameMessages::HandleBuybackFromVendor(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_MODULAR_BUILD_MOVE_AND_EQUIP:
+	case eGameMessageType::MODULAR_BUILD_MOVE_AND_EQUIP:
 		GameMessages::HandleModularBuildMoveAndEquip(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_DONE_ARRANGING_WITH_ITEM:
+	case eGameMessageType::DONE_ARRANGING_WITH_ITEM:
 		GameMessages::HandleDoneArrangingWithItem(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_MODULAR_BUILD_CONVERT_MODEL:
+	case eGameMessageType::MODULAR_BUILD_CONVERT_MODEL:
 		GameMessages::HandleModularBuildConvertModel(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_BUILD_MODE_SET:
+	case eGameMessageType::BUILD_MODE_SET:
 		GameMessages::HandleBuildModeSet(inStream, entity);
 		break;
 
-	case GAME_MSG_REBUILD_CANCEL:
+	case eGameMessageType::REBUILD_CANCEL:
 		GameMessages::HandleRebuildCancel(inStream, entity);
 		break;
 
-	case GAME_MSG_MATCH_REQUEST:
+	case eGameMessageType::MATCH_REQUEST:
 		GameMessages::HandleMatchRequest(inStream, entity);
 		break;
 
-	case GAME_MSG_USE_NON_EQUIPMENT_ITEM:
+	case eGameMessageType::USE_NON_EQUIPMENT_ITEM:
 		GameMessages::HandleUseNonEquipmentItem(inStream, entity);
 		break;
 
-	case GAME_MSG_CLIENT_ITEM_CONSUMED:
+	case eGameMessageType::CLIENT_ITEM_CONSUMED:
 		GameMessages::HandleClientItemConsumed(inStream, entity);
 		break;
 
-	case GAME_MSG_SET_CONSUMABLE_ITEM:
+	case eGameMessageType::SET_CONSUMABLE_ITEM:
 		GameMessages::HandleSetConsumableItem(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_VERIFY_ACK:
+	case eGameMessageType::VERIFY_ACK:
 		GameMessages::HandleVerifyAck(inStream, entity, sysAddr);
 		break;
 
 		// Trading
-	case GAME_MSG_CLIENT_TRADE_REQUEST:
+	case eGameMessageType::CLIENT_TRADE_REQUEST:
 		GameMessages::HandleClientTradeRequest(inStream, entity, sysAddr);
 		break;
-	case GAME_MSG_CLIENT_TRADE_CANCEL:
+	case eGameMessageType::CLIENT_TRADE_CANCEL:
 		GameMessages::HandleClientTradeCancel(inStream, entity, sysAddr);
 		break;
-	case GAME_MSG_CLIENT_TRADE_ACCEPT:
+	case eGameMessageType::CLIENT_TRADE_ACCEPT:
 		GameMessages::HandleClientTradeAccept(inStream, entity, sysAddr);
 		break;
-	case GAME_MSG_CLIENT_TRADE_UPDATE:
+	case eGameMessageType::CLIENT_TRADE_UPDATE:
 		GameMessages::HandleClientTradeUpdate(inStream, entity, sysAddr);
 		break;
 
 		// Pets
-	case GAME_MSG_PET_TAMING_TRY_BUILD:
+	case eGameMessageType::PET_TAMING_TRY_BUILD:
 		GameMessages::HandlePetTamingTryBuild(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_NOTIFY_TAMING_BUILD_SUCCESS:
+	case eGameMessageType::NOTIFY_TAMING_BUILD_SUCCESS:
 		GameMessages::HandleNotifyTamingBuildSuccess(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_REQUEST_SET_PET_NAME:
+	case eGameMessageType::REQUEST_SET_PET_NAME:
 		GameMessages::HandleRequestSetPetName(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_START_SERVER_PET_MINIGAME_TIMER:
+	case eGameMessageType::START_SERVER_PET_MINIGAME_TIMER:
 		GameMessages::HandleStartServerPetMinigameTimer(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_CLIENT_EXIT_TAMING_MINIGAME:
+	case eGameMessageType::CLIENT_EXIT_TAMING_MINIGAME:
 		GameMessages::HandleClientExitTamingMinigame(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_COMMAND_PET:
+	case eGameMessageType::COMMAND_PET:
 		GameMessages::HandleCommandPet(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_DESPAWN_PET:
+	case eGameMessageType::DESPAWN_PET:
 		GameMessages::HandleDespawnPet(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_MESSAGE_BOX_RESPOND:
+	case eGameMessageType::MESSAGE_BOX_RESPOND:
 		GameMessages::HandleMessageBoxResponse(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_CHOICE_BOX_RESPOND:
+	case eGameMessageType::CHOICE_BOX_RESPOND:
 		GameMessages::HandleChoiceBoxRespond(inStream, entity, sysAddr);
 		break;
 
 		// Property
-	case GAME_MSG_QUERY_PROPERTY_DATA:
+	case eGameMessageType::QUERY_PROPERTY_DATA:
 		GameMessages::HandleQueryPropertyData(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_START_BUILDING_WITH_ITEM:
+	case eGameMessageType::START_BUILDING_WITH_ITEM:
 		GameMessages::HandleStartBuildingWithItem(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_SET_BUILD_MODE:
+	case eGameMessageType::SET_BUILD_MODE:
 		GameMessages::HandleSetBuildMode(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_PROPERTY_EDITOR_BEGIN:
+	case eGameMessageType::PROPERTY_EDITOR_BEGIN:
 		GameMessages::HandlePropertyEditorBegin(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_PROPERTY_EDITOR_END:
+	case eGameMessageType::PROPERTY_EDITOR_END:
 		GameMessages::HandlePropertyEditorEnd(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_PROPERTY_CONTENTS_FROM_CLIENT:
+	case eGameMessageType::PROPERTY_CONTENTS_FROM_CLIENT:
 		GameMessages::HandlePropertyContentsFromClient(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_ZONE_PROPERTY_MODEL_EQUIPPED:
+	case eGameMessageType::ZONE_PROPERTY_MODEL_EQUIPPED:
 		GameMessages::HandlePropertyModelEquipped(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_PLACE_PROPERTY_MODEL:
+	case eGameMessageType::PLACE_PROPERTY_MODEL:
 		GameMessages::HandlePlacePropertyModel(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_UPDATE_MODEL_FROM_CLIENT:
+	case eGameMessageType::UPDATE_MODEL_FROM_CLIENT:
 		GameMessages::HandleUpdatePropertyModel(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_DELETE_MODEL_FROM_CLIENT:
+	case eGameMessageType::DELETE_MODEL_FROM_CLIENT:
 		GameMessages::HandleDeletePropertyModel(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_BBB_LOAD_ITEM_REQUEST:
+	case eGameMessageType::BBB_LOAD_ITEM_REQUEST:
 		GameMessages::HandleBBBLoadItemRequest(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_BBB_SAVE_REQUEST:
+	case eGameMessageType::BBB_SAVE_REQUEST:
 		GameMessages::HandleBBBSaveRequest(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_CONTROL_BEHAVIOR:
+	case eGameMessageType::CONTROL_BEHAVIOR:
 		GameMessages::HandleControlBehaviors(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_PROPERTY_ENTRANCE_SYNC:
+	case eGameMessageType::PROPERTY_ENTRANCE_SYNC:
 		GameMessages::HandlePropertyEntranceSync(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_ENTER_PROPERTY1:
+	case eGameMessageType::ENTER_PROPERTY1:
 		GameMessages::HandleEnterProperty(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_ZONE_PROPERTY_MODEL_ROTATED:
+	case eGameMessageType::ZONE_PROPERTY_MODEL_ROTATED:
 		EntityManager::Instance()->GetZoneControlEntity()->OnZonePropertyModelRotated(usr->GetLastUsedChar()->GetEntity());
 		break;
 
-	case GAME_MSG_UPDATE_PROPERTY_OR_MODEL_FOR_FILTER_CHECK:
+	case eGameMessageType::UPDATE_PROPERTY_OR_MODEL_FOR_FILTER_CHECK:
 		GameMessages::HandleUpdatePropertyOrModelForFilterCheck(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_SET_PROPERTY_ACCESS:
+	case eGameMessageType::SET_PROPERTY_ACCESS:
 		GameMessages::HandleSetPropertyAccess(inStream, entity, sysAddr);
 		break;
 
 		// Racing
-	case GAME_MSG_MODULE_ASSEMBLY_QUERY_DATA:
+	case eGameMessageType::MODULE_ASSEMBLY_QUERY_DATA:
 		GameMessages::HandleModuleAssemblyQueryData(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_ACKNOWLEDGE_POSSESSION:
+	case eGameMessageType::ACKNOWLEDGE_POSSESSION:
 		GameMessages::HandleAcknowledgePossession(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_VEHICLE_SET_WHEEL_LOCK_STATE:
+	case eGameMessageType::VEHICLE_SET_WHEEL_LOCK_STATE:
 		GameMessages::HandleVehicleSetWheelLockState(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_MODULAR_ASSEMBLY_NIF_COMPLETED:
+	case eGameMessageType::MODULAR_ASSEMBLY_NIF_COMPLETED:
 		GameMessages::HandleModularAssemblyNIFCompleted(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_RACING_CLIENT_READY:
+	case eGameMessageType::RACING_CLIENT_READY:
 		GameMessages::HandleRacingClientReady(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_REQUEST_DIE:
+	case eGameMessageType::REQUEST_DIE:
 		GameMessages::HandleRequestDie(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_VEHICLE_NOTIFY_SERVER_ADD_PASSIVE_BOOST_ACTION:
+	case eGameMessageType::VEHICLE_NOTIFY_SERVER_ADD_PASSIVE_BOOST_ACTION:
 		GameMessages::HandleVehicleNotifyServerAddPassiveBoostAction(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_VEHICLE_NOTIFY_SERVER_REMOVE_PASSIVE_BOOST_ACTION:
+	case eGameMessageType::VEHICLE_NOTIFY_SERVER_REMOVE_PASSIVE_BOOST_ACTION:
 		GameMessages::HandleVehicleNotifyServerRemovePassiveBoostAction(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_RACING_PLAYER_INFO_RESET_FINISHED:
+	case eGameMessageType::RACING_PLAYER_INFO_RESET_FINISHED:
 		GameMessages::HandleRacingPlayerInfoResetFinished(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_VEHICLE_NOTIFY_HIT_IMAGINATION_SERVER:
+	case eGameMessageType::VEHICLE_NOTIFY_HIT_IMAGINATION_SERVER:
 		GameMessages::HandleVehicleNotifyHitImaginationServer(inStream, entity, sysAddr);
 		break;
-	case GAME_MSG_UPDATE_PROPERTY_PERFORMANCE_COST:
+	case eGameMessageType::UPDATE_PROPERTY_PERFORMANCE_COST:
 		GameMessages::HandleUpdatePropertyPerformanceCost(inStream, entity, sysAddr);
 		break;
 		// SG
-	case GAME_MSG_UPDATE_SHOOTING_GALLERY_ROTATION:
+	case eGameMessageType::UPDATE_SHOOTING_GALLERY_ROTATION:
 		GameMessages::HandleUpdateShootingGalleryRotation(inStream, entity, sysAddr);
 		break;
 
 		// NT
-	case GAME_MSG_REQUEST_MOVE_ITEM_BETWEEN_INVENTORY_TYPES:
+	case eGameMessageType::REQUEST_MOVE_ITEM_BETWEEN_INVENTORY_TYPES:
 		GameMessages::HandleRequestMoveItemBetweenInventoryTypes(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_TOGGLE_GHOST_REFERENCE_OVERRIDE:
+	case eGameMessageType::TOGGLE_GHOST_REFERENCE_OVERRIDE:
 		GameMessages::HandleToggleGhostReferenceOverride(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_SET_GHOST_REFERENCE_POSITION:
+	case eGameMessageType::SET_GHOST_REFERENCE_POSITION:
 		GameMessages::HandleSetGhostReferencePosition(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_READY_FOR_UPDATES:
+	case eGameMessageType::READY_FOR_UPDATES:
 		//We don't really care about this message, as it's simply here to inform us that the client is done loading an object.
 		//In the event we _do_ send an update to an object that hasn't finished loading, the client will handle it anyway.
 		break;
 
-	case GAME_MSG_REPORT_BUG:
+	case eGameMessageType::REPORT_BUG:
 		GameMessages::HandleReportBug(inStream, entity);
 		break;
 
-	case GAME_MSG_CLIENT_RAIL_MOVEMENT_READY:
+	case eGameMessageType::CLIENT_RAIL_MOVEMENT_READY:
 		GameMessages::HandleClientRailMovementReady(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_CANCEL_RAIL_MOVEMENT:
+	case eGameMessageType::CANCEL_RAIL_MOVEMENT:
 		GameMessages::HandleCancelRailMovement(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_PLAYER_RAIL_ARRIVED_NOTIFICATION:
+	case eGameMessageType::PLAYER_RAIL_ARRIVED_NOTIFICATION:
 		GameMessages::HandlePlayerRailArrivedNotification(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_CINEMATIC_UPDATE:
+	case eGameMessageType::CINEMATIC_UPDATE:
 		GameMessages::HandleCinematicUpdate(inStream, entity, sysAddr);
 		break;
 
-	case GAME_MSG_MODIFY_PLAYER_ZONE_STATISTIC:
+	case eGameMessageType::MODIFY_PLAYER_ZONE_STATISTIC:
 		GameMessages::HandleModifyPlayerZoneStatistic(inStream, entity);
 		break;
 
-	case GAME_MSG_UPDATE_PLAYER_STATISTIC:
+	case eGameMessageType::UPDATE_PLAYER_STATISTIC:
 		GameMessages::HandleUpdatePlayerStatistic(inStream, entity);
 		break;
 
-	case GAME_MSG_DISMOUNT_COMPLETE:
+	case eGameMessageType::DISMOUNT_COMPLETE:
 		GameMessages::HandleDismountComplete(inStream, entity, sysAddr);
 		break;
-	case GAME_MSG_DEACTIVATE_BUBBLE_BUFF:
+	case eGameMessageType::DEACTIVATE_BUBBLE_BUFF:
 		GameMessages::HandleDeactivateBubbleBuff(inStream, entity);
 		break;
-	case GAME_MSG_ACTIVATE_BUBBLE_BUFF:
+	case eGameMessageType::ACTIVATE_BUBBLE_BUFF:
 		GameMessages::HandleActivateBubbleBuff(inStream, entity);
 		break;
-	case GAME_MSG_ZONE_SUMMARY_DISMISSED:
+	case eGameMessageType::ZONE_SUMMARY_DISMISSED:
 		GameMessages::HandleZoneSummaryDismissed(inStream, entity);
 		break;
+	case eGameMessageType::REQUEST_ACTIVITY_EXIT:
+		GameMessages::HandleRequestActivityExit(inStream, entity);
+		break;
 	default:
 		// Game::logger->Log("GameMessageHandler", "Unknown game message ID: %i", messageID);
 		break;

dGame/dGameMessages/GameMessageHandler.h

@@ -7,7 +7,6 @@
 #define GAMEMESSAGEHANDLER_H
 
 #include "RakNetTypes.h"
-#include "dMessageIdentifiers.h"
 #include "dCommonVars.h"
 #include <iostream>
 #include <sstream>
@@ -21,8 +20,10 @@
 #include "GameMessages.h"
 #include "../dDatabase/CDClientDatabase.h"
 
+enum class eGameMessageType : uint16_t;
+
 namespace GameMessageHandler {
-	void HandleMessage(RakNet::BitStream* inStream, const SystemAddress& sysAddr, LWOOBJID objectID, GAME_MSG messageID);
+	void HandleMessage(RakNet::BitStream* inStream, const SystemAddress& sysAddr, LWOOBJID objectID, eGameMessageType messageID);
 };
 
 #endif // GAMEMESSAGEHANDLER_H

dGame/dGameMessages/GameMessages.h

@@ -12,7 +12,7 @@
 #include "eLootSourceType.h"
 #include "Brick.h"
 
-class AMFValue;
+class AMFBaseValue;
 class Entity;
 class Item;
 class NiQuaternion;
@@ -88,8 +88,8 @@ namespace GameMessages {
 	void NotifyLevelRewards(LWOOBJID objectID, const SystemAddress& sysAddr, int level, bool sending_rewards);
 
 	void SendModifyLEGOScore(Entity* entity, const SystemAddress& sysAddr, int64_t score, eLootSourceType sourceType);
-	void SendUIMessageServerToSingleClient(Entity* entity, const SystemAddress& sysAddr, const std::string& message, AMFValue* args);
+	void SendUIMessageServerToSingleClient(Entity* entity, const SystemAddress& sysAddr, const std::string& message, AMFBaseValue& args);
-	void SendUIMessageServerToAllClients(const std::string& message, AMFValue* args);
+	void SendUIMessageServerToAllClients(const std::string& message, AMFBaseValue& args);
 
 	void SendPlayEmbeddedEffectOnAllClientsNearObject(Entity* entity, std::u16string effectName, const LWOOBJID& fromObjectID, float radius);
 	void SendPlayFXEffect(Entity* entity, int32_t effectID, const std::u16string& effectType, const std::string& name, LWOOBJID secondary, float priority = 1, float scale = 1, bool serialize = true);
@@ -648,6 +648,7 @@ namespace GameMessages {
 	void SendDeactivateBubbleBuffFromServer(LWOOBJID objectId, const SystemAddress& sysAddr);
 
 	void HandleZoneSummaryDismissed(RakNet::BitStream* inStream, Entity* entity);
+	void HandleRequestActivityExit(RakNet::BitStream* inStream, Entity* entity);
 };
 
 #endif // GAMEMESSAGES_H

dGame/dGameMessages/RequestServerProjectileImpact.h

@@ -2,13 +2,11 @@
 #define __REQUESTSERVERPROJECTILEIMPACT__H__
 
 #include "dCommonVars.h"
-#include "dMessageIdentifiers.h"
+#include "eGameMessageType.h"
 
 /*  Notifying the server that a locally owned projectile impacted. Sent to the caster of the projectile
 		should always be the local char. */
 class RequestServerProjectileImpact {
-	static const GAME_MSG MsgID = GAME_MSG_REQUEST_SERVER_PROJECTILE_IMPACT;
-
 public:
 	RequestServerProjectileImpact() {
 		i64LocalID = LWOOBJID_EMPTY;
@@ -29,7 +27,7 @@ public:
 	}
 
 	void Serialize(RakNet::BitStream* stream) {
-		stream->Write(MsgID);
+		stream->Write(eGameMessageType::REQUEST_SERVER_PROJECTILE_IMPACT);
 
 		stream->Write(i64LocalID != LWOOBJID_EMPTY);
 		if (i64LocalID != LWOOBJID_EMPTY) stream->Write(i64LocalID);

dGame/dGameMessages/StartSkill.h

@@ -2,16 +2,14 @@
 #define __STARTSKILL__H__
 
 #include "dCommonVars.h"
-#include "dMessageIdentifiers.h"
 #include "NiPoint3.h"
 #include "NiQuaternion.h"
+#include "eGameMessageType.h"
 
 /**
  * Same as sync skill but with different network options. An echo down to other clients that need to play the skill.
  */
 class StartSkill {
-	static const GAME_MSG MsgID = GAME_MSG_START_SKILL;
-
 public:
 	StartSkill() {
 		bUsedMouse = false;
@@ -46,7 +44,7 @@ public:
 	}
 
 	void Serialize(RakNet::BitStream* stream) {
-		stream->Write(MsgID);
+		stream->Write(eGameMessageType::START_SKILL);
 
 		stream->Write(bUsedMouse);
 

dGame/dGameMessages/SyncSkill.h

@@ -5,11 +5,10 @@
 #include <string>
 
 #include "BitStream.h"
+#include "eGameMessageType.h"
 
 /*  Message to synchronize a skill cast */
 class SyncSkill {
-	static const GAME_MSG MsgID = GAME_MSG_SYNC_SKILL;
-
 public:
 	SyncSkill() {
 		bDone = false;
@@ -30,7 +29,7 @@ public:
 	}
 
 	void Serialize(RakNet::BitStream* stream) {
-		stream->Write(MsgID);
+		stream->Write(eGameMessageType::SYNC_SKILL);
 
 		stream->Write(bDone);
 		uint32_t sBitStreamLength = sBitStream.length();

dGame/dPropertyBehaviors/ControlBehaviorMessages/Action.cpp

@@ -12,19 +12,19 @@ Action::Action(AMFArrayValue* arguments) {
 	valueParameterName = "";
 	valueParameterString = "";
 	valueParameterDouble = 0.0;
-	for (auto& typeValueMap : arguments->GetAssociativeMap()) {
+	for (auto& typeValueMap : arguments->GetAssociative()) {
 		if (typeValueMap.first == "Type") {
-			if (typeValueMap.second->GetValueType() != AMFValueType::AMFString) continue;
+			if (typeValueMap.second->GetValueType() != eAmf::String) continue;
-			type = static_cast<AMFStringValue*>(typeValueMap.second)->GetStringValue();
+			type = static_cast<AMFStringValue*>(typeValueMap.second)->GetValue();
 		} else {
 			valueParameterName = typeValueMap.first;
 			// Message is the only known string parameter
 			if (valueParameterName == "Message") {
-				if (typeValueMap.second->GetValueType() != AMFValueType::AMFString) continue;
+				if (typeValueMap.second->GetValueType() != eAmf::String) continue;
-				valueParameterString = static_cast<AMFStringValue*>(typeValueMap.second)->GetStringValue();
+				valueParameterString = static_cast<AMFStringValue*>(typeValueMap.second)->GetValue();
 			} else {
-				if (typeValueMap.second->GetValueType() != AMFValueType::AMFDouble) continue;
+				if (typeValueMap.second->GetValueType() != eAmf::Double) continue;
-				valueParameterDouble = static_cast<AMFDoubleValue*>(typeValueMap.second)->GetDoubleValue();
+				valueParameterDouble = static_cast<AMFDoubleValue*>(typeValueMap.second)->GetValue();
 			}
 		}
 	}

dGame/dPropertyBehaviors/ControlBehaviorMessages/ActionContext.cpp

@@ -2,7 +2,7 @@
 
 #include <stdexcept>
 
-#include "AMFFormat.h"
+#include "Amf3.h"
 
 ActionContext::ActionContext() {
 	stripId = 0;
@@ -17,15 +17,15 @@ ActionContext::ActionContext(AMFArrayValue* arguments, std::string customStateKe
 }
 
 BehaviorState ActionContext::GetBehaviorStateFromArgument(AMFArrayValue* arguments, const std::string& key) {
-	auto* stateIDValue = arguments->FindValue<AMFDoubleValue>(key);
+	auto* stateIDValue = arguments->Get<double>(key);
 	if (!stateIDValue) throw std::invalid_argument("Unable to find behavior state from argument \"" + key + "\"");
 
-	return static_cast<BehaviorState>(stateIDValue->GetDoubleValue());
+	return static_cast<BehaviorState>(stateIDValue->GetValue());
 }
 
 StripId ActionContext::GetStripIdFromArgument(AMFArrayValue* arguments, const std::string& key) {
-	auto* stripIdValue = arguments->FindValue<AMFDoubleValue>(key);
+	auto* stripIdValue = arguments->Get<double>(key);
 	if (!stripIdValue) throw std::invalid_argument("Unable to find strip ID from argument \"" + key + "\"");
 
-	return static_cast<StripId>(stripIdValue->GetDoubleValue());
+	return static_cast<StripId>(stripIdValue->GetValue());
 }

dGame/dPropertyBehaviors/ControlBehaviorMessages/AddActionMessage.cpp

@@ -4,7 +4,7 @@ AddActionMessage::AddActionMessage(AMFArrayValue* arguments) : BehaviorMessageBa
 	actionContext = ActionContext(arguments);
 	actionIndex = GetActionIndexFromArgument(arguments);
 
-	auto* actionValue = arguments->FindValue<AMFArrayValue>("action");
+	auto* actionValue = arguments->GetArray("action");
 	if (!actionValue) return;
 
 	action = Action(actionValue);

dGame/dPropertyBehaviors/ControlBehaviorMessages/AddMessage.cpp

@@ -2,10 +2,10 @@
 
 AddMessage::AddMessage(AMFArrayValue* arguments) : BehaviorMessageBase(arguments) {
 	behaviorIndex = 0;
-	auto* behaviorIndexValue = arguments->FindValue<AMFDoubleValue>("BehaviorIndex");
+	auto* behaviorIndexValue = arguments->Get<double>("BehaviorIndex");
 
 	if (!behaviorIndexValue) return;
 
-	behaviorIndex = static_cast<uint32_t>(behaviorIndexValue->GetDoubleValue());
+	behaviorIndex = static_cast<uint32_t>(behaviorIndexValue->GetValue());
 	Game::logger->LogDebug("AddMessage", "behaviorId %i index %i", behaviorId, behaviorIndex);
 }

dGame/dPropertyBehaviors/ControlBehaviorMessages/AddStripMessage.cpp

@@ -4,17 +4,16 @@
 
 AddStripMessage::AddStripMessage(AMFArrayValue* arguments) : BehaviorMessageBase(arguments) {
 	actionContext = ActionContext(arguments);
-
 	position = StripUiPosition(arguments);
 
-	auto* strip = arguments->FindValue<AMFArrayValue>("strip");
+	auto* strip = arguments->GetArray("strip");
 	if (!strip) return;
 
-	auto* actions = strip->FindValue<AMFArrayValue>("actions");
+	auto* actions = strip->GetArray("actions");
 	if (!actions) return;
 
-	for (uint32_t actionNumber = 0; actionNumber < actions->GetDenseValueSize(); actionNumber++) {
+	for (uint32_t actionNumber = 0; actionNumber < actions->GetDense().size(); actionNumber++) {
-		auto* actionValue = actions->GetValueAt<AMFArrayValue>(actionNumber);
+		auto* actionValue = actions->GetArray(actionNumber);
 		if (!actionValue) continue;
 
 		actionsToAdd.push_back(Action(actionValue));

dGame/dPropertyBehaviors/ControlBehaviorMessages/BehaviorMessageBase.cpp

@@ -1,6 +1,6 @@
 #include "BehaviorMessageBase.h"
 
-#include "AMFFormat.h"
+#include "Amf3.h"
 #include "BehaviorStates.h"
 #include "dCommonVars.h"
 
@@ -11,12 +11,12 @@ BehaviorMessageBase::BehaviorMessageBase(AMFArrayValue* arguments) {
 
 int32_t BehaviorMessageBase::GetBehaviorIdFromArgument(AMFArrayValue* arguments) {
 	const auto* key = "BehaviorID";
-	auto* behaviorIDValue = arguments->FindValue<AMFStringValue>(key);
+	auto* behaviorIDValue = arguments->Get<std::string>(key);
 	int32_t behaviorID = -1;
 
-	if (behaviorIDValue) {
+	if (behaviorIDValue && behaviorIDValue->GetValueType() == eAmf::String) {
-		behaviorID = std::stoul(behaviorIDValue->GetStringValue());
+		behaviorID = std::stoul(behaviorIDValue->GetValue());
-	} else if (!arguments->FindValue<AMFUndefinedValue>(key)) {
+	} else if (arguments->Get(key)->GetValueType() != eAmf::Undefined) {
 		throw std::invalid_argument("Unable to find behavior ID");
 	}
 
@@ -24,10 +24,10 @@ int32_t BehaviorMessageBase::GetBehaviorIdFromArgument(AMFArrayValue* arguments)
 }
 
 uint32_t BehaviorMessageBase::GetActionIndexFromArgument(AMFArrayValue* arguments, const std::string& keyName) {
-	auto* actionIndexAmf = arguments->FindValue<AMFDoubleValue>(keyName);
+	auto* actionIndexAmf = arguments->Get<double>(keyName);
 	if (!actionIndexAmf) {
 		throw std::invalid_argument("Unable to find actionIndex");
 	}
 
-	return static_cast<uint32_t>(actionIndexAmf->GetDoubleValue());
+	return static_cast<uint32_t>(actionIndexAmf->GetValue());
 }

dGame/dPropertyBehaviors/ControlBehaviorMessages/BehaviorMessageBase.h

@@ -4,7 +4,7 @@
 #include <stdexcept>
 #include <string>
 
-#include "AMFFormat.h"
+#include "Amf3.h"
 #include "dCommonVars.h"
 
 #include "Game.h"

dGame/dPropertyBehaviors/ControlBehaviorMessages/MoveToInventoryMessage.cpp

@@ -1,9 +1,9 @@
 #include "MoveToInventoryMessage.h"
 
 MoveToInventoryMessage::MoveToInventoryMessage(AMFArrayValue* arguments) : BehaviorMessageBase(arguments) {
-	auto* behaviorIndexValue = arguments->FindValue<AMFDoubleValue>("BehaviorIndex");
+	auto* behaviorIndexValue = arguments->Get<double>("BehaviorIndex");
 	if (!behaviorIndexValue) return;
 
-	behaviorIndex = static_cast<uint32_t>(behaviorIndexValue->GetDoubleValue());
+	behaviorIndex = static_cast<uint32_t>(behaviorIndexValue->GetValue());
 	Game::logger->LogDebug("MoveToInventoryMessage", "behaviorId %i behaviorIndex %i", behaviorId, behaviorIndex);
 }

dGame/dPropertyBehaviors/ControlBehaviorMessages/RenameMessage.cpp

@@ -1,9 +1,9 @@
 #include "RenameMessage.h"
 
 RenameMessage::RenameMessage(AMFArrayValue* arguments) : BehaviorMessageBase(arguments) {
-	auto* nameAmf = arguments->FindValue<AMFStringValue>("Name");
+	auto* nameAmf = arguments->Get<std::string>("Name");
 	if (!nameAmf) return;
 
-	name = nameAmf->GetStringValue();
+	name = nameAmf->GetValue();
 	Game::logger->LogDebug("RenameMessage", "behaviorId %i n %s", behaviorId, name.c_str());
 }

dGame/dPropertyBehaviors/ControlBehaviorMessages/StripUiPosition.cpp

@@ -1,6 +1,6 @@
 #include "StripUiPosition.h"
 
-#include "AMFFormat.h"
+#include "Amf3.h"
 
 StripUiPosition::StripUiPosition() {
 	xPosition = 0.0;
@@ -10,13 +10,13 @@ StripUiPosition::StripUiPosition() {
 StripUiPosition::StripUiPosition(AMFArrayValue* arguments, std::string uiKeyName) {
 	xPosition = 0.0;
 	yPosition = 0.0;
-	auto* uiArray = arguments->FindValue<AMFArrayValue>(uiKeyName);
+	auto* uiArray = arguments->GetArray(uiKeyName);
 	if (!uiArray) return;
 
-	auto* xPositionValue = uiArray->FindValue<AMFDoubleValue>("x");
+	auto* xPositionValue = uiArray->Get<double>("x");
-	auto* yPositionValue = uiArray->FindValue<AMFDoubleValue>("y");
+	auto* yPositionValue = uiArray->Get<double>("y");
 	if (!xPositionValue || !yPositionValue) return;
 
-	yPosition = yPositionValue->GetDoubleValue();
+	yPosition = yPositionValue->GetValue();
-	xPosition = xPositionValue->GetDoubleValue();
+	xPosition = xPositionValue->GetValue();
 }

dGame/dPropertyBehaviors/ControlBehaviorMessages/UpdateActionMessage.cpp

@@ -5,7 +5,7 @@
 UpdateActionMessage::UpdateActionMessage(AMFArrayValue* arguments) : BehaviorMessageBase(arguments) {
 	actionContext = ActionContext(arguments);
 
-	auto* actionValue = arguments->FindValue<AMFArrayValue>("action");
+	auto* actionValue = arguments->GetArray("action");
 	if (!actionValue) return;
 
 	action = Action(actionValue);

dGame/dPropertyBehaviors/ControlBehaviors.cpp

@@ -1,6 +1,6 @@
 #include "ControlBehaviors.h"
 
-#include "AMFFormat.h"
+#include "Amf3.h"
 #include "Entity.h"
 #include "Game.h"
 #include "GameMessages.h"
@@ -43,11 +43,11 @@ void ControlBehaviors::RequestUpdatedID(int32_t behaviorID, ModelComponent* mode
 	// 		AMFArrayValue args;
 
 	// 		AMFStringValue* behaviorIDString = new AMFStringValue();
-	// 		behaviorIDString->SetStringValue(std::to_string(persistentId));
+	// 		behaviorIDString->SetValue(std::to_string(persistentId));
 	// 		args.InsertValue("behaviorID", behaviorIDString);
 
 	// 		AMFStringValue* objectIDAsString = new AMFStringValue();
-	// 		objectIDAsString->SetStringValue(std::to_string(modelComponent->GetParent()->GetObjectID()));
+	// 		objectIDAsString->SetValue(std::to_string(modelComponent->GetParent()->GetObjectID()));
 	// 		args.InsertValue("objectID", objectIDAsString);
 
 	// 		GameMessages::SendUIMessageServerToSingleClient(modelOwner, sysAddr, "UpdateBehaviorID", &args);
@@ -63,8 +63,6 @@ void ControlBehaviors::SendBehaviorListToClient(Entity* modelEntity, const Syste
 
 	AMFArrayValue behaviorsToSerialize;
 
-	AMFArrayValue* behaviors = new AMFArrayValue(); // Empty for now
-
 	/**
 	 * The behaviors AMFArray will have up to 5 elements in the dense portion.
 	 * Each element in the dense portion will be made up of another AMFArray
@@ -75,20 +73,17 @@ void ControlBehaviors::SendBehaviorListToClient(Entity* modelEntity, const Syste
 	 * "name": The name of the behavior formatted as an AMFString
 	 */
 
-	behaviorsToSerialize.InsertValue("behaviors", behaviors);
+	behaviorsToSerialize.Insert("behaviors");
+	behaviorsToSerialize.Insert("objectID", std::to_string(modelComponent->GetParent()->GetObjectID()));
 
-	AMFStringValue* amfStringValueForObjectID = new AMFStringValue();
+	GameMessages::SendUIMessageServerToSingleClient(modelOwner, sysAddr, "UpdateBehaviorList", behaviorsToSerialize);
-	amfStringValueForObjectID->SetStringValue(std::to_string(modelComponent->GetParent()->GetObjectID()));
-
-	behaviorsToSerialize.InsertValue("objectID", amfStringValueForObjectID);
-	GameMessages::SendUIMessageServerToSingleClient(modelOwner, sysAddr, "UpdateBehaviorList", &behaviorsToSerialize);
 }
 
 void ControlBehaviors::ModelTypeChanged(AMFArrayValue* arguments, ModelComponent* ModelComponent) {
-	auto* modelTypeAmf = arguments->FindValue<AMFDoubleValue>("ModelType");
+	auto* modelTypeAmf = arguments->Get<double>("ModelType");
 	if (!modelTypeAmf) return;
 
-	uint32_t modelType = static_cast<uint32_t>(modelTypeAmf->GetDoubleValue());
+	uint32_t modelType = static_cast<uint32_t>(modelTypeAmf->GetValue());
 
 	//TODO Update the model type here
 }
@@ -179,7 +174,7 @@ void ControlBehaviors::SendBehaviorBlocksToClient(ModelComponent* modelComponent
 	// 	AMFArrayValue* state = new AMFArrayValue();
 
 	// 	AMFDoubleValue* stateAsDouble = new AMFDoubleValue();
-	// 	stateAsDouble->SetDoubleValue(it->first);
+	// 	stateAsDouble->SetValue(it->first);
 	// 	state->InsertValue("id", stateAsDouble);
 
 	// 	AMFArrayValue* strips = new AMFArrayValue();
@@ -189,16 +184,16 @@ void ControlBehaviors::SendBehaviorBlocksToClient(ModelComponent* modelComponent
 	// 		AMFArrayValue* thisStrip = new AMFArrayValue();
 
 	// 		AMFDoubleValue* stripID = new AMFDoubleValue();
-	// 		stripID->SetDoubleValue(strip->first);
+	// 		stripID->SetValue(strip->first);
 	// 		thisStrip->InsertValue("id", stripID);
 
 	// 		AMFArrayValue* uiArray = new AMFArrayValue();
 	// 		AMFDoubleValue* yPosition = new AMFDoubleValue();
-	// 		yPosition->SetDoubleValue(strip->second->GetYPosition());
+	// 		yPosition->SetValue(strip->second->GetYPosition());
 	// 		uiArray->InsertValue("y", yPosition);
 
 	// 		AMFDoubleValue* xPosition = new AMFDoubleValue();
-	// 		xPosition->SetDoubleValue(strip->second->GetXPosition());
+	// 		xPosition->SetValue(strip->second->GetXPosition());
 	// 		uiArray->InsertValue("x", xPosition);
 
 	// 		thisStrip->InsertValue("ui", uiArray);
@@ -211,19 +206,19 @@ void ControlBehaviors::SendBehaviorBlocksToClient(ModelComponent* modelComponent
 	// 			AMFArrayValue* thisAction = new AMFArrayValue();
 
 	// 			AMFStringValue* actionName = new AMFStringValue();
-	// 			actionName->SetStringValue(behaviorAction->actionName);
+	// 			actionName->SetValue(behaviorAction->actionName);
 	// 			thisAction->InsertValue("Type", actionName);
 
 	// 			if (behaviorAction->parameterValueString != "")
 	// 			{
 	// 				AMFStringValue* valueAsString = new AMFStringValue();
-	// 				valueAsString->SetStringValue(behaviorAction->parameterValueString);
+	// 				valueAsString->SetValue(behaviorAction->parameterValueString);
 	// 				thisAction->InsertValue(behaviorAction->parameterName, valueAsString);
 	// 			}
 	// 			else if (behaviorAction->parameterValueDouble != 0.0)
 	// 			{
 	// 				AMFDoubleValue* valueAsDouble = new AMFDoubleValue();
-	// 				valueAsDouble->SetDoubleValue(behaviorAction->parameterValueDouble);
+	// 				valueAsDouble->SetValue(behaviorAction->parameterValueDouble);
 	// 				thisAction->InsertValue(behaviorAction->parameterName, valueAsDouble);
 	// 			}
 	// 			stripSerialize->PushBackValue(thisAction);
@@ -237,11 +232,11 @@ void ControlBehaviors::SendBehaviorBlocksToClient(ModelComponent* modelComponent
 	// behaviorInfo.InsertValue("states", stateSerialize);
 
 	// AMFStringValue* objectidAsString = new AMFStringValue();
-	// objectidAsString->SetStringValue(std::to_string(targetObjectID));
+	// objectidAsString->SetValue(std::to_string(targetObjectID));
 	// behaviorInfo.InsertValue("objectID", objectidAsString);
 
 	// AMFStringValue* behaviorIDAsString = new AMFStringValue();
-	// behaviorIDAsString->SetStringValue(std::to_string(behaviorID));
+	// behaviorIDAsString->SetValue(std::to_string(behaviorID));
 	// behaviorInfo.InsertValue("BehaviorID", behaviorIDAsString);
 
 	// GameMessages::SendUIMessageServerToSingleClient(modelOwner, sysAddr, "UpdateBehaviorBlocks", &behaviorInfo);
@@ -275,10 +270,9 @@ void ControlBehaviors::MoveToInventory(ModelComponent* modelComponent, const Sys
 	// This closes the UI menu should it be open while the player is removing behaviors
 	AMFArrayValue args;
 
-	AMFFalseValue* stateToPop = new AMFFalseValue();
+	args.Insert("visible", false);
-	args.InsertValue("visible", stateToPop);
 
-	GameMessages::SendUIMessageServerToSingleClient(modelOwner, modelOwner->GetParentUser()->GetSystemAddress(), "ToggleBehaviorEditor", &args);
+	GameMessages::SendUIMessageServerToSingleClient(modelOwner, modelOwner->GetParentUser()->GetSystemAddress(), "ToggleBehaviorEditor", args);
 
 	MoveToInventoryMessage moveToInventoryMessage(arguments);
 

dGame/dUtilities/Mail.cpp

@@ -13,7 +13,6 @@
 #include "Entity.h"
 #include "Character.h"
 #include "PacketUtils.h"
-#include "dMessageIdentifiers.h"
 #include "dLogger.h"
 #include "EntityManager.h"
 #include "InventoryComponent.h"
@@ -26,6 +25,7 @@
 #include "WorldConfig.h"
 #include "eMissionTaskType.h"
 #include "eReplicaComponentType.h"
+#include "eConnectionType.h"
 
 void Mail::SendMail(const Entity* recipient, const std::string& subject, const std::string& body, const LOT attachment,
 	const uint16_t attachmentCount) {
@@ -283,7 +283,7 @@ void Mail::HandleDataRequest(RakNet::BitStream* packet, const SystemAddress& sys
 	sql::ResultSet* res = stmt->executeQuery();
 
 	RakNet::BitStream bitStream;
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_MAIL);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::MAIL);
 	bitStream.Write(int(MailMessageID::MailData));
 	bitStream.Write(int(0));
 
@@ -406,7 +406,7 @@ void Mail::HandleNotificationRequest(const SystemAddress& sysAddr, uint32_t obje
 
 void Mail::SendSendResponse(const SystemAddress& sysAddr, MailSendResponse response) {
 	RakNet::BitStream bitStream;
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_MAIL);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::MAIL);
 	bitStream.Write(int(MailMessageID::SendResponse));
 	bitStream.Write(int(response));
 	Game::server->Send(&bitStream, sysAddr, false);
@@ -414,7 +414,7 @@ void Mail::SendSendResponse(const SystemAddress& sysAddr, MailSendResponse respo
 
 void Mail::SendNotification(const SystemAddress& sysAddr, int mailCount) {
 	RakNet::BitStream bitStream;
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_MAIL);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::MAIL);
 	uint64_t messageType = 2;
 	uint64_t s1 = 0;
 	uint64_t s2 = 0;
@@ -433,7 +433,7 @@ void Mail::SendNotification(const SystemAddress& sysAddr, int mailCount) {
 
 void Mail::SendAttachmentRemoveConfirm(const SystemAddress& sysAddr, uint64_t mailID) {
 	RakNet::BitStream bitStream;
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_MAIL);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::MAIL);
 	bitStream.Write(int(MailMessageID::AttachmentCollectConfirm));
 	bitStream.Write(int(0)); //unknown
 	bitStream.Write(mailID);
@@ -442,7 +442,7 @@ void Mail::SendAttachmentRemoveConfirm(const SystemAddress& sysAddr, uint64_t ma
 
 void Mail::SendDeleteConfirm(const SystemAddress& sysAddr, uint64_t mailID, LWOOBJID playerID) {
 	RakNet::BitStream bitStream;
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_MAIL);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::MAIL);
 	bitStream.Write(int(MailMessageID::MailDeleteConfirm));
 	bitStream.Write(int(0)); //unknown
 	bitStream.Write(mailID);
@@ -456,7 +456,7 @@ void Mail::SendDeleteConfirm(const SystemAddress& sysAddr, uint64_t mailID, LWOO
 
 void Mail::SendReadConfirm(const SystemAddress& sysAddr, uint64_t mailID) {
 	RakNet::BitStream bitStream;
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_MAIL);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::MAIL);
 	bitStream.Write(int(MailMessageID::MailReadConfirm));
 	bitStream.Write(int(0)); //unknown
 	bitStream.Write(mailID);

dGame/dUtilities/SlashCommandHandler.cpp

@@ -69,16 +69,19 @@
 #include "BinaryPathFinder.h"
 #include "dConfig.h"
 #include "eBubbleType.h"
-#include "AMFFormat.h"
+#include "Amf3.h"
 #include "MovingPlatformComponent.h"
-#include "dMessageIdentifiers.h"
 #include "eMissionState.h"
 #include "TriggerComponent.h"
 #include "eServerDisconnectIdentifiers.h"
 #include "eObjectBits.h"
 #include "eGameMasterLevel.h"
 #include "eReplicaComponentType.h"
+#include "RenderComponent.h"
 #include "eControlScheme.h"
+#include "eConnectionType.h"
+#include "eChatInternalMessageType.h"
+#include "eMasterMessageType.h"
 
 #include "CDObjectsTable.h"
 #include "CDZoneTableTable.h"
@@ -249,26 +252,20 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 		{
 			AMFArrayValue args;
 
-			auto* state = new AMFStringValue();
+			args.Insert("state", "Story");
-			state->SetStringValue("Story");
 
-			args.InsertValue("state", state);
+			GameMessages::SendUIMessageServerToSingleClient(entity, entity->GetSystemAddress(), "pushGameState", args);
-
-			GameMessages::SendUIMessageServerToSingleClient(entity, entity->GetSystemAddress(), "pushGameState", &args);
 		}
 
 		entity->AddCallbackTimer(0.5f, [customText, entity]() {
 			AMFArrayValue args;
 
-			auto* text = new AMFStringValue();
+			args.Insert("visible", true);
-			text->SetStringValue(customText);
+			args.Insert("text", customText);
-
-			args.InsertValue("visible", new AMFTrueValue());
-			args.InsertValue("text", text);
 
 			Game::logger->Log("SlashCommandHandler", "Sending %s", customText.c_str());
 
-			GameMessages::SendUIMessageServerToSingleClient(entity, entity->GetSystemAddress(), "ToggleStoryBox", &args);
+			GameMessages::SendUIMessageServerToSingleClient(entity, entity->GetSystemAddress(), "ToggleStoryBox", args);
 			});
 
 		return;
@@ -277,7 +274,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 	if (chatCommand == "leave-zone") {
 		const auto currentZone = dZoneManager::Instance()->GetZone()->GetZoneID().GetMapID();
 
-		auto newZone = 0;
+		LWOMAPID newZone = 0;
 		if (currentZone % 100 == 0) {
 			ChatPackets::SendSystemMessage(sysAddr, u"You are not in an instanced zone.");
 			return;
@@ -285,7 +282,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 			newZone = (currentZone / 100) * 100;
 		}
 		// If new zone would be inaccessible, then default to Avant Gardens.
-		if (!CheckIfAccessibleZone(newZone)) newZone = 1100;
+		if (!dZoneManager::Instance()->CheckIfAccessibleZone(newZone)) newZone = 1100;
 
 		ChatPackets::SendSystemMessage(sysAddr, u"Leaving zone...");
 
@@ -415,11 +412,11 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 
 	if ((chatCommand == "playanimation" || chatCommand == "playanim") && args.size() == 1 && entity->GetGMLevel() >= eGameMasterLevel::DEVELOPER) {
 		std::u16string anim = GeneralUtils::ASCIIToUTF16(args[0], args[0].size());
-		GameMessages::SendPlayAnimation(entity, anim);
+		RenderComponent::PlayAnimation(entity, anim);
 		auto* possessorComponent = entity->GetComponent<PossessorComponent>();
 		if (possessorComponent) {
 			auto* possessedComponent = EntityManager::Instance()->GetEntity(possessorComponent->GetPossessable());
-			if (possessedComponent) GameMessages::SendPlayAnimation(possessedComponent, anim);
+			if (possessedComponent) RenderComponent::PlayAnimation(possessedComponent, anim);
 		}
 	}
 
@@ -528,12 +525,11 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 	}
 
 	if (chatCommand == "setuistate" && args.size() == 1 && entity->GetGMLevel() >= eGameMasterLevel::DEVELOPER) {
-		AMFStringValue* value = new AMFStringValue();
+		AMFArrayValue uiState;
-		value->SetStringValue(args[0]);
 
-		AMFArrayValue args;
+		uiState.Insert("state", args.at(0));
-		args.InsertValue("state", value);
+
-		GameMessages::SendUIMessageServerToSingleClient(entity, sysAddr, "pushGameState", &args);
+		GameMessages::SendUIMessageServerToSingleClient(entity, sysAddr, "pushGameState", uiState);
 
 		ChatPackets::SendSystemMessage(sysAddr, u"Switched UI state.");
 
@@ -541,11 +537,11 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 	}
 
 	if (chatCommand == "toggle" && args.size() == 1 && entity->GetGMLevel() >= eGameMasterLevel::DEVELOPER) {
-		AMFTrueValue* value = new AMFTrueValue();
-
 		AMFArrayValue amfArgs;
-		amfArgs.InsertValue("visible", value);
+
-		GameMessages::SendUIMessageServerToSingleClient(entity, sysAddr, args[0], &amfArgs);
+		amfArgs.Insert("visible", true);
+
+		GameMessages::SendUIMessageServerToSingleClient(entity, sysAddr, args[0], amfArgs);
 
 		ChatPackets::SendSystemMessage(sysAddr, u"Toggled UI state.");
 
@@ -765,7 +761,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 	if (chatCommand == "shutdownuniverse" && entity->GetGMLevel() == eGameMasterLevel::OPERATOR) {
 		//Tell the master server that we're going to be shutting down whole "universe":
 		CBITSTREAM;
-		PacketUtils::WriteHeader(bitStream, MASTER, MSG_MASTER_SHUTDOWN_UNIVERSE);
+		PacketUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::SHUTDOWN_UNIVERSE);
 		Game::server->SendToMaster(&bitStream);
 		ChatPackets::SendSystemMessage(sysAddr, u"Sent universe shutdown notification to master.");
 
@@ -1096,7 +1092,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 
 			//Notify chat about it
 			CBITSTREAM;
-			PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_MUTE_UPDATE);
+			PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::MUTE_UPDATE);
 
 			bitStream.Write(characterId);
 			bitStream.Write(expire);
@@ -1557,7 +1553,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 
 		const auto objid = entity->GetObjectID();
 
-		if (force || CheckIfAccessibleZone(reqZone)) { // to prevent tomfoolery
+		if (force || dZoneManager::Instance()->CheckIfAccessibleZone(reqZone)) { // to prevent tomfoolery
 
 			ZoneInstanceManager::Instance()->RequestZoneTransfer(Game::server, reqZone, cloneId, false, [objid](bool mythranShift, uint32_t zoneID, uint32_t zoneInstance, uint32_t zoneClone, std::string serverIP, uint16_t serverPort) {
 
@@ -1615,7 +1611,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 	if ((chatCommand == "debugui") && entity->GetGMLevel() >= eGameMasterLevel::DEVELOPER) {
 		ChatPackets::SendSystemMessage(sysAddr, u"Opening UIDebugger...");
 		AMFArrayValue args;
-		GameMessages::SendUIMessageServerToSingleClient(entity, sysAddr, "ToggleUIDebugger;", nullptr);
+		GameMessages::SendUIMessageServerToSingleClient(entity, sysAddr, "ToggleUIDebugger;", args);
 	}
 
 	if ((chatCommand == "boost") && entity->GetGMLevel() >= eGameMasterLevel::DEVELOPER) {
@@ -1952,7 +1948,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 
 				EntityManager::Instance()->SerializeEntity(closest);
 			} else if (args[1] == "-a" && args.size() >= 3) {
-				GameMessages::SendPlayAnimation(closest, GeneralUtils::UTF8ToUTF16(args[2]));
+				RenderComponent::PlayAnimation(closest, args.at(2));
 			} else if (args[1] == "-s") {
 				for (auto* entry : closest->GetSettings()) {
 					ChatPackets::SendSystemMessage(sysAddr, GeneralUtils::UTF8ToUTF16(entry->GetString()));
@@ -2019,32 +2015,17 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 	}
 }
 
-bool SlashCommandHandler::CheckIfAccessibleZone(const unsigned int zoneID) {
-	//We're gonna go ahead and presume we've got the db loaded already:
-	CDZoneTableTable* zoneTable = CDClientManager::Instance().GetTable<CDZoneTableTable>();
-	const CDZoneTable* zone = zoneTable->Query(zoneID);
-	if (zone != nullptr) {
-		return Game::assetManager->HasFile(("maps/" + zone->zoneName).c_str());
-	} else {
-		return false;
-	}
-}
-
 void SlashCommandHandler::SendAnnouncement(const std::string& title, const std::string& message) {
 	AMFArrayValue args;
-	auto* titleValue = new AMFStringValue();
-	titleValue->SetStringValue(title);
-	auto* messageValue = new AMFStringValue();
-	messageValue->SetStringValue(message);
 
-	args.InsertValue("title", titleValue);
+	args.Insert("title", title);
-	args.InsertValue("message", messageValue);
+	args.Insert("message", message);
 
-	GameMessages::SendUIMessageServerToAllClients("ToggleAnnounce", &args);
+	GameMessages::SendUIMessageServerToAllClients("ToggleAnnounce", args);
 
 	//Notify chat about it
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_ANNOUNCEMENT);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ANNOUNCEMENT);
 
 	bitStream.Write<uint32_t>(title.size());
 	for (auto character : title) {

dGame/dUtilities/SlashCommandHandler.h

@@ -13,8 +13,6 @@ class Entity;
 
 namespace SlashCommandHandler {
 	void HandleChatCommand(const std::u16string& command, Entity* entity, const SystemAddress& sysAddr);
-	bool CheckIfAccessibleZone(const unsigned int zoneID);
-
 	void SendAnnouncement(const std::string& title, const std::string& message);
 };
 

dMasterServer/InstanceManager.cpp

@@ -7,10 +7,11 @@
 #include "CDClientDatabase.h"
 #include "CDClientManager.h"
 #include "CDZoneTableTable.h"
-#include "dMessageIdentifiers.h"
 #include "MasterPackets.h"
 #include "PacketUtils.h"
 #include "BinaryPathFinder.h"
+#include "eConnectionType.h"
+#include "eMasterMessageType.h"
 
 InstanceManager::InstanceManager(dLogger* logger, const std::string& externalIP) {
 	mLogger = logger;
@@ -201,7 +202,7 @@ void InstanceManager::RequestAffirmation(Instance* instance, const PendingInstan
 
 	CBITSTREAM;
 
-	PacketUtils::WriteHeader(bitStream, MASTER, MSG_MASTER_AFFIRM_TRANSFER_REQUEST);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::AFFIRM_TRANSFER_REQUEST);
 
 	bitStream.Write(request.id);
 
@@ -405,7 +406,7 @@ bool Instance::GetShutdownComplete() const {
 void Instance::Shutdown() {
 	CBITSTREAM;
 
-	PacketUtils::WriteHeader(bitStream, MASTER, MSG_MASTER_SHUTDOWN);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::SHUTDOWN);
 
 	Game::server->Send(&bitStream, this->m_SysAddr, false);
 

dMasterServer/MasterServer.cpp

@@ -27,6 +27,8 @@
 #include "dServer.h"
 #include "AssetManager.h"
 #include "BinaryPathFinder.h"
+#include "eConnectionType.h"
+#include "eMasterMessageType.h"
 
 //RakNet includes:
 #include "RakNetDefines.h"
@@ -39,7 +41,6 @@
 #include "MasterPackets.h"
 #include "ObjectIDManager.h"
 #include "PacketUtils.h"
-#include "dMessageIdentifiers.h"
 #include "FdbToSqlite.h"
 
 namespace Game {
@@ -49,6 +50,7 @@ namespace Game {
 	dConfig* config = nullptr;
 	AssetManager* assetManager = nullptr;
 	bool shouldShutdown = false;
+	std::mt19937 randomEngine;
 } //namespace Game
 
 bool shutdownSequenceStarted = false;
@@ -290,6 +292,7 @@ int main(int argc, char** argv) {
 		return EXIT_SUCCESS;
 	}
 
+	Game::randomEngine = std::mt19937(time(0));
 	uint32_t maxClients = 999;
 	uint32_t ourPort = 1000;
 	if (Game::config->GetValue("max_clients") != "") maxClients = std::stoi(Game::config->GetValue("max_clients"));
@@ -334,7 +337,6 @@ int main(int argc, char** argv) {
 
 		Game::im->GetInstance(0, false, 0);
 		Game::im->GetInstance(1000, false, 0);
-
 		StartAuthServer();
 	}
 
@@ -494,9 +496,11 @@ void HandlePacket(Packet* packet) {
 		}
 	}
 
-	if (packet->data[1] == MASTER) {
+	if (packet->length < 4) return;
-		switch (packet->data[3]) {
+
-		case MSG_MASTER_REQUEST_PERSISTENT_ID: {
+	if (static_cast<eConnectionType>(packet->data[1]) == eConnectionType::MASTER) {
+		switch (static_cast<eMasterMessageType>(packet->data[3])) {
+		case eMasterMessageType::REQUEST_PERSISTENT_ID: {
 			Game::logger->Log("MasterServer", "A persistent ID req");
 			RakNet::BitStream inStream(packet->data, packet->length, false);
 			uint64_t header = inStream.Read(header);
@@ -508,7 +512,7 @@ void HandlePacket(Packet* packet) {
 			break;
 		}
 
-		case MSG_MASTER_REQUEST_ZONE_TRANSFER: {
+		case eMasterMessageType::REQUEST_ZONE_TRANSFER: {
 			Game::logger->Log("MasterServer", "Received zone transfer req");
 			RakNet::BitStream inStream(packet->data, packet->length, false);
 			uint64_t header = inStream.Read(header);
@@ -544,7 +548,7 @@ void HandlePacket(Packet* packet) {
 			break;
 		}
 
-		case MSG_MASTER_SERVER_INFO: {
+		case eMasterMessageType::SERVER_INFO: {
 			//MasterPackets::HandleServerInfo(packet);
 
 			//This is here because otherwise we'd have to include IM in
@@ -603,7 +607,7 @@ void HandlePacket(Packet* packet) {
 			break;
 		}
 
-		case MSG_MASTER_SET_SESSION_KEY: {
+		case eMasterMessageType::SET_SESSION_KEY: {
 			RakNet::BitStream inStream(packet->data, packet->length, false);
 			uint64_t header = inStream.Read(header);
 			uint32_t sessionKey = 0;
@@ -617,7 +621,7 @@ void HandlePacket(Packet* packet) {
 					activeSessions.erase(it.first);
 
 					CBITSTREAM;
-					PacketUtils::WriteHeader(bitStream, MASTER, MSG_MASTER_NEW_SESSION_ALERT);
+					PacketUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::NEW_SESSION_ALERT);
 					bitStream.Write(sessionKey);
 					bitStream.Write<uint32_t>(username.size());
 					for (auto character : username) {
@@ -634,7 +638,7 @@ void HandlePacket(Packet* packet) {
 			break;
 		}
 
-		case MSG_MASTER_REQUEST_SESSION_KEY: {
+		case eMasterMessageType::REQUEST_SESSION_KEY: {
 			RakNet::BitStream inStream(packet->data, packet->length, false);
 			uint64_t header = inStream.Read(header);
 			std::string username = PacketUtils::ReadString(8, packet, false);
@@ -642,7 +646,7 @@ void HandlePacket(Packet* packet) {
 			for (auto key : activeSessions) {
 				if (key.second == username) {
 					CBITSTREAM;
-					PacketUtils::WriteHeader(bitStream, MASTER, MSG_MASTER_SESSION_KEY_RESPONSE);
+					PacketUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::SESSION_KEY_RESPONSE);
 					bitStream.Write(key.first);
 					PacketUtils::WriteString(bitStream, key.second, 64);
 					Game::server->Send(&bitStream, packet->systemAddress, false);
@@ -652,7 +656,7 @@ void HandlePacket(Packet* packet) {
 			break;
 		}
 
-		case MSG_MASTER_PLAYER_ADDED: {
+		case eMasterMessageType::PLAYER_ADDED: {
 			RakNet::BitStream inStream(packet->data, packet->length, false);
 			uint64_t header = inStream.Read(header);
 
@@ -672,7 +676,7 @@ void HandlePacket(Packet* packet) {
 			break;
 		}
 
-		case MSG_MASTER_PLAYER_REMOVED: {
+		case eMasterMessageType::PLAYER_REMOVED: {
 			RakNet::BitStream inStream(packet->data, packet->length, false);
 			uint64_t header = inStream.Read(header);
 
@@ -690,7 +694,7 @@ void HandlePacket(Packet* packet) {
 			break;
 		}
 
-		case MSG_MASTER_CREATE_PRIVATE_ZONE: {
+		case eMasterMessageType::CREATE_PRIVATE_ZONE: {
 			RakNet::BitStream inStream(packet->data, packet->length, false);
 			uint64_t header = inStream.Read(header);
 
@@ -714,7 +718,7 @@ void HandlePacket(Packet* packet) {
 			break;
 		}
 
-		case MSG_MASTER_REQUEST_PRIVATE_ZONE: {
+		case eMasterMessageType::REQUEST_PRIVATE_ZONE: {
 			RakNet::BitStream inStream(packet->data, packet->length, false);
 			uint64_t header = inStream.Read(header);
 
@@ -749,7 +753,7 @@ void HandlePacket(Packet* packet) {
 			break;
 		}
 
-		case MSG_MASTER_WORLD_READY: {
+		case eMasterMessageType::WORLD_READY: {
 			RakNet::BitStream inStream(packet->data, packet->length, false);
 			uint64_t header = inStream.Read(header);
 
@@ -773,7 +777,7 @@ void HandlePacket(Packet* packet) {
 			break;
 		}
 
-		case MSG_MASTER_PREP_ZONE: {
+		case eMasterMessageType::PREP_ZONE: {
 			RakNet::BitStream inStream(packet->data, packet->length, false);
 			uint64_t header = inStream.Read(header);
 
@@ -789,7 +793,7 @@ void HandlePacket(Packet* packet) {
 			break;
 		}
 
-		case MSG_MASTER_AFFIRM_TRANSFER_RESPONSE: {
+		case eMasterMessageType::AFFIRM_TRANSFER_RESPONSE: {
 			RakNet::BitStream inStream(packet->data, packet->length, false);
 			uint64_t header = inStream.Read(header);
 
@@ -809,7 +813,7 @@ void HandlePacket(Packet* packet) {
 			break;
 		}
 
-		case MSG_MASTER_SHUTDOWN_RESPONSE: {
+		case eMasterMessageType::SHUTDOWN_RESPONSE: {
 			RakNet::BitStream inStream(packet->data, packet->length, false);
 			uint64_t header = inStream.Read(header);
 
@@ -824,7 +828,7 @@ void HandlePacket(Packet* packet) {
 			break;
 		}
 
-		case MSG_MASTER_SHUTDOWN_UNIVERSE: {
+		case eMasterMessageType::SHUTDOWN_UNIVERSE: {
 			Game::logger->Log("MasterServer", "Received shutdown universe command, shutting down in 10 minutes.");
 			Game::shouldShutdown = true;
 			break;
@@ -888,7 +892,7 @@ void ShutdownSequence(int32_t signal) {
 
 	{
 		CBITSTREAM;
-		PacketUtils::WriteHeader(bitStream, MASTER, MSG_MASTER_SHUTDOWN);
+		PacketUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::SHUTDOWN);
 		Game::server->Send(&bitStream, UNASSIGNED_SYSTEM_ADDRESS, true);
 		Game::logger->Log("MasterServer", "Triggered master shutdown");
 	}

dNet/AuthPackets.cpp

@@ -1,6 +1,5 @@
 #include "AuthPackets.h"
 #include "PacketUtils.h"
-#include "dMessageIdentifiers.h"
 
 #include "dNetCommon.h"
 #include "dServer.h"
@@ -23,6 +22,9 @@
 #include "dConfig.h"
 #include "eServerDisconnectIdentifiers.h"
 #include "eLoginResponse.h"
+#include "eConnectionType.h"
+#include "eServerMessageType.h"
+#include "eMasterMessageType.h"
 
 void AuthPackets::HandleHandshake(dServer* server, Packet* packet) {
 	RakNet::BitStream inStream(packet->data, packet->length, false);
@@ -36,7 +38,7 @@ void AuthPackets::HandleHandshake(dServer* server, Packet* packet) {
 
 void AuthPackets::SendHandshake(dServer* server, const SystemAddress& sysAddr, const std::string& nextServerIP, uint16_t nextServerPort, const ServerType serverType) {
 	RakNet::BitStream bitStream;
-	PacketUtils::WriteHeader(bitStream, SERVER, MSG_SERVER_VERSION_CONFIRM);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::SERVER, eServerMessageType::VERSION_CONFIRM);
 	bitStream.Write<unsigned int>(NET_VERSION);
 	bitStream.Write(uint32_t(0x93));
 
@@ -189,7 +191,7 @@ void AuthPackets::HandleLoginRequest(dServer* server, Packet* packet) {
 
 void AuthPackets::SendLoginResponse(dServer* server, const SystemAddress& sysAddr, eLoginResponse responseCode, const std::string& errorMsg, const std::string& wServerIP, uint16_t wServerPort, std::string username) {
 	RakNet::BitStream packet;
-	PacketUtils::WriteHeader(packet, CLIENT, MSG_CLIENT_LOGIN_RESPONSE);
+	PacketUtils::WriteHeader(packet, eConnectionType::CLIENT, eClientMessageType::LOGIN_RESPONSE);
 
 	packet.Write(static_cast<uint8_t>(responseCode));
 
@@ -255,7 +257,7 @@ void AuthPackets::SendLoginResponse(dServer* server, const SystemAddress& sysAdd
 	//Inform the master server that we've created a session for this user:
 	{
 		CBITSTREAM;
-		PacketUtils::WriteHeader(bitStream, MASTER, MSG_MASTER_SET_SESSION_KEY);
+		PacketUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::SET_SESSION_KEY);
 		bitStream.Write(sessionKey);
 		PacketUtils::WriteString(bitStream, username, 66);
 		server->SendToMaster(&bitStream);

dNet/ChatPackets.cpp

@@ -8,12 +8,13 @@
 #include "BitStream.h"
 #include "Game.h"
 #include "PacketUtils.h"
-#include "dMessageIdentifiers.h"
 #include "dServer.h"
+#include "eConnectionType.h"
+#include "eChatMessageType.h"
 
 void ChatPackets::SendChatMessage(const SystemAddress& sysAddr, char chatChannel, const std::string& senderName, LWOOBJID playerObjectID, bool senderMythran, const std::u16string& message) {
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, CHAT, MSG_CHAT_GENERAL_CHAT_MESSAGE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::GENERAL_CHAT_MESSAGE);
 
 	bitStream.Write(static_cast<uint64_t>(0));
 	bitStream.Write(chatChannel);
@@ -35,7 +36,7 @@ void ChatPackets::SendChatMessage(const SystemAddress& sysAddr, char chatChannel
 
 void ChatPackets::SendSystemMessage(const SystemAddress& sysAddr, const std::u16string& message, const bool broadcast) {
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, CHAT, MSG_CHAT_GENERAL_CHAT_MESSAGE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::GENERAL_CHAT_MESSAGE);
 
 	bitStream.Write(static_cast<uint64_t>(0));
 	bitStream.Write(static_cast<char>(4));
@@ -67,7 +68,7 @@ void ChatPackets::SendMessageFail(const SystemAddress& sysAddr) {
 	//0x01 - "Upgrade to a full LEGO Universe Membership to chat with other players."
 
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_SEND_CANNED_TEXT);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::SEND_CANNED_TEXT);
 	bitStream.Write<uint8_t>(0); //response type, options above ^
 	//docs say there's a wstring here-- no idea what it's for, or if it's even needed so leaving it as is for now.
 	SEND_PACKET;

dNet/ClientPackets.cpp

@@ -31,7 +31,6 @@
 #include "dConfig.h"
 #include "CharacterComponent.h"
 #include "Database.h"
-#include "dMessageIdentifiers.h"
 #include "eGameMasterLevel.h"
 #include "eReplicaComponentType.h"
 
@@ -47,9 +46,7 @@ void ClientPackets::HandleChatMessage(const SystemAddress& sysAddr, Packet* pack
 		return;
 	}
 
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
-	uint64_t header;
-	inStream.Read(header);
 
 	char chatChannel;
 	uint16_t unknown;
@@ -83,9 +80,7 @@ void ClientPackets::HandleClientPositionUpdate(const SystemAddress& sysAddr, Pac
 		return;
 	}
 
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
-	uint64_t header;
-	inStream.Read(header);
 
 	Entity* entity = EntityManager::Instance()->GetEntity(user->GetLastUsedChar()->GetObjectID());
 	if (!entity) return;

dNet/MasterPackets.cpp

@@ -1,22 +1,23 @@
 #include "MasterPackets.h"
 #include "BitStream.h"
 #include "PacketUtils.h"
-#include "dMessageIdentifiers.h"
 #include "dCommonVars.h"
 #include "dServer.h"
+#include "eConnectionType.h"
+#include "eMasterMessageType.h"
 
 #include <string>
 
 void MasterPackets::SendPersistentIDRequest(dServer* server, uint64_t requestID) {
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, MASTER, MSG_MASTER_REQUEST_PERSISTENT_ID);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::REQUEST_PERSISTENT_ID);
 	bitStream.Write(requestID);
 	server->SendToMaster(&bitStream);
 }
 
 void MasterPackets::SendPersistentIDResponse(dServer* server, const SystemAddress& sysAddr, uint64_t requestID, uint32_t objID) {
 	RakNet::BitStream bitStream;
-	PacketUtils::WriteHeader(bitStream, MASTER, MSG_MASTER_REQUEST_PERSISTENT_ID_RESPONSE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::REQUEST_PERSISTENT_ID_RESPONSE);
 
 	bitStream.Write(requestID);
 	bitStream.Write(objID);
@@ -26,7 +27,7 @@ void MasterPackets::SendPersistentIDResponse(dServer* server, const SystemAddres
 
 void MasterPackets::SendZoneTransferRequest(dServer* server, uint64_t requestID, bool mythranShift, uint32_t zoneID, uint32_t cloneID) {
 	RakNet::BitStream bitStream;
-	PacketUtils::WriteHeader(bitStream, MASTER, MSG_MASTER_REQUEST_ZONE_TRANSFER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::REQUEST_ZONE_TRANSFER);
 
 	bitStream.Write(requestID);
 	bitStream.Write(static_cast<uint8_t>(mythranShift));
@@ -38,7 +39,7 @@ void MasterPackets::SendZoneTransferRequest(dServer* server, uint64_t requestID,
 
 void MasterPackets::SendZoneCreatePrivate(dServer* server, uint32_t zoneID, uint32_t cloneID, const std::string& password) {
 	RakNet::BitStream bitStream;
-	PacketUtils::WriteHeader(bitStream, MASTER, MSG_MASTER_CREATE_PRIVATE_ZONE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::CREATE_PRIVATE_ZONE);
 
 	bitStream.Write(zoneID);
 	bitStream.Write(cloneID);
@@ -53,7 +54,7 @@ void MasterPackets::SendZoneCreatePrivate(dServer* server, uint32_t zoneID, uint
 
 void MasterPackets::SendZoneRequestPrivate(dServer* server, uint64_t requestID, bool mythranShift, const std::string& password) {
 	RakNet::BitStream bitStream;
-	PacketUtils::WriteHeader(bitStream, MASTER, MSG_MASTER_REQUEST_PRIVATE_ZONE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::REQUEST_PRIVATE_ZONE);
 
 	bitStream.Write(requestID);
 	bitStream.Write(static_cast<uint8_t>(mythranShift));
@@ -68,7 +69,7 @@ void MasterPackets::SendZoneRequestPrivate(dServer* server, uint64_t requestID,
 
 void MasterPackets::SendWorldReady(dServer* server, LWOMAPID zoneId, LWOINSTANCEID instanceId) {
 	RakNet::BitStream bitStream;
-	PacketUtils::WriteHeader(bitStream, MASTER, MSG_MASTER_WORLD_READY);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::WORLD_READY);
 
 	bitStream.Write(zoneId);
 	bitStream.Write(instanceId);
@@ -78,7 +79,7 @@ void MasterPackets::SendWorldReady(dServer* server, LWOMAPID zoneId, LWOINSTANCE
 
 void MasterPackets::SendZoneTransferResponse(dServer* server, const SystemAddress& sysAddr, uint64_t requestID, bool mythranShift, uint32_t zoneID, uint32_t zoneInstance, uint32_t zoneClone, const std::string& serverIP, uint32_t serverPort) {
 	RakNet::BitStream bitStream;
-	PacketUtils::WriteHeader(bitStream, MASTER, MSG_MASTER_REQUEST_ZONE_TRANSFER_RESPONSE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::REQUEST_ZONE_TRANSFER_RESPONSE);
 
 	bitStream.Write(requestID);
 	bitStream.Write(static_cast<uint8_t>(mythranShift));
@@ -110,7 +111,7 @@ void MasterPackets::HandleServerInfo(Packet* packet) {
 
 void MasterPackets::SendServerInfo(dServer* server, Packet* packet) {
 	RakNet::BitStream bitStream;
-	PacketUtils::WriteHeader(bitStream, MASTER, MSG_MASTER_SERVER_INFO);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::SERVER_INFO);
 
 	bitStream.Write(server->GetPort());
 	bitStream.Write(server->GetZoneID());

dNet/PacketUtils.cpp

@@ -1,17 +1,9 @@
 #include "PacketUtils.h"
-#include <MessageIdentifiers.h>
 #include <vector>
 #include <fstream>
 #include "dLogger.h"
 #include "Game.h"
 
-void PacketUtils::WriteHeader(RakNet::BitStream& bitStream, uint16_t connectionType, uint32_t internalPacketID) {
-	bitStream.Write(MessageID(ID_USER_PACKET_ENUM));
-	bitStream.Write(connectionType);
-	bitStream.Write(internalPacketID);
-	bitStream.Write(uint8_t(0));
-}
-
 uint16_t PacketUtils::ReadPacketU16(uint32_t startLoc, Packet* packet) {
 	if (startLoc + 2 > packet->length) return 0;
 

dNet/PacketUtils.h

@@ -1,11 +1,20 @@
 #ifndef PACKETUTILS_H
 #define PACKETUTILS_H
 
+#include <MessageIdentifiers.h>
 #include <BitStream.h>
 #include <string>
 
+enum class eConnectionType : uint16_t;
+
 namespace PacketUtils {
-	void WriteHeader(RakNet::BitStream& bitStream, uint16_t connectionType, uint32_t internalPacketID);
+	template<typename T>
+	void WriteHeader(RakNet::BitStream& bitStream, eConnectionType connectionType, T internalPacketID) {
+		bitStream.Write<uint8_t>(MessageID(ID_USER_PACKET_ENUM));
+		bitStream.Write<eConnectionType>(connectionType);
+		bitStream.Write<uint32_t>(static_cast<uint32_t>(internalPacketID));
+		bitStream.Write<uint8_t>(0);
+	}
 
 	uint16_t ReadPacketU16(uint32_t startLoc, Packet* packet);
 	uint32_t ReadPacketU32(uint32_t startLoc, Packet* packet);

dNet/WorldPackets.cpp

@@ -1,7 +1,6 @@
 #include "dCommonVars.h"
 #include "WorldPackets.h"
 #include "BitStream.h"
-#include "dMessageIdentifiers.h"
 #include "PacketUtils.h"
 #include "GeneralUtils.h"
 #include "User.h"
@@ -14,10 +13,11 @@
 #include "dZoneManager.h"
 #include "CharacterComponent.h"
 #include "ZCompression.h"
+#include "eConnectionType.h"
 
 void WorldPackets::SendLoadStaticZone(const SystemAddress& sysAddr, float x, float y, float z, uint32_t checksum) {
 	RakNet::BitStream bitStream;
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_LOAD_STATIC_ZONE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::LOAD_STATIC_ZONE);
 
 	auto zone = dZoneManager::Instance()->GetZone()->GetZoneID();
 	bitStream.Write(static_cast<uint16_t>(zone.GetMapID()));
@@ -41,7 +41,7 @@ void WorldPackets::SendCharacterList(const SystemAddress& sysAddr, User* user) {
 	if (!user) return;
 
 	RakNet::BitStream bitStream;
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_CHARACTER_LIST_RESPONSE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::CHARACTER_LIST_RESPONSE);
 
 	std::vector<Character*> characters = user->GetCharacters();
 	bitStream.Write(static_cast<uint8_t>(characters.size()));
@@ -90,28 +90,28 @@ void WorldPackets::SendCharacterList(const SystemAddress& sysAddr, User* user) {
 
 void WorldPackets::SendCharacterCreationResponse(const SystemAddress& sysAddr, eCharacterCreationResponse response) {
 	RakNet::BitStream bitStream;
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_CHARACTER_CREATE_RESPONSE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::CHARACTER_CREATE_RESPONSE);
 	bitStream.Write(response);
 	SEND_PACKET;
 }
 
 void WorldPackets::SendCharacterRenameResponse(const SystemAddress& sysAddr, eRenameResponse response) {
 	RakNet::BitStream bitStream;
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_CHARACTER_RENAME_RESPONSE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::CHARACTER_RENAME_RESPONSE);
 	bitStream.Write(response);
 	SEND_PACKET;
 }
 
 void WorldPackets::SendCharacterDeleteResponse(const SystemAddress& sysAddr, bool response) {
 	RakNet::BitStream bitStream;
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_DELETE_CHARACTER_RESPONSE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::DELETE_CHARACTER_RESPONSE);
 	bitStream.Write(static_cast<uint8_t>(response));
 	SEND_PACKET;
 }
 
 void WorldPackets::SendTransferToWorld(const SystemAddress& sysAddr, const std::string& serverIP, uint32_t serverPort, bool mythranShift) {
 	RakNet::BitStream bitStream;
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_TRANSFER_TO_WORLD);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::TRANSFER_TO_WORLD);
 
 	PacketUtils::WriteString(bitStream, serverIP, 33);
 	bitStream.Write(static_cast<uint16_t>(serverPort));
@@ -122,14 +122,14 @@ void WorldPackets::SendTransferToWorld(const SystemAddress& sysAddr, const std::
 
 void WorldPackets::SendServerState(const SystemAddress& sysAddr) {
 	RakNet::BitStream bitStream;
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_SERVER_STATES);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::SERVER_STATES);
 	bitStream.Write(static_cast<uint8_t>(1)); //If the server is receiving this request, it probably is ready anyway.
 	SEND_PACKET;
 }
 
 void WorldPackets::SendCreateCharacter(const SystemAddress& sysAddr, Entity* entity, const std::string& xmlData, const std::u16string& username, eGameMasterLevel gm) {
 	RakNet::BitStream bitStream;
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_CREATE_CHARACTER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::CREATE_CHARACTER);
 
 	RakNet::BitStream data;
 	data.Write<uint32_t>(7); //LDF key count
@@ -198,7 +198,7 @@ void WorldPackets::SendCreateCharacter(const SystemAddress& sysAddr, Entity* ent
 
 void WorldPackets::SendChatModerationResponse(const SystemAddress& sysAddr, bool requestAccepted, uint32_t requestID, const std::string& receiver, std::vector<std::pair<uint8_t, uint8_t>> unacceptedItems) {
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_CHAT_MODERATION_STRING);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::CHAT_MODERATION_STRING);
 
 	bitStream.Write<uint8_t>(unacceptedItems.empty()); // Is sentence ok?
 	bitStream.Write<uint16_t>(0x16); // Source ID, unknown
@@ -222,7 +222,7 @@ void WorldPackets::SendChatModerationResponse(const SystemAddress& sysAddr, bool
 
 void WorldPackets::SendGMLevelChange(const SystemAddress& sysAddr, bool success, eGameMasterLevel highestLevel, eGameMasterLevel prevLevel, eGameMasterLevel newLevel) {
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_MAKE_GM_RESPONSE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::MAKE_GM_RESPONSE);
 
 	bitStream.Write<uint8_t>(success);
 	bitStream.Write(static_cast<uint16_t>(highestLevel));