Merge remote-tracking branch 'origin/master' into Menu

# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/NewMapWSpectatorCam.xml
#	resources/Schema/Types/Entity.xsd
#	src/Game/Game.cpp

include/Game/Systems/AmmoPickupSystem.h

@@ -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

include/Game/Systems/PlayerDeathSystem.h

@@ -24,7 +24,10 @@ private:
     bool OnPlayerDeath(Events::PlayerDeath& e);
     EventRelay<PlayerDeathSystem, Events::EntityDeleted> m_EEntityDeleted;
     bool OnEntityDeleted(Events::EntityDeleted& e);
+    EventRelay<PlayerDeathSystem, Events::InputCommand> m_EInputCommand;
+    bool OnInputCommand(Events::InputCommand& e);
 
+    void setSpectatorCamera();
     void createDeathEffect(EntityWrapper player);
 
 };

include/Game/Systems/PlayerSpawnSystem.h

@@ -15,10 +15,19 @@ public:
     virtual void Update(double dt) override;
 
 private:
+    // This enum must correspond to the command values for PickTeam buttons.
+    enum class PlayerClass
+    {
+        None = 0,
+        Assault,
+        Defender,
+        Sniper
+    };
     struct SpawnRequest
     {
         int PlayerID;
         ComponentInfo::EnumType Team;
+        PlayerClass Class;
     };
 
     bool m_NetworkEnabled = false;

include/Game/Systems/SpectatorCameraSystem.h

@@ -0,0 +1,22 @@
+#ifndef SpectatorCameraSystem_h__
+#define SpectatorCameraSystem_h__
+
+#include "Core/System.h"
+#include "Input/EInputCommand.h"
+
+class SpectatorCameraSystem : public ImpureSystem
+{
+public:
+    SpectatorCameraSystem(SystemParams params);
+
+    virtual void Update(double dt) override;
+
+private:
+    int m_PickedTeam;
+    bool m_CamSetToTeamPick;
+
+    EventRelay<SpectatorCameraSystem, Events::InputCommand> m_EInputCommand;
+    bool OnInputCommand(const Events::InputCommand& e);
+};
+
+#endif