Refactoring: Changed HealthPickupSystem to use a struct instead. Removed the Id in EPickupSpawned

This commit is contained in:
verysecrethero
2016-02-05 18:05:46 +01:00
parent be628d9406
commit 4103c878ec
5 changed files with 71 additions and 17 deletions
+8 -2
View File
@@ -6,7 +6,7 @@
#include "Core/ResourceManager.h"
#include "Core/EntityFileParser.h"
#include "Core/EPickupSpawned.h"
#include "Core/EPlayerHealthPickup.h";
#include "Core/EPlayerHealthPickup.h"
#include "Engine/Collision/ETrigger.h"
#include "Common.h"
#include <tuple>
@@ -22,6 +22,12 @@ private:
EventRelay<PickupSpawnSystem, Events::TriggerTouch> m_ETriggerTouch;
bool OnTriggerTouch(Events::TriggerTouch& e);
std::vector<std::tuple<glm::vec3,double,double,double>> m_ETriggerTouchVector;
struct NewHealthPickup {
glm::vec3 Pos;
double HealthGain;
double RespawnTimer;
double DecreaseThisRespawnTimer;
};
std::vector<NewHealthPickup> m_ETriggerTouchVector;
};
#endif