Merge pull request #149 from teamfisk/FixNetworkBugs

Seems OK
2016-03-02 10:11:52 +01:00
parent e4e9af5d9c aadfdfdd90
commit 03a35d0f5e
8 changed files with 125 additions and 60 deletions
@@ -20,6 +20,8 @@ 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;