Revert "Merge remote-tracking branch 'origin/master' into SniperSprint"

This reverts commit dbef995627, reversing changes made to 62653cf65d.
2016-03-02 16:55:56 +01:00
parent dbef995627
commit 4e68f9063b
18 changed files with 108 additions and 9810 deletions
@@ -20,9 +20,6 @@ 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);

@@ -34,11 +31,5 @@ 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