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

This reverts commit 62653cf65d, reversing changes made to b81bb9eeea.
2016-03-02 16:58:24 +01:00
parent 4e68f9063b
commit a20ef0504a
195 changed files with 2303 additions and 6805 deletions
@@ -20,15 +20,12 @@ public:
 private:
    EventRelay<AmmoPickupSystem, Events::TriggerTouch> m_ETriggerTouch;
    bool OnTriggerTouch(Events::TriggerTouch& e);
-    EventRelay<AmmoPickupSystem, Events::AmmoPickup> m_EAmmoPickup;
-    bool OnAmmoPickup(Events::AmmoPickup& e);

    struct NewAmmoPickup {
        glm::vec3 Pos;
        double AmmoGain;
        double RespawnTimer;
        double DecreaseThisRespawnTimer;
-        EntityID parentID;
    };
    std::vector<NewAmmoPickup> m_ETriggerTouchVector;
 };