working dispatcher + factory

include/examples/UpgradeTowerPacket.h

@@ -4,30 +4,36 @@
 #include <sp/protocol/Field.h>
 #include <sp/protocol/MessageBase.h>
 
-
-enum class UpgradeTowerFieldsE {
-	m_Tower = 0,
-	m_Upgrade,
+struct UpgradeTowerPacketData {
+	sp::BitField<std::uint16_t,
+		sp::Field<std::uint16_t, 12>, // std::uint16_t m_Tower : 12;
+		sp::Field<std::uint8_t, 4> // std::uint8_t m_Upgrade : 4;
+	> m_TowerAndUpgrade;
+	sp::VarInt m_Test;
+	std::map<std::string, std::vector<int>> m_Test2;
 };
 
-using UpgradeTowerFields = std::tuple<
-	sp::BitField<std::uint16_t, 
-		sp::Field<std::uint16_t, 12>,  		//<- m_Tower
-		sp::Field<std::uint8_t, 4>			//<- m_Upgrade
-		>,
-	sp::VarInt,								//<- just for testing
-	std::map<std::string, std::vector<int>>
-	>;
+class UpgradeTowerPacket : public sp::MessageBase<sp::PacketMessage, sp::option::DispatchImpl<UpgradeTowerPacket>> {
+  private:
+	UpgradeTowerPacketData m_Data;
 
-DeclarePacket(UpgradeTower){
-  public: 
-	PacketConstructor(UpgradeTower)
+  public:
+	template <typename... T>
+	UpgradeTowerPacket(T... args) : m_Data{args...} {}
 
 	std::uint16_t GetTowerId() const {
-		return GetField<0>().GetField<UpgradeTowerFieldsE, UpgradeTowerFieldsE::m_Tower>();
+		return m_Data.m_TowerAndUpgrade.GetField<0>();
 	}
 
 	std::uint8_t GetTowerUpgrade() const {
-		return GetField<0>().GetField<UpgradeTowerFieldsE, UpgradeTowerFieldsE::m_Upgrade>();
+		return m_Data.m_TowerAndUpgrade.GetField<1>();
 	}
-};
+
+	virtual sp::PacketID GetId() const {
+		return UpgradeTower;
+	}
+
+	UpgradeTowerPacketData& GetData() {
+		return m_Data;
+	}
+};