Merge remote-tracking branch 'origin/Menu' into WeaponSystem

# Conflicts: # resources/Schema/Entities/Player.xml # resources/Schema/Types/Entity.xsd # src/Game/Systems/PlayerSpawnSystem.cpp
2016-02-12 07:18:20 +01:00
parent 78e318c032 f146971db0
commit 47f4711b85
13 changed files with 1593 additions and 12 deletions
@@ -0,0 +1,39 @@
+#ifndef KillFeedSystem_h__
+#define KillFeedSystem_h__
+
+#include "../../Engine/Core/System.h"
+#include "../../Engine/GLM.h"
+#include "Core/EPlayerDeath.h"
+
+class KillFeedSystem : public ImpureSystem
+{
+public:
+    KillFeedSystem(SystemParams params)
+        : System(params)
+    {
+        EVENT_SUBSCRIBE_MEMBER(m_EPlayerDeath, &KillFeedSystem::OnPlayerDeath);
+
+    }
+
+    virtual void Update(double dt) override;
+
+private:
+
+
+
+
+    EventRelay<KillFeedSystem, Events::PlayerDeath> m_EPlayerDeath;
+    bool KillFeedSystem::OnPlayerDeath(Events::PlayerDeath& e);
+
+    struct KillFeedInfo
+    {
+        std::string Content;
+        glm::vec4 Color;
+        float TimeToLive = 5.f;
+    };
+
+    std::list<KillFeedInfo> m_DeathQueue;
+
+};
+
+#endif