New packet format.

.gitignore

@@ -30,3 +30,4 @@ out/
 packages/
 vcpkg_installed/
 CMakeSettings.json
+!server/include/Packet/Out/

server/include/Packet/In/LevelWarp.h

@@ -0,0 +1,52 @@
+#ifndef LEVELWARP_H
+#define LEVELWARP_H
+
+#include <chrono>
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "Packet/PacketBase.h"
+#include "IEnums.h"
+
+
+struct LevelWarp : public PacketBase<LevelWarp>
+{
+	//time_t modificationTime = 0;
+	float x = 0.0f;
+	float y = 0.0f;
+	CString level;
+
+public:
+	static const uint8_t ID = PLI_LEVELWARP;
+
+	static LevelWarp deserialize(CString& buffer) noexcept
+	{
+		LevelWarp packet;
+
+		/*
+		uint8_t packetType = buffer.readGUChar();
+		if (packetType == PLI_LEVELWARPMOD)
+			modificationTime = (time_t)buffer.readGUInt5();
+		*/
+
+		packet.x = (float)(buffer.readGChar() / 2.0f);
+		packet.y = (float)(buffer.readGChar() / 2.0f);
+		packet.level = buffer.readString("");
+
+		return packet;
+	}
+
+	static LevelWarp deserialize(CString&& buffer) noexcept
+	{
+		return deserialize(buffer);
+	}
+
+	[[nodiscard]]
+	CString serialize(int clientVersion = CLVER_2_17) const noexcept
+	{
+		return {};
+	}
+};
+
+#endif // LEVELWARP_H

server/include/Packet/Out/LevelBoard.h

@@ -0,0 +1,46 @@
+#ifndef LEVELBOARD_H
+#define LEVELBOARD_H
+
+#include <chrono>
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "Packet/PacketBase.h"
+#include "IEnums.h"
+
+#include "Level/LevelBoardChange.h"
+
+
+struct LevelBoard : public PacketBase<LevelBoard>
+{
+	const LevelBoardChange* levelBoardChange = nullptr;
+
+public:
+	static const uint8_t ID = PLO_LEVELBOARD;
+
+	static LevelBoard deserialize(CString& buffer) noexcept
+	{
+		return {};
+	}
+
+	static LevelBoard deserialize(CString&& buffer) noexcept
+	{
+		return {};
+	}
+
+	[[nodiscard]]
+	CString serialize(int clientVersion = CLVER_2_17) const noexcept
+	{
+		CString packet;
+
+		packet.writeGChar(ID);
+
+		if (levelBoardChange != nullptr)
+			packet.write(levelBoardChange->getBoardStr());
+
+		return packet;
+	}
+};
+
+#endif // LEVELBOARD_H

server/include/Packet/PacketBase.h

@@ -0,0 +1,42 @@
+#ifndef PACKETBASE_H
+#define PACKETBASE_H
+
+#include <cstdint>
+#include <vector>
+#include <concepts>
+
+#include "IUtil.h"
+#include "CString.h"
+
+
+template <typename T>
+concept IsPacket = requires(T t)
+{
+	{ T::ID } -> std::same_as<const uint8_t>;
+	{ T::deserialize(std::declval<CString&&>()) } -> std::same_as<T>;
+	{ t.serialize() } -> std::same_as<CString>;
+};
+
+template <class T>
+struct PacketBase
+{
+	//static const uint8_t ID = T::ID;
+
+	static T deserialize(CString& buffer) noexcept
+	{
+		return T::deserialize(std::forward(buffer));
+	}
+
+	static T deserialize(CString&& buffer) noexcept
+	{
+		return T::deserialize(std::forward(buffer));
+	}
+
+	[[nodiscard]]
+	CString serialize(int clientVersion = CLVER_2_17) const noexcept
+	{
+		return static_cast<const T*>(this)->serialize(clientVersion);
+	}
+};
+
+#endif // PACKETBASE_H

server/include/Player.h

@@ -14,6 +14,8 @@
 #include <unordered_set>
 #include <vector>
 
+#include "Packet/PacketBase.h"
+
 #ifdef V8NPCSERVER
 	#include "ScriptBindings.h"
 #endif
@@ -135,6 +137,12 @@ class Player : public Account, public CSocketStub, public std::enable_shared_fro
 	bool sendFile(const CString& pFile);
 	bool sendFile(const CString& pPath, const CString& pFile);
 
+	template <IsPacket T>
+	void sendPacket(PacketBase<T>&& packet, bool appendNL = true)
+	{
+		sendPacket(packet.serialize(m_versionId), appendNL);
+	}
+
 	// Type of player
 	bool isAdminIp();
 	bool isStaff();

server/src/Level/Level.cpp

@@ -11,6 +11,8 @@
 #include <set>
 #include <tiletypes.h>
 
+#include "Packet/Out/LevelBoard.h"
+
 /*
 	Global Variables
 */
@@ -169,6 +171,17 @@ CString Level::getLayerPacket(int layer)
 
 CString Level::getBoardChangesPacket(time_t time)
 {
+	CString retVal;
+	for (const auto& change : m_boardChanges)
+	{
+		if (change.getModTime() >= time)
+		{
+			LevelBoard boardChange{ .levelBoardChange = &change };
+			retVal << boardChange.serialize();
+		}
+	}
+	return retVal;
+	/*
 	CString retVal;
 	retVal >> (char)PLO_LEVELBOARD;
 	for (const auto& change: m_boardChanges)
@@ -177,6 +190,7 @@ CString Level::getBoardChangesPacket(time_t time)
 			retVal << change.getBoardStr();
 	}
 	return retVal;
+	*/
 }
 
 CString Level::getBoardChangesPacket2(time_t time)

server/src/Player/Player.cpp

@@ -17,6 +17,8 @@
 #include "Weapon.h"
 #include "utilities/stringutils.h"
 
+#include "Packet/In/LevelWarp.h"
+
 /*
 	Logs
 */
@@ -2453,12 +2455,17 @@ bool Player::msgPLI_LEVELWARP(CString& pPacket)
 {
 	time_t modTime = 0;
 
+	LevelWarp lw = LevelWarp::deserialize(pPacket);
+	warp(lw.level, lw.x, lw.y, modTime);
+
+	/*
 	if (pPacket[0] - 32 == PLI_LEVELWARPMOD)
 		modTime = (time_t)pPacket.readGUInt5();
 
 	float loc[2] = { (float)(pPacket.readGChar() / 2.0f), (float)(pPacket.readGChar() / 2.0f) };
 	CString newLevel = pPacket.readString("");
 	warp(newLevel, loc[0], loc[1], modTime);
+	*/
 
 	return true;
 }