test

yu

.gitea/workflows/linux.yaml

@@ -0,0 +1,25 @@
+name: Linux arm64
+run-name: Build And Test
+
+on: [push]
+
+jobs:
+  Build:
+    runs-on: ubuntu-test
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v3
+
+      - name: Packages cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ github.workspace }}/build/.packages
+
+      - name: XMake config
+        run: xmake f -p linux -y
+
+      - name: Build
+        run: xmake
+
+      - name: Test
+        run: xmake test

include/client/Client.h

@@ -1,17 +1,17 @@
 #pragma once
 
-#include "ClientConnexion.h"
+#include "client/ClientConnexion.h"
-#include "ClientGame.h"
+#include "client/game/ClientGame.h"
 
-#include "game/Team.h"
+#include "td/game/Team.h"
-#include "game/Player.h"
+#include "td/game/Player.h"
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "protocol/packets/SendMobsPacket.h"
+#include "td/protocol/packets/SendMobsPacket.h"
 
-#include "render/Renderer.h"
+#include "client/render/Renderer.h"
 
-#include "network/Network.h"
+#include "td/network/Network.h"
 
 namespace td {
 namespace client {

include/client/ClientConnexion.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "protocol/PacketHandler.h"
+#include "td/protocol/PacketHandler.h"
-#include "network/TCPSocket.h"
+#include "td/network/TCPSocket.h"
-#include "game/Connexion.h"
+#include "td/network/Connexion.h"
 
 namespace td {
 namespace client {

include/client/game/ClientGame.h

@@ -1,13 +1,13 @@
 #pragma once
 
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
-#include "protocol/PacketHandler.h"
+#include "td/protocol/PacketHandler.h"
 
 #include "WorldClient.h"
 
-#include "render/WorldRenderer.h"
+#include "client/render/WorldRenderer.h"
-#include "render/Renderer.h"
+#include "client/render/Renderer.h"
 
 namespace td {
 namespace client {

include/client/game/WorldClient.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "game/World.h"
+#include "td/game/World.h"
-#include "protocol/PacketHandler.h"
+#include "td/protocol/PacketHandler.h"
 
 namespace td {
 namespace client {
@@ -13,12 +13,14 @@ private:
 	ClientGame* m_Game;
 public:
 	WorldClient(ClientGame* game);
+	virtual ~WorldClient();
 
 	virtual void HandlePacket(const protocol::WorldBeginDataPacket* packet) override;
 	virtual void HandlePacket(const protocol::WorldDataPacket* packet) override;
 	virtual void HandlePacket(const protocol::SpawnMobPacket* packet) override;
 	virtual void HandlePacket(const protocol::UpgradeTowerPacket* packet) override;
 	virtual void HandlePacket(const protocol::WorldAddTowerPacket* packet) override;
+	virtual void HandlePacket(const protocol::RemoveMobPacket* packet) override;
 	virtual void HandlePacket(const protocol::RemoveTowerPacket* packet) override;
 	virtual void HandlePacket(const protocol::UpdateMobStatesPacket* packet) override;
 	virtual void HandlePacket(const protocol::UpdateCastleLifePacket* packet) override;

include/client/render/Renderer.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "Defines.h"
+#include "td/Defines.h"
 #include <memory>
 #include "loader/GLLoader.h"
-#include "render/shaders/WorldShader.h"
+#include "client/render/shaders/WorldShader.h"
-#include "render/shaders/EntityShader.h"
+#include "client/render/shaders/EntityShader.h"
 
 namespace td {
 namespace render {
@@ -58,6 +58,7 @@ public:
 	void SetCamAngularMovement(const Vec2f& mov);
 	void SetCamMovement(const Vec2f& lastCursorPos, const Vec2f& currentCursorPos);
 	void SetCamLook(const Vec2f& worldPos);
+	void ResetCamLook();
 
 	void SetBackgroundColor(const Vec3f& color) { m_BackgroundColor = color; }
 

include/client/render/VertexCache.h

@@ -2,7 +2,7 @@
 #include <cstdint>
 #include <memory>
 
-#include "render/loader/GLLoader.h"
+#include "client/render/loader/GLLoader.h"
 
 
 namespace td {

include/client/render/WorldRenderer.h

@@ -1,14 +1,14 @@
 #pragma once
 
-#include "game/World.h"
+#include "td/game/World.h"
 
-#include "render/Renderer.h"
+#include "client/render/Renderer.h"
-#include "render/VertexCache.h"
+#include "client/render/VertexCache.h"
 
-#include "render/gui/TowerPlacePopup.h"
+#include "client/render/gui/TowerPlacePopup.h"
-#include "render/gui/TowerUpgradePopup.h"
+#include "client/render/gui/TowerUpgradePopup.h"
-#include "render/gui/MobTooltip.h"
+#include "client/render/gui/MobTooltip.h"
-#include "render/gui/CastleTooltip.h"
+#include "client/render/gui/CastleTooltip.h"
 
 namespace td {
 
@@ -48,6 +48,7 @@ public:
 	void Update();
 	void Render();
 
+	void ResetCam();
 	void SetCamPos(float camX, float camY);
 
 	void MoveCam(float relativeX, float relativeY);

include/client/render/gui/GameMenu.h

@@ -1,16 +1,19 @@
 #pragma once
 
 #include "SummonMenu.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace gui {
 
-class GameMenu : public GuiWidget {
+class GameMenu : public GuiWidget, public game::GameListener {
 private:
 	std::unique_ptr<SummonMenu> m_SummonMenu;
 public:
 	GameMenu(client::Client* client);
 
+	virtual void OnGameBegin();
+
 	virtual void Render();
 private:
 	void ShowTPS();
@@ -18,6 +21,8 @@ private:
 	void ShowPlayers();
 	void ShowLobbyProgress();
 	void ShowTeamSelection();
+
+	void DisconnectButton();
 };
 
 } // namespace gui

include/client/render/gui/ImGuiTeamColor.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "render/gui/imgui/imgui.h"
+#include "client/render/gui/imgui/imgui.h"
-#include "game/Team.h"
+#include "td/game/Team.h"
 
 namespace td {
 namespace render {

include/client/render/gui/MainMenu.h

@@ -4,13 +4,15 @@
 
 #include "imgui/imgui_filebrowser.h"
 
-#include "game/server/Server.h"
+#include "server/Server.h"
 
 #include <memory>
 
 namespace td {
 namespace gui {
 
+class ServerGui;
+
 class MainMenu : public GuiWidget {
 private:
 	bool m_TriedToConnect = false;
@@ -22,6 +24,7 @@ private:
 	imgui_addons::ImGuiFileBrowser m_FileDialog;
 
 	std::unique_ptr<server::Server> m_Server;
+	std::unique_ptr<ServerGui> m_ServerGui;
 public:
 	MainMenu(client::Client* client);
 	~MainMenu();

include/client/render/gui/ServerGui.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include "GuiWidget.h"
+#include "server/Server.h"
+
+namespace td {
+namespace gui {
+
+class ServerGui : public GuiWidget {
+private:
+	server::Server* m_Server;
+public:
+	ServerGui(client::Client* client, server::Server* server);
+
+	virtual void Render();
+};
+
+} // namespace gui  
+} // namespace td

include/client/render/gui/SummonMenu.h

@@ -3,7 +3,7 @@
 #include "GuiWidget.h"
 
 #include <array>
-#include "game/Mobs.h"
+#include "td/game/Mobs.h"
 
 namespace td {
 namespace gui {

include/client/render/gui/TowerGui.h

@@ -9,7 +9,7 @@
 
 #include <memory>
 
-#include "render/gui/GuiManager.h"
+#include "client/render/gui/GuiManager.h"
 
 struct SDL_Window;
 typedef void* SDL_GLContext;

include/client/render/gui/TowerPlacePopup.h

@@ -2,7 +2,7 @@
 
 #include "GuiWidget.h"
 
-#include "Defines.h"
+#include "td/Defines.h"
 
 namespace td {
 namespace gui {

include/client/render/gui/TowerUpgradePopup.h

@@ -2,7 +2,7 @@
 
 #include "GuiWidget.h"
 
-#include "Defines.h"
+#include "td/Defines.h"
 
 namespace td {
 namespace gui {

include/client/render/gui/imgui/imconfig.h

@@ -107,7 +107,7 @@ namespace ImGui
 }
 */
 
-#include "render/GL.h"
+#include "client/render/GL.h"
 
 #if defined(__ANDROID__)
 #define IMGUI_IMPL_OPENGL_LOADER_ES3

include/client/render/gui/imgui/imgui_filebrowser.h

@@ -1,7 +1,7 @@
 #ifndef IMGUIFILEBROWSER_H
 #define IMGUIFILEBROWSER_H
 
-#include "render/gui/imgui/imgui.h"
+#include "client/render/gui/imgui/imgui.h"
 #include <string>
 #include <vector>
 

include/client/render/loader/WorldLoader.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "game/World.h"
+#include "td/game/World.h"
 #include "GLLoader.h"
 
 namespace td {

include/client/render/shaders/ShaderProgram.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <string>
-#include "Defines.h"
+#include "td/Defines.h"
-#include "render/GL.h"
+#include "client/render/GL.h"
 
 namespace td {
 namespace shader {

include/client/updater/Updater.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "misc/DataBuffer.h"
+#include "td/misc/DataBuffer.h"
 
-#define TD_VERSION "alpha-0.3.0"
+#define TD_VERSION "alpha-0.4.0"
 
 namespace td {
 namespace utils {

include/server/Lobby.h

@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "misc/Time.h"
+#include "td/misc/Time.h"
 
 namespace td {
 namespace server {
@@ -12,7 +12,7 @@ class Server;
 class Lobby {
 private:
 	Server* m_Server;
-	bool m_GameStarted = false;
+	bool m_LobbyOpened = false;
 	std::uint64_t m_StartTimerTime = 0;
 	std::vector<std::uint8_t> m_Players;
 	utils::AutoTimer m_Timer;
@@ -22,6 +22,8 @@ public:
 	void OnPlayerJoin(std::uint8_t playerID);
 	void OnPlayerLeave(std::uint8_t playerID);
 
+	void OpenLobby();
+
 	void SendTimeRemaining();
 
 	void Tick();

include/server/Server.h

@@ -3,13 +3,13 @@
 #include <map>
 #include <thread>
 
-#include "network/TCPListener.h"
+#include "td/network/TCPListener.h"
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "protocol/PacketDispatcher.h"
+#include "td/protocol/PacketDispatcher.h"
-#include "protocol/PacketHandler.h"
+#include "td/protocol/PacketHandler.h"
-#include "ServerGame.h"
+#include "server/game/ServerGame.h"
-#include "ServerConnexion.h"
+#include "server/ServerConnexion.h"
-#include "Lobby.h"
+#include "server/Lobby.h"
 
 #define SERVER_TPS 20
 #define SERVER_TICK 1000 / SERVER_TPS
@@ -63,17 +63,23 @@ private:
 	std::thread m_Thread;
 	bool m_ServerRunning;
 public:
-	Server(const std::string& worldFilePath);
+	Server();
 	virtual ~Server();
 
-	bool Start(std::uint16_t port);
+	bool Start(std::uint16_t port, bool blocking);
 	void Stop(); // force the server to stop
 	void Close(); // at the end of a game
 
+	void Restart();  // go back to lobby state
+
+	bool LoadMap(const std::string& worldFilePath);
+	bool IsMapLoaded();
+
 	void RemoveConnexion(std::uint8_t connexionID);
 
 	void BroadcastPacket(const protocol::Packet* packet);
 
+	float GetMSPT() const { return m_TickCounter.GetMSPT(); }
 	float GetTPS() const { return m_TickCounter.GetTPS(); }
 
 	bool IsRunning() { return m_ServerRunning; }
@@ -95,6 +101,7 @@ private:
 	void Clean();
 	void StartThread();
 	void StopThread();
+	void ServerLoop();
 	void Tick(std::uint64_t delta);
 
 	void OnPlayerJoin(std::uint8_t id);

include/server/ServerConnexion.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "network/TCPSocket.h"
+#include "td/network/TCPSocket.h"
-#include "protocol/PacketHandler.h"
+#include "td/protocol/PacketHandler.h"
-#include "protocol/PacketDispatcher.h"
+#include "td/protocol/PacketDispatcher.h"
-#include "game/Player.h"
+#include "td/game/Player.h"
-#include "game/Connexion.h"
+#include "td/network/Connexion.h"
 
 namespace td {
 namespace server {

include/server/game/ServerGame.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
-#include "misc/Time.h"
+#include "td/misc/Time.h"
 #include "ServerWorld.h"
 
 namespace td {
@@ -23,6 +23,8 @@ public:
 	ServerWorld* GetServerWorld() { return &m_ServerWorld; }
 
 	virtual void Tick(std::uint64_t delta);
+	virtual void Reset() override;
+
 	void StartGame();
 
 	// GameListener
@@ -31,6 +33,9 @@ public:
 	virtual void OnGameBegin() override;
 	virtual void OnGameEnd() override;
 	virtual void OnGameClose() override;
+
+	virtual void OnPlayerJoin(game::PlayerID id) override;
+	virtual void OnPlayerLeave(game::PlayerID id) override;
 private:
 	void BalanceTeams();
 	void InitPlayerStats();

include/server/game/ServerWorld.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "game/World.h"
+#include "td/game/World.h"
 
 namespace td {
 namespace server {

include/td/Defines.h

@@ -2,6 +2,9 @@
 
 #include <cstdint>
 
+#define SAFE_CHECK(expr) if(!(expr)) return
+
+
 namespace td {
 
 static constexpr float PI = 3.141592653f;

include/td/game/BaseGame.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "game/Team.h"
+#include "td/game/Team.h"
-#include "game/World.h"
+#include "td/game/World.h"
-#include "game/Player.h"
+#include "td/game/Player.h"
 
 namespace td {
 namespace game {
@@ -42,6 +42,8 @@ public:
 
 	virtual void Tick(std::uint64_t delta);
 
+	virtual void Reset();
+
 	Team& GetRedTeam() { return m_Teams[static_cast<std::uint8_t>(TeamColor::Red)]; }
 	const Team& GetRedTeam() const { return m_Teams[static_cast<std::uint8_t>(TeamColor::Red)]; }
 
@@ -65,6 +67,8 @@ public:
 
 	const TeamList& GetTeams() const { return m_Teams; }
 
+	void RemovePlayer(PlayerID pId);
+
 };
 
 } // namespace game 

include/td/game/Mobs.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include "Defines.h"
+#include "td/Defines.h"
 #include "Towers.h"
 #include "Types.h"
 #include "Team.h"
 
-#include "misc/ObjectNotifier.h"
+#include "td/misc/ObjectNotifier.h"
 
 #include <vector>
 #include <memory>
@@ -99,7 +99,7 @@ private:
 	utils::CooldownTimer m_AttackTimer;
 
 public:
-	Mob(MobID id, MobLevel level, PlayerID sender) : m_Sender(sender), m_Level(level),
+	Mob(MobID id, MobLevel level, PlayerID sender) : m_ID(id), m_Sender(sender), m_Level(level),
 		m_HitCooldown(0), m_EffectFireTimer(1000), m_EffectPoisonTimer(1000),
 		m_EffectHealTimer(1000), m_CastleTarget(nullptr), m_AttackTimer(1000) {
 

include/td/game/Player.h

@@ -2,8 +2,8 @@
 
 #include <string>
 
-#include "game/Team.h"
+#include "td/game/Team.h"
-#include "game/PlayerUpgrades.h"
+#include "td/game/PlayerUpgrades.h"
 
 namespace td {
 namespace game {

include/td/game/Team.h

@@ -2,7 +2,7 @@
 
 #include "Types.h"
 
-#include "misc/Shapes.h"
+#include "td/misc/Shapes.h"
 
 #include <vector>
 #include <memory>
@@ -74,6 +74,7 @@ public:
 
 	void AddPlayer(Player* newPlayer);
 	void RemovePlayer(const Player* player);
+	void ClearPlayers();
 
 	TeamColor GetColor() const;
 

include/td/game/Towers.h

@@ -3,10 +3,10 @@
 #include <string>
 #include <memory>
 
-#include "misc/Time.h"
+#include "td/misc/Time.h"
-#include "misc/Shapes.h"
+#include "td/misc/Shapes.h"
 
-#include "game/Types.h"
+#include "td/game/Types.h"
 
 namespace td {
 namespace game {

include/td/game/Types.h

@@ -3,7 +3,7 @@
 #include <cstdint>
 
 // include Log for every files
-#include "misc/Log.h"
+#include "td/misc/Log.h"
 
 namespace td {
 namespace game {

include/td/game/World.h

@@ -171,7 +171,10 @@ public:
 
 	void Tick(std::uint64_t delta);
 
+	void Reset();  // clear mobs and towers
+
 	void SpawnMobAt(MobID id, MobType type, std::uint8_t level, PlayerID sender, float x, float y, Direction dir);
+	MobPtr RemoveMob(MobID id);
 
 	TowerPtr PlaceTowerAt(TowerID id, TowerType type, std::int32_t x, std::int32_t y, PlayerID builder);
 	TowerPtr RemoveTower(TowerID id);
@@ -217,7 +220,9 @@ public:
 
 	const TeamList& GetTeams() const;
 
+	TowerList& GetTowers() { return m_Towers; }
 	const TowerList& GetTowers() const { return m_Towers; }
+
 	TowerPtr GetTowerById(TowerID tower);
 
 	const Player* GetPlayerById(PlayerID id) const;

include/td/misc/Maths.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Defines.h"
+#include "td/Defines.h"
 #include <cmath>
 
 namespace td {

include/td/network/Connexion.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "network/TCPSocket.h"
+#include "td/network/TCPSocket.h"
-#include "protocol/PacketHandler.h"
+#include "td/protocol/PacketHandler.h"
-#include "protocol/PacketDispatcher.h"
+#include "td/protocol/PacketDispatcher.h"
-#include "game/Player.h"
+#include "td/game/Player.h"
 
 namespace td {
 namespace protocol {

include/td/network/Network.h

@@ -12,10 +12,10 @@
 #include <fcntl.h>
 #endif
 
-#include "network/Socket.h"
+#include "td/network/Socket.h"
-#include "network/IPAddress.h"
+#include "td/network/IPAddress.h"
-#include "network/UDPSocket.h"
+#include "td/network/UDPSocket.h"
-#include "network/TCPSocket.h"
+#include "td/network/TCPSocket.h"
 
 namespace td {
 namespace network {

include/td/network/Socket.h

@@ -5,7 +5,7 @@
 #include <vector>
 #include <memory>
 
-#include "misc/DataBuffer.h"
+#include "td/misc/DataBuffer.h"
 
 #ifdef _WIN32
 #include <ws2tcpip.h>

include/td/network/TCPSocket.h

@@ -1,8 +1,8 @@
 #ifndef NETWORK_TCP_SOCKET_H_
 #define NETWORK_TCP_SOCKET_H_
 
-#include "network/IPAddress.h"
+#include "td/network/IPAddress.h"
-#include "network/Socket.h"
+#include "td/network/Socket.h"
 
 #include <cstdint>
 

include/td/network/UDPSocket.h

@@ -1,8 +1,8 @@
 #ifndef NETWORK_UDP_SOCKET_H_
 #define NETWORK_UDP_SOCKET_H_
 
-#include "network/IPAddress.h"
+#include "td/network/IPAddress.h"
-#include "network/Socket.h"
+#include "td/network/Socket.h"
 
 #include <cstdint>
 

include/td/protocol/PacketDispatcher.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 #include <map>
 #include <vector>

include/td/protocol/PacketFactory.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/PacketHandler.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "protocol/PacketsForward.h"
+#include "td/protocol/PacketsForward.h"
 
 namespace td {
 namespace protocol {
@@ -27,6 +27,7 @@ public:
 	virtual void HandlePacket(const PlayerLeavePacket* packet) {}
 	virtual void HandlePacket(const PlayerListPacket* packet) {}
 	virtual void HandlePacket(const PlayerLoginPacket* packet) {}
+	virtual void HandlePacket(const RemoveMobPacket* packet) {}
 	virtual void HandlePacket(const RemoveTowerPacket* packet) {}
 	virtual void HandlePacket(const SelectTeamPacket* packet) {}
 	virtual void HandlePacket(const SendMobsPacket* packet) {}

include/td/protocol/Packets.h

@@ -8,6 +8,7 @@
 #include "packets/PlayerLeavePacket.h"
 #include "packets/PlayerListPacket.h"
 #include "packets/PlayerLoginPacket.h"
+#include "packets/RemoveMobPacket.h"
 #include "packets/RemoveTowerPacket.h"
 #include "packets/SelectTeamPacket.h"
 #include "packets/SendMobsPacket.h"

include/td/protocol/PacketsForward.h

@@ -29,6 +29,7 @@ class UpdateCastleLifePacket;
 class UpdateMobStatesPacket;
 class PlayerBuyItemPacket;
 class PlayerBuyMobUpgradePacket;
+class RemoveMobPacket;
 
 } // namespace protocol
 } // namespace td

include/td/protocol/Protocol.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "misc/DataBuffer.h"
+#include "td/misc/DataBuffer.h"
 
 #include <memory>
 
@@ -13,7 +13,6 @@ enum class PacketType : std::uint8_t {
 	// client --> server
 	PlayerLogin = 0,
 	SelectTeam,
-	SpawnMob,
 	SendMobs,
 	PlaceTower,
 
@@ -33,6 +32,8 @@ enum class PacketType : std::uint8_t {
 	WorldAddTower,
 	UpdateMobStates,
 	UpdateCastleLife,
+	SpawnMob,
+	RemoveMob,
 
 	// client <--> server
 	KeepAlive,

include/td/protocol/packets/ConnectionInfoPacket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/DisconnectPacket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/KeepAlivePacket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/PlaceTowerPacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/PlayerBuyItemPacket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/PlayerBuyMobUpgradePacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/PlayerJoinPacket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/PlayerLeavePacket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/PlayerListPacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/PlayerLoginPacket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/RemoveMobPacket.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include "td/protocol/Protocol.h"
+#include "td/game/BaseGame.h"
+
+namespace td {
+namespace protocol {
+
+class RemoveMobPacket : public Packet {
+private:
+	game::MobID m_MobID;
+public:
+	RemoveMobPacket() {}
+	RemoveMobPacket(game::MobID id) : m_MobID(id) {}
+	virtual ~RemoveMobPacket() {}
+
+	virtual DataBuffer Serialize(bool packetID = true) const;
+	virtual void Deserialize(DataBuffer& data);
+	virtual void Dispatch(PacketHandler* handler) const;
+
+	game::MobID GetMobID() const { return m_MobID; }
+
+	virtual PacketType GetType() const { return PacketType::RemoveMob; }
+};
+
+} // namespace protocol
+} // namespace td

include/td/protocol/packets/RemoveTowerPacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/SelectTeamPacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/SendMobsPacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/ServerTpsPacket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/SpawnMobPacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/UpdateCastleLifePacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/UpdateExpPacket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/UpdateGameStatePacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/UpdateLobbyTimePacket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/UpdateMobStatesPacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/UpdateMoneyPacket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/UpdatePlayerTeamPacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {