Merge with main

src/Game.h

@@ -15,6 +15,8 @@
 #include <memory>
 #include <render/TextRenderer.h>
 
+#include <unordered_set>
+
 namespace ZL {
 
 	
@@ -73,7 +75,8 @@ namespace ZL {
 		std::vector<std::string> boxLabels;
 		std::unique_ptr<TextRenderer> textRenderer;
 
-		std::unordered_map<int, ClientStateInterval> latestRemotePlayers;
+		//std::unordered_map<int, ClientStateInterval> latestRemotePlayers;
+		std::unordered_map<int, ClientState> remotePlayerStates;
 
 		float newShipVelocity = 0;
 
@@ -116,6 +119,9 @@ namespace ZL {
 		uint64_t lastExplosionTime = 0;
 		const uint64_t explosionDurationMs = 500;
 
+
+		bool serverBoxesApplied = false;
+
 		static constexpr float MAX_DIST_SQ = 10000.f * 10000.f;
 		static constexpr float FADE_START = 6000.f;
 		static constexpr float FADE_RANGE = 4000.f;
@@ -124,7 +130,10 @@ namespace ZL {
 		static constexpr float MIN_SCALE = 0.4f;
 		static constexpr float MAX_SCALE = 0.8f;
 		static constexpr float CLOSE_DIST = 600.0f;
-		bool serverBoxesApplied = false;
+
+		std::unordered_set<int> deadRemotePlayers;
+
+
 	};