Merge pull request #133 from teamfisk/AndersTest

Ammo,HealthPickup now takes in account for possible parenting/childin…
2016-02-25 09:58:14 +01:00
parent 9a41bda4cf ef87102d1f
commit da1c7b3093
6 changed files with 17 additions and 13 deletions
@@ -26,6 +26,7 @@ private:
        double AmmoGain;
        double RespawnTimer;
        double DecreaseThisRespawnTimer;
+        EntityID parentID;
    };
    std::vector<NewAmmoPickup> m_ETriggerTouchVector;
 };
@@ -27,6 +27,7 @@ private:
        double HealthGain;
        double RespawnTimer;
        double DecreaseThisRespawnTimer;
+        EntityID parentID;
    };
    std::vector<NewHealthPickup> m_ETriggerTouchVector;
 };