Merge remote-tracking branch 'origin/master' into FriendlyHost/Join

2016-03-09 10:00:44 +01:00
parent 17e2ebeaa7 e5dba6604b
commit 4abe73eae7
2 changed files with 73 additions and 13 deletions
@@ -40,5 +40,17 @@ private:
    };
    std::vector<EntityAtMaxValuePickupStruct> m_PickupAtMaximum;
    void DoPickup(EntityWrapper &player, EntityWrapper &trigger);
+    //class
+    enum class PlayerClass {
+        Assault,
+        Defender,
+        Sniper,
+        None
+    };
+    //helper methods
+    bool DoesPlayerHaveMaxAmmo(EntityWrapper &player);
+    PlayerClass DetermineClass(EntityWrapper &player);
+    void SetPlayerAmmo(EntityWrapper &player, int ammoGain);
+    int GetPlayerMaxAmmo(EntityWrapper &player);
 };
 #endif