change DelayedPacket name

.gitea/workflows/linux.yaml

@@ -1,25 +0,0 @@
-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/Defines.h

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

include/client/render/gui/ServerGui.h

@@ -1,19 +0,0 @@
-#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/game/BaseGame.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "td/game/Team.h"
-#include "td/game/World.h"
-#include "td/game/Player.h"
+#include "game/Team.h"
+#include "game/World.h"
+#include "game/Player.h"
 
 namespace td {
 namespace game {
@@ -36,14 +36,14 @@ protected:
 	TeamList m_Teams = { Team{TeamColor::Red}, Team{TeamColor::Blue} };
 	GameState m_GameState = GameState::Lobby;
 	PlayerList m_Players;
+
+	std::uint64_t m_GameStartTime = 0;
 public:
 	Game(World* world);
 	virtual ~Game();
 
 	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)]; }
 
@@ -67,7 +67,7 @@ public:
 
 	const TeamList& GetTeams() const { return m_Teams; }
 
-	void RemovePlayer(PlayerID pId);
+	std::uint64_t GetGameStartTime() const { return m_GameStartTime; }
 
 };
 

include/game/Connexion.h

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

include/game/Mobs.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include "td/Defines.h"
+#include "Defines.h"
 #include "Towers.h"
 #include "Types.h"
 #include "Team.h"
 
-#include "td/misc/ObjectNotifier.h"
+#include "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_ID(id), m_Sender(sender), m_Level(level),
+	Mob(MobID id, MobLevel level, PlayerID sender) : 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/game/Player.h

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

include/game/Team.h

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

include/game/Towers.h

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

include/game/Types.h

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

include/game/World.h

@@ -171,10 +171,7 @@ 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);
@@ -220,9 +217,7 @@ 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/game/client/Client.h

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

include/game/client/ClientConnexion.h

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

include/game/client/ClientGame.h

@@ -1,13 +1,13 @@
 #pragma once
 
-#include "td/game/BaseGame.h"
+#include "game/BaseGame.h"
 
-#include "td/protocol/PacketHandler.h"
+#include "protocol/PacketHandler.h"
 
 #include "WorldClient.h"
 
-#include "client/render/WorldRenderer.h"
-#include "client/render/Renderer.h"
+#include "render/WorldRenderer.h"
+#include "render/Renderer.h"
 
 namespace td {
 namespace client {
@@ -18,7 +18,7 @@ class ClientGame : public protocol::PacketHandler, public game::Game {
 private:
 	Client* m_Client;
 	std::uint8_t m_ConnexionID;
-	std::uint32_t m_LobbyTime = 0;
+	std::uint64_t m_LobbyStartTime = 0;
 	game::Player* m_Player = nullptr;
 	render::Renderer* m_Renderer;
 	client::WorldClient m_WorldClient;
@@ -31,7 +31,7 @@ public:
 
 	void RenderWorld();
 
-	std::uint32_t GetLobbyTime() const { return m_LobbyTime; }
+	std::uint64_t GetLobbyStartTime() const { return m_LobbyStartTime; }
 	const game::Player* GetPlayer() const { return m_Player; }
 	const WorldClient& GetWorld() const { return m_WorldClient; }
 	Client* GetClient() const { return m_Client; }

include/game/client/WorldClient.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "td/game/World.h"
-#include "td/protocol/PacketHandler.h"
+#include "game/World.h"
+#include "protocol/PacketHandler.h"
 
 namespace td {
 namespace client {
@@ -13,14 +13,12 @@ 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/game/server/Lobby.h

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

include/game/server/Server.h

@@ -3,13 +3,13 @@
 #include <map>
 #include <thread>
 
-#include "td/network/TCPListener.h"
-#include "td/protocol/Protocol.h"
-#include "td/protocol/PacketDispatcher.h"
-#include "td/protocol/PacketHandler.h"
-#include "server/game/ServerGame.h"
-#include "server/ServerConnexion.h"
-#include "server/Lobby.h"
+#include "network/TCPListener.h"
+#include "protocol/Protocol.h"
+#include "protocol/PacketDispatcher.h"
+#include "protocol/PacketHandler.h"
+#include "ServerGame.h"
+#include "ServerConnexion.h"
+#include "Lobby.h"
 
 #define SERVER_TPS 20
 #define SERVER_TICK 1000 / SERVER_TPS
@@ -63,23 +63,17 @@ private:
 	std::thread m_Thread;
 	bool m_ServerRunning;
 public:
-	Server();
+	Server(const std::string& worldFilePath);
 	virtual ~Server();
 
-	bool Start(std::uint16_t port, bool blocking);
+	bool Start(std::uint16_t port);
 	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; }
@@ -101,7 +95,6 @@ private:
 	void Clean();
 	void StartThread();
 	void StopThread();
-	void ServerLoop();
 	void Tick(std::uint64_t delta);
 
 	void OnPlayerJoin(std::uint8_t id);

include/game/server/ServerConnexion.h

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

include/game/server/ServerGame.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "td/game/BaseGame.h"
-#include "td/misc/Time.h"
+#include "game/BaseGame.h"
+#include "misc/Time.h"
 #include "ServerWorld.h"
 
 namespace td {
@@ -23,8 +23,6 @@ public:
 	ServerWorld* GetServerWorld() { return &m_ServerWorld; }
 
 	virtual void Tick(std::uint64_t delta);
-	virtual void Reset() override;
-
 	void StartGame();
 
 	// GameListener
@@ -33,9 +31,6 @@ 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/game/server/ServerWorld.h

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

include/misc/Maths.h

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

include/network/Network.h

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

include/network/Socket.h

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

include/network/TCPSocket.h

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

include/network/UDPSocket.h

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

include/protocol/PacketDispatcher.h

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

include/protocol/PacketFactory.h

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

include/protocol/PacketHandler.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "td/protocol/Protocol.h"
-#include "td/protocol/PacketsForward.h"
+#include "protocol/Protocol.h"
+#include "protocol/PacketsForward.h"
 
 namespace td {
 namespace protocol {
@@ -27,7 +27,6 @@ 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/protocol/Packets.h

@@ -8,7 +8,6 @@
 #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/protocol/PacketsForward.h

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

include/protocol/Protocol.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "td/misc/DataBuffer.h"
+#include "misc/DataBuffer.h"
 
 #include <memory>
 
@@ -13,6 +13,7 @@ enum class PacketType : std::uint8_t {
 	// client --> server
 	PlayerLogin = 0,
 	SelectTeam,
+	SpawnMob,
 	SendMobs,
 	PlaceTower,
 
@@ -32,8 +33,6 @@ enum class PacketType : std::uint8_t {
 	WorldAddTower,
 	UpdateMobStates,
 	UpdateCastleLife,
-	SpawnMob,
-	RemoveMob,
 
 	// client <--> server
 	KeepAlive,
@@ -55,13 +54,37 @@ public:
 	virtual void Deserialize(DataBuffer& data) = 0;
 	virtual void Dispatch(PacketHandler* handler) const = 0;
 
-	void WritePacketID(DataBuffer& data, bool packetID) const;
+	virtual void WritePacketID(DataBuffer& data, bool packetID) const;
 
 	virtual PacketType GetType() const = 0;
 	std::uint8_t GetID() const { return static_cast<std::uint8_t>(GetType()); }
+
+	virtual bool IsTimed() const { return false; }
+};
+
+class DelayedPacket : public Packet {
+protected:
+	std::uint64_t m_PacketTime = 69;
+
+public:
+	DelayedPacket() {}
+	virtual ~DelayedPacket() {}
+
+	virtual DataBuffer Serialize(bool packetID = true) const = 0;
+	virtual void Deserialize(DataBuffer& data) = 0;
+	virtual void Dispatch(PacketHandler* handler) const = 0;
+
+	virtual void WritePacketID(DataBuffer& data, bool packetID) const override;
+
+	virtual PacketType GetType() const = 0;
+
+	virtual bool IsTimed() const override { return true; }
+
+	void SetPacketTime(std::uint64_t packetTime) { m_PacketTime = packetTime; }
 };
 
 typedef std::unique_ptr<Packet> PacketPtr;
+typedef std::unique_ptr<DelayedPacket> DelayedPacketPtr;
 
 }  // namespace protocol
 }  // namespace td

include/protocol/packets/ConnectionInfoPacket.h

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

include/protocol/packets/DisconnectPacket.h

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

include/protocol/packets/KeepAlivePacket.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include "td/protocol/Protocol.h"
+#include "protocol/Protocol.h"
 
 namespace td {
 namespace protocol {
 
-class KeepAlivePacket : public Packet {
+class KeepAlivePacket : public Packet{
 private:
 	std::uint64_t m_AliveID;
 public:

include/protocol/packets/PlaceTowerPacket.h

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

include/protocol/packets/PlayerBuyItemPacket.h

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

include/protocol/packets/PlayerBuyMobUpgradePacket.h

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

include/protocol/packets/PlayerJoinPacket.h

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

include/protocol/packets/PlayerLeavePacket.h

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

include/protocol/packets/PlayerListPacket.h

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

include/protocol/packets/PlayerLoginPacket.h

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

include/protocol/packets/RemoveTowerPacket.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "td/protocol/Protocol.h"
-#include "td/game/BaseGame.h"
+#include "protocol/Protocol.h"
+#include "game/BaseGame.h"
 
 namespace td {
 namespace protocol {
 
-class RemoveTowerPacket : public Packet {
+class RemoveTowerPacket : public DelayedPacket {
 private:
 	game::TowerID m_TowerID;
 public:

include/protocol/packets/SelectTeamPacket.h

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

include/protocol/packets/SendMobsPacket.h

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

include/protocol/packets/ServerTpsPacket.h

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

include/protocol/packets/SpawnMobPacket.h

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

include/protocol/packets/UpdateCastleLifePacket.h

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

include/protocol/packets/UpdateExpPacket.h

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

include/protocol/packets/UpdateGameStatePacket.h

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

include/protocol/packets/UpdateLobbyTimePacket.h

@@ -1,23 +1,23 @@
 #pragma once
 
-#include "td/protocol/Protocol.h"
+#include "protocol/Protocol.h"
 
 namespace td {
 namespace protocol {
 
 class UpdateLobbyTimePacket : public Packet {
 private:
-	std::uint32_t m_RemainingTime;
+	std::uint64_t m_StartTime;	// unix millis
 public:
 	UpdateLobbyTimePacket() {}
-	UpdateLobbyTimePacket(std::uint32_t remainingTime) : m_RemainingTime(remainingTime) {}
+	UpdateLobbyTimePacket(std::uint64_t startTime) : m_StartTime(startTime) {}
 	virtual ~UpdateLobbyTimePacket() {}
 
 	virtual DataBuffer Serialize(bool packetID = true) const;
 	virtual void Deserialize(DataBuffer& data);
 	virtual void Dispatch(PacketHandler* handler) const;
 
-	std::uint32_t GetRemainingTime() const { return m_RemainingTime; }
+	std::uint64_t GetStartTime() const { return m_StartTime; }
 
 	virtual PacketType GetType() const { return PacketType::UpdateLobbyTime; }
 };

include/protocol/packets/UpdateMobStatesPacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "td/protocol/Protocol.h"
-#include "td/game/BaseGame.h"
+#include "protocol/Protocol.h"
+#include "game/BaseGame.h"
 
 namespace td {
 namespace protocol {
@@ -25,7 +25,7 @@ public:
 	game::Direction GetMobDirection() const { return m_MobDirection; }
 };
 
-class UpdateMobStatesPacket : public Packet {
+class UpdateMobStatesPacket : public DelayedPacket {
 private:
 	std::vector<MobState> m_MobStates;
 public:

include/protocol/packets/UpdateMoneyPacket.h

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

include/protocol/packets/UpdatePlayerTeamPacket.h

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

include/protocol/packets/UpgradeTowerPacket.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "td/protocol/Protocol.h"
-#include "td/game/BaseGame.h"
+#include "protocol/Protocol.h"
+#include "game/BaseGame.h"
 
 namespace td {
 namespace protocol {
 
-class UpgradeTowerPacket : public Packet {
+class UpgradeTowerPacket : public DelayedPacket {
 private:
 	game::TowerID m_TowerID;
 	game::TowerLevel m_TowerLevel;

include/protocol/packets/WorldAddTowerPacket.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "td/protocol/Protocol.h"
-#include "td/game/BaseGame.h"
+#include "protocol/Protocol.h"
+#include "game/BaseGame.h"
 
 namespace td {
 namespace protocol {
 
-class WorldAddTowerPacket : public Packet {
+class WorldAddTowerPacket : public DelayedPacket {
 private:
 	game::TowerID m_TowerID;
 	std::int32_t m_TowerX, m_TowerY;

include/protocol/packets/WorldBeginDataPacket.h

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

include/protocol/packets/WorldDataPacket.h

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

include/render/Renderer.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "td/Defines.h"
+#include "Defines.h"
 #include <memory>
 #include "loader/GLLoader.h"
-#include "client/render/shaders/WorldShader.h"
-#include "client/render/shaders/EntityShader.h"
+#include "render/shaders/WorldShader.h"
+#include "render/shaders/EntityShader.h"
 
 namespace td {
 namespace render {
@@ -58,7 +58,6 @@ 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/render/VertexCache.h

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

include/render/WorldRenderer.h

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

include/render/gui/GameMenu.h

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

include/render/gui/ImGuiTeamColor.h

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

include/render/gui/MainMenu.h

@@ -4,15 +4,13 @@
 
 #include "imgui/imgui_filebrowser.h"
 
-#include "server/Server.h"
+#include "game/server/Server.h"
 
 #include <memory>
 
 namespace td {
 namespace gui {
 
-class ServerGui;
-
 class MainMenu : public GuiWidget {
 private:
 	bool m_TriedToConnect = false;
@@ -24,7 +22,6 @@ 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/render/gui/SummonMenu.h

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

include/render/gui/TowerGui.h

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

include/render/gui/TowerPlacePopup.h

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

include/render/gui/TowerUpgradePopup.h

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

include/render/gui/imgui/imconfig.h

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

include/render/gui/imgui/imgui_filebrowser.h

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

include/render/loader/WorldLoader.h

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

include/render/shaders/ShaderProgram.h

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