Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch

include/Game/BallSystem.h

@@ -28,6 +28,7 @@
 #include "Game/EHitPad.h"
 #include "Game/EHitLag.h"
 #include "Game/EActionButton.h"
+#include "Game/CLifebuoy.h"
 
 namespace dd
 {

include/Game/LifebuoySystem.h

@@ -52,6 +52,16 @@ private:
     bool OnContact(const dd::Events::Contact &event);
 	bool OnPause(const dd::Events::Pause &event);
 	bool OnLifebuoy(const dd::Events::Lifebuoy &event);
+
+	struct LifeBuoyInfo
+	{
+		EntityID Entity;
+		float TimeToLive = 15.f;
+	};
+
+	float m_LeftEdge = -3.8f;
+	float m_RightEdge = 3.8f;
+	std::list<LifeBuoyInfo> m_LifeBuoys;
 };
 
 }