Added the already-at-maxammo/health-save-trigger for the PickupSystems

2016-03-02 11:53:04 +01:00
parent 03a35d0f5e
commit 4652cd7861
4 changed files with 129 additions and 60 deletions
@@ -20,6 +20,9 @@ public:
 private:
    EventRelay<AmmoPickupSystem, Events::TriggerTouch> m_ETriggerTouch;
    bool OnTriggerTouch(Events::TriggerTouch& e);
+    EventRelay<AmmoPickupSystem, Events::TriggerLeave> m_ETriggerLeave;
+    bool OnTriggerLeave(Events::TriggerLeave& e);
+
    EventRelay<AmmoPickupSystem, Events::AmmoPickup> m_EAmmoPickup;
    bool OnAmmoPickup(Events::AmmoPickup& e);

@@ -31,5 +34,11 @@ private:
        EntityID parentID;
    };
    std::vector<NewAmmoPickup> m_ETriggerTouchVector;
+    struct EntityAtMaxValuePickupStruct {
+        EntityWrapper player;
+        EntityWrapper trigger;
+    };
+    std::vector<EntityAtMaxValuePickupStruct> m_PickupAtMaximum;
+    void DoPickup(EntityWrapper &player, EntityWrapper &trigger);
 };
 #endif