Modified HealthSystem so it actually publishes the DeathEvent. Modified EPlayerHealthPickup. Fixed 2 tests. Started work on PlayerDeathSystem

2016-01-27 14:46:45 +01:00
parent eb42217885
commit 5cdf6db340
10 changed files with 176 additions and 43 deletions
@@ -0,0 +1,39 @@
+#ifndef PlayerDeathSystem_h__
+#define PlayerDeathSystem_h__
+
+#include "Core/System.h"
+#include "Input/EInputCommand.h"
+#include "Systems/SpawnerSystem.h"
+#include "Events/ESpawnerSpawn.h"
+#include "Core/EPlayerSpawned.h"
+#include "Rendering/ESetCamera.h"
+#include "Core/ConfigFile.h"
+
+#include "Core/EPlayerDeath.h"
+//tests
+#include "Core/EPlayerDamage.h"
+
+class PlayerDeathSystem : public ImpureSystem
+{
+public:
+    PlayerDeathSystem(World* world, EventBroker* eventBroker);
+
+    virtual void Update(double dt) override;
+
+private:
+    struct SpawnRequest
+    {
+        int PlayerID;
+        ComponentInfo::EnumType Team;
+    };
+
+    bool m_NetworkEnabled = false;
+    std::vector<SpawnRequest> m_SpawnRequests;
+    std::map<int, EntityWrapper> m_PlayerEntities;
+
+    EventRelay<PlayerDeathSystem, Events::InputCommand> m_OnInputCommand;
+    bool OnInputCommand(const Events::InputCommand& e);
+    EventRelay<PlayerDeathSystem, Events::PlayerDeath> m_OnPlayerDeath;
+    bool OnPlayerDeath(Events::PlayerDeath& e);
+};
+#endif