restructure project

src/ClientMain.cpp

@@ -11,9 +11,9 @@
 #define BACKWARD_HAS_DW 1
 #endif
 
-#include "window/Display.h"
-#include "updater/Updater.h"
-#include "misc/Backward.hpp"
+#include "client/window/Display.h"
+#include "client/updater/Updater.h"
+#include "td/misc/Backward.hpp"
 
 #ifdef __ANDROID__
 extern "C"

src/ServerMain.cpp

@@ -0,0 +1,27 @@
+//============================================================================
+// Name        : Tower.cpp
+// Author      : Persson
+// Version     :
+// Copyright   : Copyright
+// Description : Hello World in C++, Ansi-style
+//============================================================================
+
+#if !defined(NDEBUG) && !defined(_WIN32)
+#define BACKWARD_HAS_UNWIND 1
+#define BACKWARD_HAS_DW 1
+#endif
+
+#include "td/misc/Backward.hpp"
+
+#ifdef __ANDROID__
+extern "C"
+#endif
+
+int main(int argc, const char* args[]) {
+#if !defined(NDEBUG)
+	// setup signal handling
+	backward::SignalHandling sh;
+#endif
+
+	return 0;
+}

src/client/Client.cpp

@@ -1,11 +1,11 @@
-#include "game/client/Client.h"
-#include "misc/Format.h"
+#include "client/Client.h"
+#include "td/misc/Format.h"
 
-#include "protocol/packets/DisconnectPacket.h"
-#include "protocol/packets/PlaceTowerPacket.h"
-#include "protocol/packets/RemoveTowerPacket.h"
-#include "protocol/packets/SelectTeamPacket.h"
-#include "protocol/packets/UpgradeTowerPacket.h"
+#include "td/protocol/packets/DisconnectPacket.h"
+#include "td/protocol/packets/PlaceTowerPacket.h"
+#include "td/protocol/packets/RemoveTowerPacket.h"
+#include "td/protocol/packets/SelectTeamPacket.h"
+#include "td/protocol/packets/UpgradeTowerPacket.h"
 
 namespace td {
 namespace client {

src/client/ClientConnexion.cpp

@@ -1,11 +1,11 @@
-#include "game/client/ClientConnexion.h"
-#include "render/WorldRenderer.h"
+#include "client/ClientConnexion.h"
+#include "client/render/WorldRenderer.h"
 
-#include "protocol/packets/ConnectionInfoPacket.h"
-#include "protocol/packets/DisconnectPacket.h"
-#include "protocol/packets/KeepAlivePacket.h"
-#include "protocol/packets/PlayerLoginPacket.h"
-#include "protocol/packets/ServerTpsPacket.h"
+#include "td/protocol/packets/ConnectionInfoPacket.h"
+#include "td/protocol/packets/DisconnectPacket.h"
+#include "td/protocol/packets/KeepAlivePacket.h"
+#include "td/protocol/packets/PlayerLoginPacket.h"
+#include "td/protocol/packets/ServerTpsPacket.h"
 
 namespace td {
 namespace client {

src/client/game/ClientGame.cpp

@@ -1,18 +1,18 @@
-#include "game/client/ClientGame.h"
-#include "protocol/PacketDispatcher.h"
-#include "game/client/Client.h"
+#include "client/game/ClientGame.h"
+#include "td/protocol/PacketDispatcher.h"
+#include "client/Client.h"
 
-#include "protocol/packets/ConnectionInfoPacket.h"
-#include "protocol/packets/PlayerJoinPacket.h"
-#include "protocol/packets/PlayerListPacket.h"
-#include "protocol/packets/PlayerLeavePacket.h"
-#include "protocol/packets/UpdatePlayerTeamPacket.h"
-#include "protocol/packets/UpdateLobbyTimePacket.h"
-#include "protocol/packets/UpdateGameStatePacket.h"
-#include "protocol/packets/UpdateMoneyPacket.h"
-#include "protocol/packets/UpdateExpPacket.h"
-#include "protocol/packets/DisconnectPacket.h"
-#include "protocol/packets/WorldDataPacket.h"
+#include "td/protocol/packets/ConnectionInfoPacket.h"
+#include "td/protocol/packets/PlayerJoinPacket.h"
+#include "td/protocol/packets/PlayerListPacket.h"
+#include "td/protocol/packets/PlayerLeavePacket.h"
+#include "td/protocol/packets/UpdatePlayerTeamPacket.h"
+#include "td/protocol/packets/UpdateLobbyTimePacket.h"
+#include "td/protocol/packets/UpdateGameStatePacket.h"
+#include "td/protocol/packets/UpdateMoneyPacket.h"
+#include "td/protocol/packets/UpdateExpPacket.h"
+#include "td/protocol/packets/DisconnectPacket.h"
+#include "td/protocol/packets/WorldDataPacket.h"
 
 namespace td {
 namespace client {

src/client/game/WorldClient.cpp

@@ -1,16 +1,16 @@
-#include "game/client/WorldClient.h"
-#include "protocol/PacketDispatcher.h"
-#include "game/client/ClientGame.h"
-#include "render/WorldRenderer.h"
+#include "client/game/WorldClient.h"
+#include "td/protocol/PacketDispatcher.h"
+#include "client/game/ClientGame.h"
+#include "client/render/WorldRenderer.h"
 
-#include "protocol/packets/WorldAddTowerPacket.h"
-#include "protocol/packets/WorldBeginDataPacket.h"
-#include "protocol/packets/WorldDataPacket.h"
-#include "protocol/packets/SpawnMobPacket.h"
-#include "protocol/packets/UpgradeTowerPacket.h"
-#include "protocol/packets/RemoveTowerPacket.h"
-#include "protocol/packets/UpdateCastleLifePacket.h"
-#include "protocol/packets/UpdateMobStatesPacket.h"
+#include "td/protocol/packets/WorldAddTowerPacket.h"
+#include "td/protocol/packets/WorldBeginDataPacket.h"
+#include "td/protocol/packets/WorldDataPacket.h"
+#include "td/protocol/packets/SpawnMobPacket.h"
+#include "td/protocol/packets/UpgradeTowerPacket.h"
+#include "td/protocol/packets/RemoveTowerPacket.h"
+#include "td/protocol/packets/UpdateCastleLifePacket.h"
+#include "td/protocol/packets/UpdateMobStatesPacket.h"
 
 namespace td {
 namespace client {

src/client/render/Renderer.cpp

@@ -5,15 +5,17 @@
  *      Author: simon
  */
 
-#include "render/Renderer.h"
-#include "render/GL.h"
 #include <stdio.h>
-#include "misc/Time.h"
-#include "misc/Easing.h"
-#include "misc/Maths.h"
 
-#include <misc/Log.h>
-#include <misc/Format.h>
+#include "client/render/Renderer.h"
+#include "client/render/GL.h"
+
+#include "td/misc/Time.h"
+#include "td/misc/Easing.h"
+#include "td/misc/Maths.h"
+#include "td/misc/Log.h"
+#include "td/misc/Format.h"
+
 
 namespace td {
 namespace render {

src/client/render/VertexCache.cpp

@@ -1,5 +1,5 @@
-#include "render/VertexCache.h"
-#include "render/loader/GLLoader.h"
+#include "client/render/VertexCache.h"
+#include "client/render/loader/GLLoader.h"
 
 namespace td {
 namespace render {

src/client/render/WorldRenderer.cpp

@@ -1,12 +1,12 @@
-#include "render/WorldRenderer.h"
-#include "render/loader/WorldLoader.h"
-#include "render/Renderer.h"
-#include "render/gui/imgui/imgui.h"
+#include "client/render/WorldRenderer.h"
+#include "client/render/loader/WorldLoader.h"
+#include "client/render/Renderer.h"
+#include "client/render/gui/imgui/imgui.h"
 #include "gui/imgui/imgui_internal.h"
-#include "window/Display.h"
-#include "game/client/ClientGame.h"
-#include "game/client/Client.h"
-#include "misc/Format.h"
+#include "client/window/Display.h"
+#include "client/game/ClientGame.h"
+#include "client/Client.h"
+#include "td/misc/Format.h"
 
 namespace td {
 namespace render {

src/client/render/gui/CastleTooltip.cpp

@@ -1,11 +1,11 @@
-#include "render/gui/CastleTooltip.h"
-#include "render/gui/imgui/imgui.h"
-#include "render/gui/LifeProgress.h"
-#include "render/gui/ImGuiTeamColor.h"
+#include "client/render/gui/CastleTooltip.h"
+#include "client/render/gui/imgui/imgui.h"
+#include "client/render/gui/LifeProgress.h"
+#include "client/render/gui/ImGuiTeamColor.h"
 
-#include "render/WorldRenderer.h"
+#include "client/render/WorldRenderer.h"
 
-#include "game/client/Client.h"
+#include "client/Client.h"
 
 namespace td {
 namespace gui {

src/client/render/gui/FrameMenu.cpp

@@ -1,7 +1,7 @@
-#include "render/gui/FrameMenu.h"
-#include "render/gui/imgui/imgui.h"
+#include "client/render/gui/FrameMenu.h"
+#include "client/render/gui/imgui/imgui.h"
 
-#include "game/client/Client.h"
+#include "client/Client.h"
 
 #include <SDL2/SDL.h>
 

src/client/render/gui/GameMenu.cpp

@@ -1,11 +1,11 @@
-#include "render/gui/GameMenu.h"
-#include "render/gui/imgui/imgui.h"
-#include "render/gui/ImGuiTeamColor.h"
+#include "client/render/gui/GameMenu.h"
+#include "client/render/gui/imgui/imgui.h"
+#include "client/render/gui/ImGuiTeamColor.h"
 
-#include "render/WorldRenderer.h"
+#include "client/render/WorldRenderer.h"
 
-#include "game/client/Client.h"
-#include "game/server/Lobby.h"
+#include "client/Client.h"
+#include "server/Lobby.h"
 
 namespace td {
 namespace gui {

src/client/render/gui/ImGuiTeamColor.cpp

@@ -1,4 +1,4 @@
-#include "render/gui/ImGuiTeamColor.h"
+#include "client/render/gui/ImGuiTeamColor.h"
 
 namespace td {
 namespace render {

src/client/render/gui/LifeProgress.cpp

@@ -1,6 +1,6 @@
-#include "render/gui/LifeProgress.h"
+#include "client/render/gui/LifeProgress.h"
 
-#include "render/gui/imgui/imgui.h"
+#include "client/render/gui/imgui/imgui.h"
 
 namespace td {
 namespace gui {

src/client/render/gui/MainMenu.cpp

@@ -1,8 +1,8 @@
-#include "render/gui/MainMenu.h"
+#include "client/render/gui/MainMenu.h"
 
-#include "game/client/Client.h"
+#include "client/Client.h"
 
-#include "game/server/Server.h"
+#include "server/Server.h"
 
 namespace td {
 namespace gui {

src/client/render/gui/MobTooltip.cpp

@@ -1,13 +1,13 @@
-#include "render/gui/MobTooltip.h"
-#include "render/gui/imgui/imgui.h"
-#include "render/gui/LifeProgress.h"
-#include "render/gui/ImGuiTeamColor.h"
+#include "client/render/gui/MobTooltip.h"
+#include "client/render/gui/imgui/imgui.h"
+#include "client/render/gui/LifeProgress.h"
+#include "client/render/gui/ImGuiTeamColor.h"
 
-#include "render/WorldRenderer.h"
+#include "client/render/WorldRenderer.h"
 
-#include "game/Mobs.h"
+#include "td/game/Mobs.h"
 
-#include "game/client/Client.h"
+#include "client/Client.h"
 
 namespace td {
 namespace gui {

src/client/render/gui/SummonMenu.cpp

@@ -1,6 +1,6 @@
-#include "render/gui/SummonMenu.h"
-#include "game/client/Client.h"
-#include "render/gui/imgui/imgui.h"
+#include "client/render/gui/SummonMenu.h"
+#include "client/Client.h"
+#include "client/render/gui/imgui/imgui.h"
 
 namespace td {
 namespace gui {

src/client/render/gui/TowerGui.cpp

@@ -5,18 +5,18 @@
  *      Author: simon
  */
 
-#include "render/gui/TowerGui.h"
-#include "render/gui/imgui/imgui.h"
+#include "client/render/gui/TowerGui.h"
+#include "client/render/gui/imgui/imgui.h"
 
-#include "render/gui/MainMenu.h"
-#include "render/gui/GameMenu.h"
-#include "render/gui/FrameMenu.h"
-#include "render/gui/UpdateMenu.h"
+#include "client/render/gui/MainMenu.h"
+#include "client/render/gui/GameMenu.h"
+#include "client/render/gui/FrameMenu.h"
+#include "client/render/gui/UpdateMenu.h"
 
 #include "imgui/imgui_impl_opengl3.h"
 #include "imgui/imgui_impl_sdl.h"
 
-#include "game/client/Client.h"
+#include "client/Client.h"
 
 namespace td {
 namespace render {

src/client/render/gui/TowerPlacePopup.cpp

@@ -1,10 +1,10 @@
-#include "render/gui/TowerPlacePopup.h"
+#include "client/render/gui/TowerPlacePopup.h"
 
-#include "render/gui/imgui/imgui.h"
+#include "client/render/gui/imgui/imgui.h"
 
-#include "game/Towers.h"
+#include "td/game/Towers.h"
 
-#include "game/client/Client.h"
+#include "client/Client.h"
 
 namespace td {
 namespace gui {

src/client/render/gui/TowerUpgradePopup.cpp

@@ -1,10 +1,10 @@
-#include "render/gui/TowerUpgradePopup.h"
+#include "client/render/gui/TowerUpgradePopup.h"
 
-#include "render/gui/imgui/imgui.h"
+#include "client/render/gui/imgui/imgui.h"
 
-#include "game/Towers.h"
+#include "td/game/Towers.h"
 
-#include "game/client/Client.h"
+#include "client/Client.h"
 
 namespace td {
 namespace gui {

src/client/render/gui/UpdateMenu.cpp

@@ -1,8 +1,8 @@
-#include "render/gui/UpdateMenu.h"
+#include "client/render/gui/UpdateMenu.h"
 
-#include "updater/Updater.h"
+#include "client/updater/Updater.h"
 
-#include "render/gui/imgui/imgui.h"
+#include "client/render/gui/imgui/imgui.h"
 
 #include <chrono>
 

src/client/render/gui/imgui/imgui.cpp

@@ -776,7 +776,7 @@ CODE
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "render/gui/imgui/imgui.h"
+#include "client/render/gui/imgui/imgui.h"
 #ifndef IMGUI_DISABLE
 
 #ifndef IMGUI_DEFINE_MATH_OPERATORS

src/client/render/gui/imgui/imgui_demo.cpp

@@ -75,7 +75,7 @@ Index of this file:
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "render/gui/imgui/imgui.h"
+#include "client/render/gui/imgui/imgui.h"
 #ifndef IMGUI_DISABLE
 
 // System includes

src/client/render/gui/imgui/imgui_draw.cpp

@@ -26,7 +26,7 @@ Index of this file:
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "render/gui/imgui/imgui.h"
+#include "client/render/gui/imgui/imgui.h"
 #ifndef IMGUI_DISABLE
 
 #ifndef IMGUI_DEFINE_MATH_OPERATORS
@@ -35,7 +35,7 @@ Index of this file:
 
 #include "imgui_internal.h"
 #ifdef IMGUI_ENABLE_FREETYPE
-#include "misc/freetype/imgui_freetype.h"
+#include "td/misc/freetype/imgui_freetype.h"
 #endif
 
 #include <stdio.h>      // vsnprintf, sscanf, printf

src/client/render/gui/imgui/imgui_filebrowser.cpp

@@ -1,4 +1,4 @@
-#include "render/gui/imgui/imgui_filebrowser.h"
+#include "client/render/gui/imgui/imgui_filebrowser.h"
 #ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
 #endif

src/client/render/gui/imgui/imgui_impl_opengl3.cpp

@@ -71,7 +71,7 @@
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "render/gui/imgui/imgui.h"
+#include "client/render/gui/imgui/imgui.h"
 #include "imgui_impl_opengl3.h"
 #include <stdio.h>
 #if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier

src/client/render/gui/imgui/imgui_impl_opengl3.h

@@ -22,7 +22,7 @@
 //  Only override if your GL version doesn't handle this GLSL version. See GLSL version table at the top of imgui_impl_opengl3.cpp.
 
 #pragma once
-#include "render/gui/imgui/imgui.h"      // IMGUI_IMPL_API
+#include "client/render/gui/imgui/imgui.h"      // IMGUI_IMPL_API
 
 // Backend API
 IMGUI_IMPL_API bool     ImGui_ImplOpenGL3_Init(const char* glsl_version = NULL);

src/client/render/gui/imgui/imgui_impl_sdl.cpp

@@ -50,7 +50,7 @@
 //  2017-08-25: Inputs: MousePos set to -FLT_MAX,-FLT_MAX when mouse is unavailable/missing (instead of -1,-1).
 //  2016-10-15: Misc: Added a void* user_data parameter to Clipboard function handlers.
 
-#include "render/gui/imgui/imgui.h"
+#include "client/render/gui/imgui/imgui.h"
 #include "imgui_impl_sdl.h"
 
 // SDL

src/client/render/gui/imgui/imgui_impl_sdl.h

@@ -16,7 +16,7 @@
 // Read online: https://github.com/ocornut/imgui/tree/master/docs
 
 #pragma once
-#include "render/gui/imgui/imgui.h"      // IMGUI_IMPL_API
+#include "client/render/gui/imgui/imgui.h"      // IMGUI_IMPL_API
 
 struct SDL_Window;
 typedef union SDL_Event SDL_Event;

src/client/render/gui/imgui/imgui_internal.h

@@ -44,7 +44,7 @@ Index of this file:
 //-----------------------------------------------------------------------------
 
 #ifndef IMGUI_VERSION
-#include "render/gui/imgui/imgui.h"
+#include "client/render/gui/imgui/imgui.h"
 #endif
 
 #include <stdio.h>      // FILE*, sscanf

src/client/render/gui/imgui/imgui_tables.cpp

@@ -188,7 +188,7 @@ Index of this file:
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "render/gui/imgui/imgui.h"
+#include "client/render/gui/imgui/imgui.h"
 #ifndef IMGUI_DISABLE
 
 #ifndef IMGUI_DEFINE_MATH_OPERATORS

src/client/render/gui/imgui/imgui_widgets.cpp

@@ -32,7 +32,7 @@ Index of this file:
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "render/gui/imgui/imgui.h"
+#include "client/render/gui/imgui/imgui.h"
 #ifndef IMGUI_DISABLE
 
 #ifndef IMGUI_DEFINE_MATH_OPERATORS

src/client/render/loader/GLLoader.cpp

@@ -6,8 +6,8 @@
  */
 
 
-#include "render/loader/GLLoader.h"
-#include "render/GL.h"
+#include "client/render/loader/GLLoader.h"
+#include "client/render/GL.h"
 
 namespace GL {
 

src/client/render/loader/TextureLoader.cpp

@@ -5,11 +5,11 @@
  *      Author: simon
  */
 
-#include "render/loader/TextureLoader.h"
+#include "client/render/loader/TextureLoader.h"
 #define STB_IMAGE_IMPLEMENTATION
-#include "render/loader/stb_image.h"
+#include "client/render/loader/stb_image.h"
 #include <iostream>
-#include "render/GL.h"
+#include "client/render/GL.h"
 
 namespace TextureLoader {
 

src/client/render/loader/WorldLoader.cpp

@@ -1,9 +1,9 @@
-#include "render/loader/WorldLoader.h"
+#include "client/render/loader/WorldLoader.h"
 
 #include <iostream>
 #include <string.h>
 
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace render {

src/client/render/shaders/EntityShader.cpp

@@ -1,4 +1,4 @@
-#include "render/shaders/EntityShader.h"
+#include "client/render/shaders/EntityShader.h"
 
 namespace td {
 namespace shader {

src/client/render/shaders/ShaderProgram.cpp

@@ -5,9 +5,9 @@
  *      Author: simon
  */
 
-#include "render/shaders/ShaderProgram.h"
-#include "misc/Log.h"
-#include "misc/Format.h"
+#include "client/render/shaders/ShaderProgram.h"
+#include "td/misc/Log.h"
+#include "td/misc/Format.h"
 
 #include <fstream>
 #include <iostream>

src/client/render/shaders/WorldShader.cpp

@@ -1,4 +1,4 @@
-#include "render/shaders/WorldShader.h"
+#include "client/render/shaders/WorldShader.h"
 
 namespace td {
 namespace shader {

src/client/updater/Updater.cpp

@@ -1,11 +1,11 @@
-#include "updater/Updater.h"
+#include "client/updater/Updater.h"
 
-#include "misc/Platform.h"
-#include "misc/DataBuffer.h"
-#include "misc/Log.h"
-#include "misc/Format.h"
+#include "td/misc/Platform.h"
+#include "td/misc/DataBuffer.h"
+#include "td/misc/Log.h"
+#include "td/misc/Format.h"
 
-#include "network/HttpLib.h"
+#include "td/network/HttpLib.h"
 
 #ifdef _WIN32
 #include <windows.h>

src/client/window/Display.cpp

@@ -5,16 +5,16 @@
  *      Author: simon
  */
 
-#include "window/Display.h"
+#include "client/window/Display.h"
 #define GLFW_INCLUDE_NONE
-#include "render/gui/TowerGui.h"
+#include "client/render/gui/TowerGui.h"
 #include <iostream>
-#include "game/GameManager.h"
-#include "render/Renderer.h"
-#include "render/WorldRenderer.h"
+#include "td/game/GameManager.h"
+#include "client/render/Renderer.h"
+#include "client/render/WorldRenderer.h"
 #include "../render/gui/imgui/imgui_impl_sdl.h"
-#include "misc/Log.h"
-#include "misc/Format.h"
+#include "td/misc/Log.h"
+#include "td/misc/Format.h"
 
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_video.h>

src/server/Lobby.cpp

@@ -1,9 +1,9 @@
-#include "game/server/Lobby.h"
-#include "game/server/Server.h"
+#include "server/Lobby.h"
+#include "server/Server.h"
 
-#include "protocol/packets/UpdateLobbyTimePacket.h"
+#include "td/protocol/packets/UpdateLobbyTimePacket.h"
 
-#include "misc/Time.h"
+#include "td/misc/Time.h"
 
 #ifdef NDEBUG
 #define MIN_PLAYER_WAITING 2

src/server/Server.cpp

@@ -1,11 +1,11 @@
-#include "game/server/Server.h"
-#include "protocol/PacketFactory.h"
+#include "server/Server.h"
+#include "td/protocol/PacketFactory.h"
 
-#include "protocol/packets/DisconnectPacket.h"
-#include "protocol/packets/ServerTpsPacket.h"
-#include "protocol/packets/PlayerLeavePacket.h"
+#include "td/protocol/packets/DisconnectPacket.h"
+#include "td/protocol/packets/ServerTpsPacket.h"
+#include "td/protocol/packets/PlayerLeavePacket.h"
 
-#include "misc/Format.h"
+#include "td/misc/Format.h"
 
 namespace td {
 namespace server {

src/server/ServerConnexion.cpp

@@ -1,27 +1,27 @@
-#include "game/server/ServerConnexion.h"
-#include "protocol/PacketDispatcher.h"
-#include "protocol/PacketFactory.h"
-#include "game/server/Server.h"
+#include "server/ServerConnexion.h"
+#include "td/protocol/PacketDispatcher.h"
+#include "td/protocol/PacketFactory.h"
+#include "server/Server.h"
 
-#include "protocol/packets/ConnectionInfoPacket.h"
-#include "protocol/packets/DisconnectPacket.h"
-#include "protocol/packets/KeepAlivePacket.h"
-#include "protocol/packets/PlaceTowerPacket.h"
-#include "protocol/packets/PlayerLoginPacket.h"
-#include "protocol/packets/PlayerJoinPacket.h"
-#include "protocol/packets/PlayerListPacket.h"
-#include "protocol/packets/RemoveTowerPacket.h"
-#include "protocol/packets/SelectTeamPacket.h"
-#include "protocol/packets/SendMobsPacket.h"
-#include "protocol/packets/UpdatePlayerTeamPacket.h"
-#include "protocol/packets/UpdateGameStatePacket.h"
-#include "protocol/packets/UpgradeTowerPacket.h"
-#include "protocol/packets/WorldBeginDataPacket.h"
-#include "protocol/packets/WorldDataPacket.h"
-#include "protocol/packets/WorldAddTowerPacket.h"
+#include "td/protocol/packets/ConnectionInfoPacket.h"
+#include "td/protocol/packets/DisconnectPacket.h"
+#include "td/protocol/packets/KeepAlivePacket.h"
+#include "td/protocol/packets/PlaceTowerPacket.h"
+#include "td/protocol/packets/PlayerLoginPacket.h"
+#include "td/protocol/packets/PlayerJoinPacket.h"
+#include "td/protocol/packets/PlayerListPacket.h"
+#include "td/protocol/packets/RemoveTowerPacket.h"
+#include "td/protocol/packets/SelectTeamPacket.h"
+#include "td/protocol/packets/SendMobsPacket.h"
+#include "td/protocol/packets/UpdatePlayerTeamPacket.h"
+#include "td/protocol/packets/UpdateGameStatePacket.h"
+#include "td/protocol/packets/UpgradeTowerPacket.h"
+#include "td/protocol/packets/WorldBeginDataPacket.h"
+#include "td/protocol/packets/WorldDataPacket.h"
+#include "td/protocol/packets/WorldAddTowerPacket.h"
 
-#include "misc/Time.h"
-#include "misc/Random.h"
+#include "td/misc/Time.h"
+#include "td/misc/Random.h"
 
 #include <chrono>
 

src/server/game/ServerGame.cpp

@@ -1,14 +1,14 @@
-#include "game/server/ServerGame.h"
-#include "game/server/Server.h"
+#include "server/game/ServerGame.h"
+#include "server/Server.h"
 
-#include "protocol/packets/DisconnectPacket.h"
-#include "protocol/packets/UpdatePlayerTeamPacket.h"
-#include "protocol/packets/UpdateGameStatePacket.h"
-#include "protocol/packets/UpdateMoneyPacket.h"
-#include "protocol/packets/UpdateExpPacket.h"
-#include "protocol/packets/UpdateMobStatesPacket.h"
-#include "protocol/packets/WorldDataPacket.h"
-#include "protocol/packets/WorldBeginDataPacket.h"
+#include "td/protocol/packets/DisconnectPacket.h"
+#include "td/protocol/packets/UpdatePlayerTeamPacket.h"
+#include "td/protocol/packets/UpdateGameStatePacket.h"
+#include "td/protocol/packets/UpdateMoneyPacket.h"
+#include "td/protocol/packets/UpdateExpPacket.h"
+#include "td/protocol/packets/UpdateMobStatesPacket.h"
+#include "td/protocol/packets/WorldDataPacket.h"
+#include "td/protocol/packets/WorldBeginDataPacket.h"
 
 namespace td {
 namespace server {

src/server/game/ServerWorld.cpp

@@ -1,9 +1,9 @@
-#include "game/server/ServerWorld.h"
-#include "game/server/Server.h"
-#include "misc/Random.h"
+#include "server/game/ServerWorld.h"
+#include "server/Server.h"
+#include "td/misc/Random.h"
 
-#include "protocol/packets/SpawnMobPacket.h"
-#include "protocol/packets/UpdateCastleLifePacket.h"
+#include "td/protocol/packets/SpawnMobPacket.h"
+#include "td/protocol/packets/UpdateCastleLifePacket.h"
 
 #define MOB_SPAWN_PRECISION 100.0f
 

src/td/game/BaseGame.cpp

@@ -1,4 +1,4 @@
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace game {

src/td/game/Mobs.cpp

@@ -1,6 +1,6 @@
-#include "game/Mobs.h"
-#include "game/Player.h"
-#include "game/World.h"
+#include "td/game/Mobs.h"
+#include "td/game/Player.h"
+#include "td/game/World.h"
 
 #include <map>
 #include <algorithm>

src/td/game/Team.cpp

@@ -1,4 +1,4 @@
-#include "game/Player.h"
+#include "td/game/Player.h"
 
 #include <algorithm>
 

src/td/game/Towers.cpp

@@ -1,5 +1,5 @@
-#include "game/Towers.h"
-#include "game/World.h"
+#include "td/game/Towers.h"
+#include "td/game/World.h"
 
 #include <map>
 

src/td/game/World.cpp

@@ -1,12 +1,12 @@
-#include "game/World.h"
-#include "protocol/PacketDispatcher.h"
-#include "protocol/Protocol.h"
-#include "protocol/packets/WorldBeginDataPacket.h"
-#include "protocol/packets/WorldDataPacket.h"
-#include "game/BaseGame.h"
-#include "misc/Random.h"
-#include "misc/Compression.h"
-#include "misc/Format.h"
+#include "td/game/World.h"
+#include "td/protocol/PacketDispatcher.h"
+#include "td/protocol/Protocol.h"
+#include "td/protocol/packets/WorldBeginDataPacket.h"
+#include "td/protocol/packets/WorldDataPacket.h"
+#include "td/game/BaseGame.h"
+#include "td/misc/Random.h"
+#include "td/misc/Compression.h"
+#include "td/misc/Format.h"
 
 #include <cmath>
 

src/td/game/towers/ArcherTower.cpp

@@ -1,5 +1,5 @@
-#include "game/Towers.h"
-#include "game/World.h"
+#include "td/game/Towers.h"
+#include "td/game/World.h"
 
 namespace td {
 namespace game {

src/td/game/towers/ArtilleryTower.cpp

@@ -1,5 +1,5 @@
-#include "game/Towers.h"
-#include "game/World.h"
+#include "td/game/Towers.h"
+#include "td/game/World.h"
 
 namespace td {
 namespace game {

src/td/game/towers/IceTower.cpp

@@ -1,5 +1,5 @@
-#include "game/Towers.h"
-#include "game/World.h"
+#include "td/game/Towers.h"
+#include "td/game/World.h"
 
 namespace td {
 namespace game {

src/td/game/towers/LeachTower.cpp

@@ -1,5 +1,5 @@
-#include "game/Towers.h"
-#include "game/World.h"
+#include "td/game/Towers.h"
+#include "td/game/World.h"
 
 namespace td {
 namespace game {

src/td/game/towers/MageTower.cpp

@@ -1,5 +1,5 @@
-#include "game/Towers.h"
-#include "game/World.h"
+#include "td/game/Towers.h"
+#include "td/game/World.h"
 
 namespace td {
 namespace game {

src/td/game/towers/Necromancer.cpp

@@ -1,5 +1,5 @@
-#include "game/Towers.h"
-#include "game/World.h"
+#include "td/game/Towers.h"
+#include "td/game/World.h"
 
 namespace td {
 namespace game {

src/td/game/towers/PoisonTower.cpp

@@ -1,5 +1,5 @@
-#include "game/Towers.h"
-#include "game/World.h"
+#include "td/game/Towers.h"
+#include "td/game/World.h"
 
 namespace td {
 namespace game {

src/td/game/towers/QuakeTower.cpp

@@ -1,5 +1,5 @@
-#include "game/Towers.h"
-#include "game/World.h"
+#include "td/game/Towers.h"
+#include "td/game/World.h"
 
 namespace td {
 namespace game {

src/td/game/towers/SorcererTower.cpp

@@ -1,5 +1,5 @@
-#include "game/Towers.h"
-#include "game/World.h"
+#include "td/game/Towers.h"
+#include "td/game/World.h"
 
 namespace td {
 namespace game {

src/td/game/towers/TurretTower.cpp

@@ -1,5 +1,5 @@
-#include "game/Towers.h"
-#include "game/World.h"
+#include "td/game/Towers.h"
+#include "td/game/World.h"
 
 namespace td {
 namespace game {

src/td/game/towers/ZeusTower.cpp

@@ -1,5 +1,5 @@
-#include "game/Towers.h"
-#include "game/World.h"
+#include "td/game/Towers.h"
+#include "td/game/World.h"
 
 namespace td {
 namespace game {

src/td/misc/Compression.cpp

@@ -1,4 +1,4 @@
-#include "misc/Compression.h"
+#include "td/misc/Compression.h"
 
 #include <zlib.h>
 #include <cassert>

src/td/misc/DataBuffer.cpp

@@ -1,4 +1,4 @@
-#include "misc/DataBuffer.h"
+#include "td/misc/DataBuffer.h"
 
 #include <iomanip>
 #include <fstream>

src/td/misc/Easing.cpp

@@ -1,4 +1,4 @@
-#include "misc/Easing.h"
+#include "td/misc/Easing.h"
 
 #include <cmath>
 

src/td/misc/Log.cpp

@@ -1,4 +1,4 @@
-#include "misc/Log.h"
+#include "td/misc/Log.h"
 
 #ifdef __ANDROID__
 #include <android/log.h>

src/td/misc/Maths.cpp

@@ -1,4 +1,4 @@
-#include "misc/Maths.h"
+#include "td/misc/Maths.h"
 
 #include <cassert>
 

src/td/misc/Shapes.cpp

@@ -1,4 +1,4 @@
-#include "misc/Shapes.h"
+#include "td/misc/Shapes.h"
 
 #include <algorithm>
 #include <cmath>

src/td/misc/Time.cpp

@@ -1,4 +1,4 @@
-#include "misc/Time.h"
+#include "td/misc/Time.h"
 
 #include <chrono>
 #include <algorithm>

src/td/network/Connexion.cpp

@@ -1,10 +1,9 @@
-#include "game/Connexion.h"
-#include "protocol/PacketDispatcher.h"
-#include "protocol/PacketFactory.h"
-#include "game/server/Server.h"
-#include "misc/Compression.h"
+#include "td/network/Connexion.h"
+#include "td/protocol/PacketDispatcher.h"
+#include "td/protocol/PacketFactory.h"
+#include "td/misc/Compression.h"
 
-#include "misc/Time.h"
+#include "td/misc/Time.h"
 
 #include <iostream>
 #include <chrono>

src/td/network/IPAddress.cpp

@@ -1,4 +1,4 @@
-#include "network/IPAddress.h"
+#include "td/network/IPAddress.h"
 
 #include <regex>
 #include <stdexcept>

src/td/network/Network.cpp

@@ -1,4 +1,4 @@
-#include "network/Network.h"
+#include "td/network/Network.h"
 
 namespace td {
 namespace network {

src/td/network/Socket.cpp

@@ -1,7 +1,7 @@
-#include "network/Socket.h"
+#include "td/network/Socket.h"
 
-#include "network/IPAddress.h"
-#include "network/Network.h"
+#include "td/network/IPAddress.h"
+#include "td/network/Network.h"
 
 #ifdef _WIN32
 #define ioctl ioctlsocket

src/td/network/TCPListener.cpp

@@ -1,4 +1,4 @@
-#include "network/TCPListener.h"
+#include "td/network/TCPListener.h"
 
 #include <fcntl.h>
 

src/td/network/TCPSocket.cpp

@@ -1,5 +1,5 @@
-#include "network/TCPSocket.h"
-#include "misc/Compression.h"
+#include "td/network/TCPSocket.h"
+#include "td/misc/Compression.h"
 
 #include <iostream>
 

src/td/network/UDPSocket.cpp

@@ -1,4 +1,4 @@
-#include "network/UDPSocket.h"
+#include "td/network/UDPSocket.h"
 
 #include <iostream>
 

src/td/protocol/PacketDispatcher.cpp

@@ -1,4 +1,4 @@
-#include "protocol/PacketDispatcher.h"
+#include "td/protocol/PacketDispatcher.h"
 
 namespace td {
 namespace protocol {

src/td/protocol/PacketFactory.cpp

@@ -1,5 +1,5 @@
-#include "protocol/PacketFactory.h"
-#include "protocol/Packets.h"
+#include "td/protocol/PacketFactory.h"
+#include "td/protocol/Packets.h"
 #include <map>
 #include <functional>
 

src/td/protocol/Protocol.cpp

@@ -1,5 +1,5 @@
-#include "protocol/PacketHandler.h"
-#include "protocol/Packets.h"
+#include "td/protocol/PacketHandler.h"
+#include "td/protocol/Packets.h"
 
 #define REGISTER_DISPATCH_CLASS(className)  void className::Dispatch(PacketHandler* handler) const { \
                                                 handler->HandlePacket(this);\

src/td/protocol/packets/ConnectionInfoPacket.cpp

@@ -1,4 +1,4 @@
-#include "protocol/packets/ConnectionInfoPacket.h"
+#include "td/protocol/packets/ConnectionInfoPacket.h"
 
 namespace td {
 namespace protocol {

src/td/protocol/packets/DisconnectPacket.cpp

@@ -1,4 +1,4 @@
-#include "protocol/packets/DisconnectPacket.h"
+#include "td/protocol/packets/DisconnectPacket.h"
 
 namespace td {
 namespace protocol {

src/td/protocol/packets/KeepAlivePacket.cpp

@@ -1,4 +1,4 @@
-#include "protocol/packets/KeepAlivePacket.h"
+#include "td/protocol/packets/KeepAlivePacket.h"
 
 namespace td {
 namespace protocol {

src/td/protocol/packets/PlaceTowerPacket.cpp

@@ -1,4 +1,4 @@
-#include "protocol/packets/PlaceTowerPacket.h"
+#include "td/protocol/packets/PlaceTowerPacket.h"
 
 namespace td {
 namespace protocol {

src/td/protocol/packets/PlayerBuyItemPacket.cpp

@@ -1,4 +1,4 @@
-#include "protocol/packets/PlayerBuyItemPacket.h"
+#include "td/protocol/packets/PlayerBuyItemPacket.h"
 
 namespace td {
 namespace protocol {

src/td/protocol/packets/PlayerBuyMobUpgradePacket.cpp

@@ -1,4 +1,4 @@
-#include "protocol/packets/PlayerBuyMobUpgradePacket.h"
+#include "td/protocol/packets/PlayerBuyMobUpgradePacket.h"
 
 namespace td {
 namespace protocol {

src/td/protocol/packets/PlayerJoinPacket.cpp

@@ -1,4 +1,4 @@
-#include "protocol/packets/PlayerJoinPacket.h"
+#include "td/protocol/packets/PlayerJoinPacket.h"
 
 namespace td {
 namespace protocol {

src/td/protocol/packets/PlayerLeavePacket.cpp

@@ -1,4 +1,4 @@
-#include "protocol/packets/PlayerLeavePacket.h"
+#include "td/protocol/packets/PlayerLeavePacket.h"
 
 namespace td {
 namespace protocol {

src/td/protocol/packets/PlayerListPacket.cpp

@@ -1,4 +1,4 @@
-#include "protocol/packets/PlayerListPacket.h"
+#include "td/protocol/packets/PlayerListPacket.h"
 
 namespace td {
 namespace protocol {

src/td/protocol/packets/PlayerLoginPacket.cpp

@@ -1,4 +1,4 @@
-#include "protocol/packets/PlayerLoginPacket.h"
+#include "td/protocol/packets/PlayerLoginPacket.h"
 
 namespace td {
 namespace protocol {

src/td/protocol/packets/RemoveTowerPacket.cpp

@@ -1,4 +1,4 @@
-#include "protocol/packets/RemoveTowerPacket.h"
+#include "td/protocol/packets/RemoveTowerPacket.h"
 
 namespace td {
 namespace protocol {

src/td/protocol/packets/SelectTeamPacket.cpp

@@ -1,4 +1,4 @@
-#include "protocol/packets/SelectTeamPacket.h"
+#include "td/protocol/packets/SelectTeamPacket.h"
 
 namespace td {
 namespace protocol {

src/td/protocol/packets/SendMobsPacket.cpp

@@ -1,4 +1,4 @@
-#include "protocol/packets/SendMobsPacket.h"
+#include "td/protocol/packets/SendMobsPacket.h"
 
 namespace td {
 namespace protocol {

src/td/protocol/packets/ServerTpsPacket.cpp

@@ -1,4 +1,4 @@
-#include "protocol/packets/ServerTpsPacket.h"
+#include "td/protocol/packets/ServerTpsPacket.h"
 
 namespace td {
 namespace protocol {

src/td/protocol/packets/SpawnMobPacket.cpp

@@ -1,4 +1,4 @@
-#include "protocol/packets/SpawnMobPacket.h"
+#include "td/protocol/packets/SpawnMobPacket.h"
 
 namespace td {
 namespace protocol {

src/td/protocol/packets/UpdateCastleLifePacket.cpp

@@ -1,4 +1,4 @@
-#include "protocol/packets/UpdateCastleLifePacket.h"
+#include "td/protocol/packets/UpdateCastleLifePacket.h"
 
 namespace td {
 namespace protocol {

src/td/protocol/packets/UpdateExpPacket.cpp

@@ -1,4 +1,4 @@
-#include "protocol/packets/UpdateExpPacket.h"
+#include "td/protocol/packets/UpdateExpPacket.h"
 
 namespace td {
 namespace protocol {

src/td/protocol/packets/UpdateGameStatePacket.cpp

@@ -1,4 +1,4 @@
-#include "protocol/packets/UpdateGameStatePacket.h"
+#include "td/protocol/packets/UpdateGameStatePacket.h"
 
 namespace td {
 namespace protocol {