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

experimental fix for pickup

Browse Source
This commit is contained in:
verysecrethero
2016-02-25 15:23:00 +01:00
parent bc227c3d61
commit 8740e8b77a
5 changed files with 81 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Game/Systems/AmmoPickupSystem.h
+9
View File
@@ -20,6 +20,8 @@ public:
private:
EventRelay<AmmoPickupSystem, Events::TriggerTouch> m_ETriggerTouch;
bool OnTriggerTouch(Events::TriggerTouch& e);
EventRelay<AmmoPickupSystem, Events::TriggerLeave> m_ETriggerLeave;
bool OnTriggerLeave(Events::TriggerLeave& e);
struct NewAmmoPickup {
glm::vec3 Pos;
@@ -28,6 +30,13 @@ private:
double DecreaseThisRespawnTimer;
EntityID parentID;
};
struct EntityAtMaxValuePickupStruct {
EntityWrapper player;
EntityWrapper pickup;
};
std::vector<NewAmmoPickup> m_ETriggerTouchVector;
std::vector<EntityAtMaxValuePickupStruct> m_AmmoPickupAtMaxHealthAmmo;
void DoPickup(EntityWrapper &player, EntityWrapper &trigger);
};
#endif