merge

src/Game.h

@@ -8,6 +8,7 @@
 #include "UiManager.h"
 #include "Projectile.h"
 #include "utils/TaskManager.h"
+#include "network/NetworkInterface.h"
 #include <queue>
 
 namespace ZL {
@@ -34,6 +35,8 @@ namespace ZL {
 		Renderer renderer;
 		TaskManager taskManager;
 		MainThreadHandler mainThreadHandler;
+
+		std::unique_ptr<INetworkClient> networkClient;
 	private:
 		void processTickCount();
 		void drawScene();
@@ -41,7 +44,7 @@ namespace ZL {
 		void drawShip();
 		void drawBoxes();
 		void drawUI();
-
+		void drawRemoteShips();
 		void fireProjectiles();
 
 		void handleDown(int mx, int my);
@@ -59,6 +62,9 @@ namespace ZL {
 		std::vector<BoxCoords> boxCoordsArr;
 		std::vector<VertexRenderStruct> boxRenderArr;
 
+		std::unordered_map<int, ClientStateInterval> latestRemotePlayers;
+
+		float newShipVelocity = 0;
 
 		static const size_t CONST_TIMER_INTERVAL = 10;
 		static const size_t CONST_MAX_TIME_INTERVAL = 1000;