BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

experimental changes

Browse Source
This commit is contained in:
verysecrethero
2016-02-26 10:33:15 +01:00
parent 8740e8b77a
commit 10cd3bae40
2 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Game/Systems/AmmoPickupSystem.h
+4 -3
View File
@@ -23,19 +23,20 @@ private:
EventRelay<AmmoPickupSystem, Events::TriggerLeave> m_ETriggerLeave;
bool OnTriggerLeave(Events::TriggerLeave& e);
struct NewAmmoPickup {
struct NewPickup {
glm::vec3 Pos;
double AmmoGain;
double RespawnTimer;
double DecreaseThisRespawnTimer;
EntityID parentID;
bool isAmmoPickup;
};
struct EntityAtMaxValuePickupStruct {
EntityWrapper player;
EntityWrapper pickup;
};
std::vector<NewAmmoPickup> m_ETriggerTouchVector;
std::vector<EntityAtMaxValuePickupStruct> m_AmmoPickupAtMaxHealthAmmo;
std::vector<NewPickup> m_ETriggerTouchVector;
std::vector<EntityAtMaxValuePickupStruct> m_PickupAtMaximum;
void DoPickup(EntityWrapper &player, EntityWrapper &trigger);
};