Tiny compiler bug fix.

Class enum instead of hardcoded ints.
Removed superfluous .Valid() checks. Check for spectator spawnrequest in case they somehow has a class, so we don't get "x players were supposed to be spawned but failed" if it happens.
2016-03-09 11:44:07 +01:00 · 2016-03-09 11:35:32 +01:00 · 2016-03-09 10:56:05 +01:00 · 2016-03-08 19:24:55 +01:00 · 2016-03-08 18:26:17 +01:00 · 2016-03-08 17:30:22 +01:00
20 changed files with 7484 additions and 6135 deletions
@@ -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);

 };
@@ -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;
@@ -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
@@ -28,4 +28,5 @@ P=SwitchToPlayer
 K=TakeDamage,1500
 F2=PerformanceTimingResetAllTimers
 F3=PerformanceTimingCreateExcelData
-F4=SwapToClassPick
+Comma=SwapToClassPick
+Period=SwapToTeamPick
@@ -4,14 +4,39 @@
  <Components>
    <c:AABB/>
    <c:CapturePoint/>
-    <c:Model>
-      <Resource>Models/Core/UnitSphere.mesh</Resource>
-    </c:Model>
    <c:Team/>
-    <c:Transform/>
    <c:Trigger/>
+    <c:Transform/>
  </Components>

-  <Children/>
+  <Children>
+    <Entity name="Red">
+      <Components>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+        </c:Model>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Blue">
+      <Components>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+        </c:Model>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Spectator">
+      <Components>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+        </c:Model>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>

 </Entity>
@@ -13,38 +13,8 @@
      <Components>
        <c:Sprite>
          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-          <Color A="0.300000012" B="1" G="1" R="1"/>
-        </c:Sprite>
-        <c:Transform>
-          <Position X="0" Y="0.919596612" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="ProgressionHexagon">
-          <Components>
-            <c:CapturePointHUD>
-              <CapturePointNumber>2</CapturePointNumber>
-            </c:CapturePointHUD>
-            <c:Fill>
-              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-            </c:Fill>
-            <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="0" Y="0" Z="0.00999999978"/>
-              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-              <Orientation X="0" Y="0" Z="1.57079637"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="BackgroundHexagon">
-      <Components>
-        <c:Sprite>
-          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+          <GlowMap></GlowMap>
+          <DepthSort>false</DepthSort>
          <Color A="0.300000012" B="1" G="1" R="1"/>
        </c:Sprite>
        <c:Transform>
@@ -54,20 +24,21 @@
      <Children>
        <Entity name="ProgressionHexagon">
          <Components>
+            <c:Fill>
+              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+            </c:Fill>
            <c:CapturePointHUD>
              <CapturePointNumber>3</CapturePointNumber>
            </c:CapturePointHUD>
-            <c:Fill>
-              <Percentage>0.80222018197612788</Percentage>
-              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-            </c:Fill>
            <c:Sprite>
              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <DepthSort>false</DepthSort>
            </c:Sprite>
            <c:Transform>
              <Position X="0" Y="0" Z="0.00999999978"/>
-              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
              <Orientation X="0" Y="0" Z="1.57079637"/>
+              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
            </c:Transform>
          </Components>
          <Children/>
@@ -78,6 +49,8 @@
      <Components>
        <c:Sprite>
          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+          <GlowMap></GlowMap>
+          <DepthSort>false</DepthSort>
          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
        </c:Sprite>
        <c:Transform>
@@ -87,19 +60,21 @@
      <Children>
        <Entity name="ProgressionHexagon">
          <Components>
-            <c:CapturePointHUD>
-              <CapturePointNumber>4</CapturePointNumber>
-            </c:CapturePointHUD>
            <c:Fill>
              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
            </c:Fill>
+            <c:CapturePointHUD>
+              <CapturePointNumber>4</CapturePointNumber>
+            </c:CapturePointHUD>
            <c:Sprite>
              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <DepthSort>false</DepthSort>
            </c:Sprite>
            <c:Transform>
              <Position X="0" Y="0" Z="0.00999999978"/>
-              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
              <Orientation X="0" Y="0" Z="1.57079637"/>
+              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
            </c:Transform>
          </Components>
          <Children/>
@@ -110,6 +85,44 @@
      <Components>
        <c:Sprite>
          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+          <GlowMap></GlowMap>
+          <DepthSort>false</DepthSort>
+          <Color A="0.300000012" B="1" G="1" R="1"/>
+        </c:Sprite>
+        <c:Transform>
+          <Position X="0" Y="0.919596612" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="ProgressionHexagon">
+          <Components>
+            <c:Fill>
+              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+            </c:Fill>
+            <c:CapturePointHUD>
+              <CapturePointNumber>2</CapturePointNumber>
+            </c:CapturePointHUD>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <DepthSort>false</DepthSort>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0" Y="0" Z="0.00999999978"/>
+              <Orientation X="0" Y="0" Z="1.57079637"/>
+              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="BackgroundHexagon">
+      <Components>
+        <c:Sprite>
+          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+          <GlowMap></GlowMap>
+          <DepthSort>false</DepthSort>
          <Color A="0.300000012" B="1" G="1" R="1"/>
        </c:Sprite>
        <c:Transform>
@@ -119,19 +132,21 @@
      <Children>
        <Entity name="ProgressionHexagon">
          <Components>
-            <c:CapturePointHUD>
-              <CapturePointNumber>1</CapturePointNumber>
-            </c:CapturePointHUD>
            <c:Fill>
              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
            </c:Fill>
+            <c:CapturePointHUD>
+              <CapturePointNumber>1</CapturePointNumber>
+            </c:CapturePointHUD>
            <c:Sprite>
              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <DepthSort>false</DepthSort>
            </c:Sprite>
            <c:Transform>
              <Position X="0" Y="0" Z="0.00999999978"/>
-              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
              <Orientation X="0" Y="0" Z="1.57079637"/>
+              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
            </c:Transform>
          </Components>
          <Children/>
@@ -142,7 +157,9 @@
      <Components>
        <c:Sprite>
          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-          <Color A="0.699999988" B="0" G="0.200000003" R="1"/>
+          <GlowMap></GlowMap>
+          <DepthSort>false</DepthSort>
+          <Color A="0.699999988" B="0" G="0" R="1"/>
        </c:Sprite>
        <c:Transform>
          <Position X="-1.58304751" Y="0.919596612" Z="0"/>
@@ -151,17 +168,19 @@
      <Children>
        <Entity name="ProgressionHexagon">
          <Components>
-            <c:CapturePointHUD/>
            <c:Fill>
              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
            </c:Fill>
+            <c:CapturePointHUD/>
            <c:Sprite>
              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <DepthSort>false</DepthSort>
            </c:Sprite>
            <c:Transform>
              <Position X="0" Y="0" Z="0.00999999978"/>
-              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
              <Orientation X="0" Y="0" Z="1.57079637"/>
+              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
            </c:Transform>
          </Components>
          <Children/>
@@ -8,6 +8,7 @@
    </c:RaptorCopter>
    <c:Transform>
      <Position X="0" Y="-4" Z="0"/>
+      <Orientation X="0" Y="55.3495064" Z="0"/>
    </c:Transform>
  </Components>

@@ -20,6 +21,369 @@
        </c:Transform>
      </Components>
      <Children>
+        <Entity name="PickClassCamera">
+          <Components>
+            <c:Camera/>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="PickClassHUD">
+              <Components>
+                <c:Transform>
+                  <Position X="0" Y="-0" Z="-0.5"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="DefenderClassPick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Icons/Classes/Defender-01.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>PickClass</Command>
+                      <PressValue>2</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="0" Y="-0.0500000007" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="DefenderText">
+                      <Components>
+                        <c:Text>
+                          <Content>Defender</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                          <Color A="1" B="0" G="1" R="0.784313738"/>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="0.800000012" Z="0"/>
+                          <Scale X="0.310000002" Y="0.310000002" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="SniperClassPick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Icons/Classes/Sniper-01.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>PickClass</Command>
+                      <PressValue>3</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="0.150000006" Y="-0.0500000007" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="SniperText">
+                      <Components>
+                        <c:Text>
+                          <Content>Sniper</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                          <Color A="1" B="0" G="1" R="0.784313738"/>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="0.800000012" Z="0"/>
+                          <Scale X="0.310000002" Y="0.310000002" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="AssaultClassPick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Icons/Classes/Assault-01.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>PickClass</Command>
+                      <PressValue>1</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="-0.150000006" Y="-0.0500000007" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="AssaultText">
+                      <Components>
+                        <c:Text>
+                          <Content>Assault</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                          <Color A="1" B="0" G="1" R="0.784313738"/>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="0.800000012" Z="0"/>
+                          <Scale X="0.310000002" Y="0.310000002" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="ClassPickText">
+                  <Components>
+                    <c:Text>
+                      <Content>Pick Class</Content>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                      <Color A="1" B="0" G="1" R="0.784313738"/>
+                    </c:Text>
+                    <c:Transform>
+                      <Position X="0" Y="0.0799999982" Z="0"/>
+                      <Scale X="0.0250000004" Y="0.0250000004" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="ToTeamPick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                      <Color A="1" B="0" G="1" R="0.509803951"/>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>SwapToTeamPick</Command>
+                      <PressValue>1</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="0.349999994" Y="-0.180000007" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="ChangeText">
+                      <Components>
+                        <c:Text>
+                          <Content>Change</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="0" Z="0.00200000009"/>
+                          <Scale X="0.25" Y="0.25" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="TeamText">
+                      <Components>
+                        <c:Text>
+                          <Content>Team</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="-0.224999994" Z="0.00200000009"/>
+                          <Scale X="0.25" Y="0.25" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="PickTeamCamera">
+          <Components>
+            <c:Camera/>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="PickTeamHUD">
+              <Components>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="-0.5"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="TeamPickText">
+                  <Components>
+                    <c:Text>
+                      <Content>Pick Team</Content>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                      <Color A="1" B="0" G="1" R="0.784313738"/>
+                    </c:Text>
+                    <c:Transform>
+                      <Position X="0" Y="0.0799999982" Z="0"/>
+                      <Scale X="0.0250000004" Y="0.0250000004" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="SpectatorPick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                      <Color A="1" B="0" G="1" R="0.509803951"/>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>PickTeam</Command>
+                      <PressValue>1</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="0" Y="-0.0500000007" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="SpectatorText">
+                      <Components>
+                        <c:Text>
+                          <Content>Spectator</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="-0.0450000018" Z="0.00200000009"/>
+                          <Scale X="0.200000003" Y="0.200000003" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="TeamRedPick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                      <Color A="1" B="0" G="0.294117659" R="0.980392158"/>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>PickTeam</Command>
+                      <PressValue>2</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="0.150000006" Y="-0.0500000007" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="RedText">
+                      <Components>
+                        <c:Text>
+                          <Content>Red</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="-0.0850000009" Z="0.00249999994"/>
+                          <Scale X="0.310000002" Y="0.310000002" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="TeamBluePick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                      <Color A="1" B="0.980392158" G="0.294117659" R="0"/>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>PickTeam</Command>
+                      <PressValue>3</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="-0.150000006" Y="-0.0500000007" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="BlueText">
+                      <Components>
+                        <c:Text>
+                          <Content>Blue</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="-0.0850000009" Z="0.00200000009"/>
+                          <Scale X="0.310000002" Y="0.310000002" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="ToClassPick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                      <Color A="1" B="0" G="1" R="0.509803951"/>
+                      <Visible>false</Visible>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>SwapToClassPick</Command>
+                      <PressValue>1</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="0.349999994" Y="-0.0800000057" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="ChangeText">
+                      <Components>
+                        <c:Text>
+                          <Content>Change</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                          <Visible>false</Visible>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="0" Z="0.00200000009"/>
+                          <Scale X="0.25" Y="0.25" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="ClassText">
+                      <Components>
+                        <c:Text>
+                          <Content>Class</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                          <Visible>false</Visible>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="-0.224999994" Z="0.00200000009"/>
+                          <Scale X="0.25" Y="0.25" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
        <Entity name="SpectatorCamera">
          <Components>
            <c:Camera/>
@@ -33,6 +397,20 @@
                </c:Transform>
              </Components>
              <Children>
+                <Entity name="RespawnTimer">
+                  <Components>
+                    <c:Text>
+                      <Content>7</Content>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                      <Color A="1" B="0" G="1" R="0.784313738"/>
+                    </c:Text>
+                    <c:Transform>
+                      <Position X="0" Y="0.178199276" Z="0"/>
+                      <Scale X="0.0250000004" Y="0.0250000004" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
                <Entity name="CapturePointHUD">
                  <Components>
                    <c:Transform>
@@ -46,40 +424,7 @@
                        <c:Sprite>
                          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
                          <GlowMap></GlowMap>
-                          <Color A="0.300000012" B="1" G="1" R="1"/>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0.919596612" Z="0"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="ProgressionHexagon">
-                          <Components>
-                            <c:CapturePointHUD>
-                              <CapturePointNumber>2</CapturePointNumber>
-                            </c:CapturePointHUD>
-                            <c:Fill>
-                              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                            </c:Fill>
-                            <c:Sprite>
-                              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                              <GlowMap></GlowMap>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0" Y="0" Z="0.00999999978"/>
-                              <Orientation X="0" Y="0" Z="1.57079637"/>
-                              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="BackgroundHexagon">
-                      <Components>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
+                          <DepthSort>false</DepthSort>
                          <Color A="0.300000012" B="1" G="1" R="1"/>
                        </c:Sprite>
                        <c:Transform>
@@ -89,15 +434,16 @@
                      <Children>
                        <Entity name="ProgressionHexagon">
                          <Components>
-                            <c:CapturePointHUD>
-                              <CapturePointNumber>3</CapturePointNumber>
-                            </c:CapturePointHUD>
                            <c:Fill>
                              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                            </c:Fill>
+                            <c:CapturePointHUD>
+                              <CapturePointNumber>3</CapturePointNumber>
+                            </c:CapturePointHUD>
                            <c:Sprite>
                              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                              <GlowMap></GlowMap>
+                              <DepthSort>false</DepthSort>
                            </c:Sprite>
                            <c:Transform>
                              <Position X="0" Y="0" Z="0.00999999978"/>
@@ -114,6 +460,7 @@
                        <c:Sprite>
                          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
                          <GlowMap></GlowMap>
+                          <DepthSort>false</DepthSort>
                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                        </c:Sprite>
                        <c:Transform>
@@ -123,15 +470,16 @@
                      <Children>
                        <Entity name="ProgressionHexagon">
                          <Components>
-                            <c:CapturePointHUD>
-                              <CapturePointNumber>4</CapturePointNumber>
-                            </c:CapturePointHUD>
                            <c:Fill>
                              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                            </c:Fill>
+                            <c:CapturePointHUD>
+                              <CapturePointNumber>4</CapturePointNumber>
+                            </c:CapturePointHUD>
                            <c:Sprite>
                              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                              <GlowMap></GlowMap>
+                              <DepthSort>false</DepthSort>
                            </c:Sprite>
                            <c:Transform>
                              <Position X="0" Y="0" Z="0.00999999978"/>
@@ -148,6 +496,43 @@
                        <c:Sprite>
                          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
                          <GlowMap></GlowMap>
+                          <DepthSort>false</DepthSort>
+                          <Color A="0.300000012" B="1" G="1" R="1"/>
+                        </c:Sprite>
+                        <c:Transform>
+                          <Position X="0" Y="0.919596612" Z="0"/>
+                        </c:Transform>
+                      </Components>
+                      <Children>
+                        <Entity name="ProgressionHexagon">
+                          <Components>
+                            <c:Fill>
+                              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                            </c:Fill>
+                            <c:CapturePointHUD>
+                              <CapturePointNumber>2</CapturePointNumber>
+                            </c:CapturePointHUD>
+                            <c:Sprite>
+                              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                              <GlowMap></GlowMap>
+                              <DepthSort>false</DepthSort>
+                            </c:Sprite>
+                            <c:Transform>
+                              <Position X="0" Y="0" Z="0.00999999978"/>
+                              <Orientation X="0" Y="0" Z="1.57079637"/>
+                              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                    <Entity name="BackgroundHexagon">
+                      <Components>
+                        <c:Sprite>
+                          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
+                          <DepthSort>false</DepthSort>
                          <Color A="0.300000012" B="1" G="1" R="1"/>
                        </c:Sprite>
                        <c:Transform>
@@ -157,16 +542,17 @@
                      <Children>
                        <Entity name="ProgressionHexagon">
                          <Components>
-                            <c:CapturePointHUD>
-                              <CapturePointNumber>1</CapturePointNumber>
-                            </c:CapturePointHUD>
                            <c:Fill>
                              <Percentage>0.10332605343919568</Percentage>
                              <Color A="0.699999988" B="0" G="0" R="1"/>
                            </c:Fill>
+                            <c:CapturePointHUD>
+                              <CapturePointNumber>1</CapturePointNumber>
+                            </c:CapturePointHUD>
                            <c:Sprite>
                              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                              <GlowMap></GlowMap>
+                              <DepthSort>false</DepthSort>
                            </c:Sprite>
                            <c:Transform>
                              <Position X="0" Y="0" Z="0.00999999978"/>
@@ -183,6 +569,7 @@
                        <c:Sprite>
                          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
                          <GlowMap></GlowMap>
+                          <DepthSort>false</DepthSort>
                          <Color A="0.699999988" B="0" G="0" R="1"/>
                        </c:Sprite>
                        <c:Transform>
@@ -192,13 +579,14 @@
                      <Children>
                        <Entity name="ProgressionHexagon">
                          <Components>
-                            <c:CapturePointHUD/>
                            <c:Fill>
                              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                            </c:Fill>
+                            <c:CapturePointHUD/>
                            <c:Sprite>
                              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                              <GlowMap></GlowMap>
+                              <DepthSort>false</DepthSort>
                            </c:Sprite>
                            <c:Transform>
                              <Position X="0" Y="0" Z="0.00999999978"/>
@@ -212,90 +600,99 @@
                    </Entity>
                  </Children>
                </Entity>
-                <Entity name="RespawnTimer">
-                  <Components>
-                    <c:Text>
-                      <Content>16</Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Color A="1" B="0" G="1" R="0.784313738"/>
-                    </c:Text>
-                    <c:Transform>
-                      <Position X="0" Y="0.178199276" Z="0"/>
-                      <Scale X="0.0250000004" Y="0.0250000004" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="PickClassCamera">
-          <Components>
-            <c:Camera/>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="PickClassHUD">
-              <Components>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="-0.5"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="DefenderClassPick">
+                <Entity name="ToTeamPick">
                  <Components>
                    <c:Button/>
                    <c:Sprite>
                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                      <Color A="1" B="0" G="1" R="0.509803951"/>
                    </c:Sprite>
                    <c:InputCmdButton>
-                      <Command>PickClass</Command>
-                      <PressValue>2</PressValue>
-                    </c:InputCmdButton>
-                    <c:Transform>
-                      <Position X="0.349999994" Y="0.0500000007" Z="0"/>
-                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="AssaultClassPick">
-                  <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitRaptor.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                    </c:Sprite>
-                    <c:InputCmdButton>
-                      <Command>PickClass</Command>
+                      <Command>SwapToTeamPick</Command>
                      <PressValue>1</PressValue>
                    </c:InputCmdButton>
                    <c:Transform>
-                      <Position X="0.349999994" Y="0.149504215" Z="0"/>
+                      <Position X="0.349999994" Y="-0.180000007" Z="0"/>
                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
                    </c:Transform>
                  </Components>
-                  <Children/>
+                  <Children>
+                    <Entity name="ChangeText">
+                      <Components>
+                        <c:Text>
+                          <Content>Change</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="0" Z="0.00200000009"/>
+                          <Scale X="0.25" Y="0.25" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="TeamText">
+                      <Components>
+                        <c:Text>
+                          <Content>Team</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="-0.224999994" Z="0.00200000009"/>
+                          <Scale X="0.25" Y="0.25" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
                </Entity>
-                <Entity name="SniperClassPick">
+                <Entity name="ToClassPick">
                  <Components>
                    <c:Button/>
                    <c:Sprite>
-                      <DiffuseTexture>Textures/Test/aM4ME4GR.png</DiffuseTexture>
+                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                      <Color A="1" B="0" G="1" R="0.509803951"/>
                    </c:Sprite>
                    <c:InputCmdButton>
-                      <Command>PickClass</Command>
-                      <PressValue>3</PressValue>
+                      <Command>SwapToClassPick</Command>
+                      <PressValue>1</PressValue>
                    </c:InputCmdButton>
                    <c:Transform>
-                      <Position X="0.349999994" Y="-0.0500000007" Z="0"/>
+                      <Position X="0.349999994" Y="-0.0800000057" Z="0"/>
                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
                    </c:Transform>
                  </Components>
-                  <Children/>
+                  <Children>
+                    <Entity name="ChangeText">
+                      <Components>
+                        <c:Text>
+                          <Content>Change</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="0" Z="0.00200000009"/>
+                          <Scale X="0.25" Y="0.25" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="ClassText">
+                      <Components>
+                        <c:Text>
+                          <Content>Class</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="-0.224999994" Z="0.00200000009"/>
+                          <Scale X="0.25" Y="0.25" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
                </Entity>
              </Children>
            </Entity>
@@ -92,15 +92,15 @@
    </Entity>
    <Entity>
      <Components>
-        <c:PlayerSpawn/>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/Player.xml</EntityFile>
-        </c:Spawner>
        <c:Team>
          <Team>
            <Red/>
          </Team>
        </c:Team>
+        <c:PlayerSpawn/>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/Player.xml</EntityFile>
+        </c:Spawner>
        <c:Transform/>
      </Components>
      <Children>
@@ -143,15 +143,15 @@
    </Entity>
    <Entity>
      <Components>
-        <c:PlayerSpawn/>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/Player.xml</EntityFile>
-        </c:Spawner>
        <c:Team>
          <Team>
            <Blue/>
          </Team>
        </c:Team>
+        <c:PlayerSpawn/>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/Player.xml</EntityFile>
+        </c:Spawner>
        <c:Transform/>
      </Components>
      <Children>
@@ -209,24 +209,26 @@
      <Components>
        <c:AABB/>
        <c:CapturePoint>
+          <CaptureTimer>-15</CaptureTimer>
          <HomePointForTeam>
            <Blue/>
          </HomePointForTeam>
        </c:CapturePoint>
-        <c:Model>
-          <Resource>Models\Core\UnitCube.mesh</Resource>
-          <Color A="1" B="1" G="0.200000003" R="0"/>
-        </c:Model>
        <c:Team>
          <Team>
            <Blue/>
          </Team>
        </c:Team>
+        <c:Trigger/>
+        <c:Model>
+          <Resource>Models\Core\UnitCube.mesh</Resource>
+          <Color A="0.300000012" B="1" G="0" R="0"/>
+          <Transparent>true</Transparent>
+        </c:Model>
        <c:Transform>
          <Position X="0" Y="0.773066521" Z="-18.975975"/>
          <Scale X="4.9000001" Y="0.600000024" Z="3.50000024"/>
        </c:Transform>
-        <c:Trigger/>
      </Components>
      <Children/>
    </Entity>
@@ -234,25 +236,27 @@
      <Components>
        <c:AABB/>
        <c:CapturePoint>
+          <CaptureTimer>15</CaptureTimer>
          <HomePointForTeam>
            <Red/>
          </HomePointForTeam>
          <CapturePointNumber>1</CapturePointNumber>
        </c:CapturePoint>
-        <c:Model>
-          <Resource>Models\Core\UnitCube.mesh</Resource>
-          <Color A="1" B="1" G="1" R="0"/>
-        </c:Model>
        <c:Team>
          <Team>
            <Red/>
          </Team>
        </c:Team>
+        <c:Trigger/>
+        <c:Model>
+          <Resource>Models\Core\UnitCube.mesh</Resource>
+          <Color A="0.300000012" B="0" G="0" R="1"/>
+          <Transparent>true</Transparent>
+        </c:Model>
        <c:Transform>
          <Position X="0" Y="0.452868998" Z="18.5607414"/>
          <Scale X="4.60000038" Y="0.900000036" Z="4.10000038"/>
        </c:Transform>
-        <c:Trigger/>
      </Components>
      <Children/>
    </Entity>
@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+          <Color A="1" B="0.980392158" G="1" R="1"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="-0.100000001" Y="0" Z="0"/>
+          <Scale X="50" Y="1" Z="51.1000023"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+          <Color A="1" B="0" G="0" R="1"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="-14.500001" Y="1.50000012" Z="16.9222012"/>
+          <Scale X="14.4000006" Y="5.30000019" Z="4.5"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:DirectionalLight/>
+        <c:Transform>
+          <Orientation X="4.38500023" Y="0" Z="0.458000034"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+          <Color A="1" B="1" G="0" R="0"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="-14.500001" Y="1.50000012" Z="-17.6888409"/>
+          <Scale X="14.4000006" Y="5.30000019" Z="4.5"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+          <Color A="1" B="0" G="0" R="1"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="12.1000004" Y="1.50000012" Z="16.9222012"/>
+          <Scale X="14.4000006" Y="5.30000019" Z="4.5"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+          <Color A="1" B="1" G="0" R="0"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="12.1228638" Y="1.50000012" Z="-17.9642811"/>
+          <Scale X="14.4000006" Y="5.30000019" Z="4.5"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Team>
+          <Team>
+            <Red/>
+          </Team>
+        </c:Team>
+        <c:PlayerSpawn/>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/Player.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="-20.6000004" Y="1" Z="21.7150002"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:PlayerSpawn/>
+            <c:Transform>
+              <Position X="-12.2000008" Y="1" Z="21.5000019"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="15.4000006" Y="1" Z="21.6000004"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="10.500001" Y="0" Z="21.9000015"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Team>
+          <Team>
+            <Blue/>
+          </Team>
+        </c:Team>
+        <c:PlayerSpawn/>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/Player.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="-9.70000076" Y="1" Z="-23.4000015"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="-18.8000011" Y="1" Z="-22.3000011"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="8.10000038" Y="1" Z="-23.2000008"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="16.2000008" Y="1" Z="-23.2000008"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+          <Color A="1" B="39.2156868" G="0" R="3.13725495"/>
+        </c:Model>
+        <c:Transform>
+          <Scale X="-70" Y="-70" Z="-70"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="-">
+          <Components>
+            <c:AABB/>
+            <c:CapturePoint>
+              <CaptureTimer>15</CaptureTimer>
+              <HomePointForTeam>
+                <Red/>
+              </HomePointForTeam>
+            </c:CapturePoint>
+            <c:Team>
+              <Team>
+                <Red/>
+              </Team>
+            </c:Team>
+            <c:Trigger/>
+            <c:Transform>
+              <Position X="0" Y="0" Z="-4.10000038"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Red">
+              <Components>
+                <c:Model>
+                  <Resource>models/core/unitcube.mesh</Resource>
+                </c:Model>
+                <c:Transform>
+                  <Scale X="2.70000005" Y="3.4000001" Z="4.60000038"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Blue">
+              <Components>
+                <c:Model>
+                  <Resource>models/core/unitcube.mesh</Resource>
+                </c:Model>
+                <c:Transform>
+                  <Scale X="3.4000001" Y="4.70000029" Z="0.700000048"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Spectator">
+              <Components>
+                <c:Model>
+                  <Resource>models/core/unitcube.mesh</Resource>
+                </c:Model>
+                <c:Transform>
+                  <Scale X="1" Y="5.70000029" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="-">
+          <Components>
+            <c:AABB/>
+            <c:CapturePoint>
+              <CaptureTimer>-15</CaptureTimer>
+              <HomePointForTeam>
+                <Blue/>
+              </HomePointForTeam>
+              <CapturePointNumber>1</CapturePointNumber>
+            </c:CapturePoint>
+            <c:Team>
+              <Team>
+                <Blue/>
+              </Team>
+            </c:Team>
+            <c:Trigger/>
+            <c:Transform>
+              <Position X="0" Y="0" Z="4"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Red">
+              <Components>
+                <c:Model>
+                  <Resource>models/core/unitcube.mesh</Resource>
+                </c:Model>
+                <c:Transform>
+                  <Scale X="4.4000001" Y="2" Z="3.70000029"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Blue">
+              <Components>
+                <c:Model>
+                  <Resource>models/core/unitcube.mesh</Resource>
+                </c:Model>
+                <c:Transform>
+                  <Orientation X="0" Y="2.95000005" Z="0"/>
+                  <Scale X="4.70000029" Y="3.60000014" Z="3.60000014"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Spectator">
+              <Components>
+                <c:Model>
+                  <Resource>models/core/unitcube.mesh</Resource>
+                </c:Model>
+                <c:Transform>
+                  <Scale X="5.50000048" Y="2.5" Z="3.80000019"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>
@@ -40,7 +40,7 @@ bool ButtonSystem::OnMousePress(const Events::MousePress& e)
                //You have clicked on a button entity, send pressed event.
                if (m_World->HasComponent(m_PickData.Entity, "InputCmdButton")) {
                    Events::InputCommand eInputCmd;
-                    eInputCmd.PlayerID = LocalPlayer.ID;
+                    eInputCmd.PlayerID = -1;
                    eInputCmd.Player = LocalPlayer;
                    EntityWrapper button = EntityWrapper(m_World, m_PickData.Entity);
                    eInputCmd.Command = (std::string)button["InputCmdButton"]["Command"];
@@ -68,7 +68,7 @@ bool ButtonSystem::OnMouseRelease(const Events::MouseRelease& e)

            if (m_World->HasComponent(m_PickData.Entity, "InputCmdButton")) {
                Events::InputCommand eInputCmd;
-                eInputCmd.PlayerID = LocalPlayer.ID;
+                eInputCmd.PlayerID = -1;
                eInputCmd.Player = LocalPlayer;
                EntityWrapper button = EntityWrapper(m_World, m_PickData.Entity);
                eInputCmd.Command = (std::string)button["InputCmdButton"]["Command"];
@@ -162,7 +162,7 @@ void Server::unreliableBroadcast(Packet& packet)
 {
    for (auto& kv : m_ConnectedPlayers) {
        packet.ChangePacketID(kv.second.PacketID);
-//        m_Unreliable.Send(packet, kv.second);
+        //        m_Unreliable.Send(packet, kv.second);
    }
 }

@@ -649,13 +649,14 @@ bool Server::shouldSendToClient(EntityWrapper childEntity)
            return true;
        }
    }
-    return childEntity.HasComponent("Player") 
+    return childEntity.HasComponent("Player")
        || childEntity.FirstParentWithComponent("Player").Valid()
-        || childEntity.HasComponent("CapturePoint") 
+        || childEntity.HasComponent("CapturePoint")
        || childEntity.HasComponent("HealthPickup")
        || childEntity.HasComponent("AmmoPickup")
        || childEntity.HasComponent("ScoreScreen")
-        || childEntity.FirstParentWithComponent("ScoreScreen").Valid();
+        || childEntity.FirstParentWithComponent("ScoreScreen").Valid()
+        || childEntity.FirstParentWithComponent("CapturePoint").Valid();
 }

 PlayerID Server::getPlayerIDFromEndpoint()
@@ -674,7 +675,7 @@ PlayerID Server::getPlayerIDFromEndpoint()

 PlayerID Server::getPlayerIDFromEntityID(EntityID entityID)
 {
-    for(auto& kv : m_ConnectedPlayers) {
+    for (auto& kv : m_ConnectedPlayers) {
        if (entityID == kv.second.EntityID) {
            return kv.first;
        }
@@ -35,6 +35,7 @@
 #include "Game/Systems/BoostSystem.h"
 #include "Game/Systems/BoostIconsHUDSystem.h"
 #include "Game/Systems/ScoreScreenSystem.h"
+#include "Game/Systems/SpectatorCameraSystem.h"
 #include "GUI/ButtonSystem.h"
 #include "GUI/MainMenuSystem.h"

@@ -137,25 +138,19 @@ Game::Game(int argc, char* argv[])
    m_SystemPipeline->AddSystem<LifetimeSystem>(updateOrderLevel);
    m_SystemPipeline->AddSystem<CapturePointSystem>(updateOrderLevel);
    m_SystemPipeline->AddSystem<CapturePointHUDSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<PickupSpawnSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<AmmoPickupSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<DamageIndicatorSystem>(updateOrderLevel);
    m_SystemPipeline->AddSystem<TextFieldReader>(updateOrderLevel);
    m_SystemPipeline->AddSystem<AbilityCooldownHUDSystem>(updateOrderLevel);
    m_SystemPipeline->AddSystem<CapturePointArrowHUDSystem>(updateOrderLevel);
    m_SystemPipeline->AddSystem<KillFeedSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<CapturePointSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<CapturePointHUDSystem>(updateOrderLevel);
    m_SystemPipeline->AddSystem<PickupSpawnSystem>(updateOrderLevel);
    m_SystemPipeline->AddSystem<AmmoPickupSystem>(updateOrderLevel);
    m_SystemPipeline->AddSystem<DamageIndicatorSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<TextFieldReader>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<KillFeedSystem>(updateOrderLevel);
    m_SystemPipeline->AddSystem<BoostSystem>(updateOrderLevel);
    m_SystemPipeline->AddSystem<ButtonSystem>(updateOrderLevel, m_Renderer);
    m_SystemPipeline->AddSystem<MainMenuSystem>(updateOrderLevel, m_Renderer);
    m_SystemPipeline->AddSystem<BoostIconsHUDSystem>(updateOrderLevel);
    m_SystemPipeline->AddSystem<ScoreScreenSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<SpectatorCameraSystem>(updateOrderLevel);
    // Populate Octree with collidables
    ++updateOrderLevel;
    m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");
@@ -96,6 +96,7 @@ bool AmmoPickupSystem::OnAmmoPickup(Events::AmmoPickup & e)
    }

    currentAmmo = std::min(currentAmmo + e.AmmoGain, maxWeaponAmmo);
+
    return false;
 }

@@ -114,8 +115,11 @@ bool AmmoPickupSystem::OnTriggerLeave(Events::TriggerLeave& e) {
 }

 void AmmoPickupSystem::DoPickup(EntityWrapper &player, EntityWrapper &trigger) {
+    //trigger should be valid but if it isnt we just return (to avoid crash)
+    if (!trigger.Valid()) {
+        return;
+    }
    int maxWeaponAmmo = (int)player["AssaultWeapon"]["MaxAmmo"];
-    int& currentAmmo = (int)player["AssaultWeapon"]["Ammo"];
    int ammoGiven = 0.01*(double)trigger["AmmoPickup"]["AmmoGain"] * maxWeaponAmmo;

    Events::AmmoPickup ePlayerAmmoPickup;
@@ -123,9 +127,6 @@ void AmmoPickupSystem::DoPickup(EntityWrapper &player, EntityWrapper &trigger) {
    ePlayerAmmoPickup.Player = player;
    m_EventBroker->Publish(ePlayerAmmoPickup);

-    //immediately give the player the ammo (on server)
-    currentAmmo = std::min(currentAmmo + ammoGiven, maxWeaponAmmo);
-
    //copy position, ammogain, respawntimer (twice since one of the values will be counted down to 0, the other will be set in the new object)
    //we need to copy all values since each value can be different for each ammoPickup
    m_ETriggerTouchVector.push_back({ (glm::vec3)trigger["Transform"]["Position"], trigger["AmmoPickup"]["AmmoGain"],
@@ -69,6 +69,7 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
    int ownedBy = teamComponent["Team"];
    int redTeamPlayersStandingInside = 0;
    int blueTeamPlayersStandingInside = 0;
+    //note: old color system
    if (capturePointEntity.HasComponent("Model")) {
        //Now sets team color to the capturepoint, or white if it is uncaptured.
        capturePointEntity["Model"]["Color"] = ownedBy == blueTeam ? glm::vec4(0, 0.0f, 1, 0.3) : ownedBy == redTeam ? glm::vec4(1, 0.0f, 0, 0.3) : glm::vec4(1, 1, 1, 0.3);
@@ -102,7 +103,18 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
            nextPossibleCapturePoint["Blue"] = i - 1;
        }
    }
+
    if (m_RecentlyCapturedNeedNextCapturePointNow) {
+        //change what model is displaying (change all in case 2 capturepoints has been captured on the same frame)
+        for (int i = 0; i < m_NumberOfCapturePoints; i++) {
+            auto owner = (int)m_CapturePointNumberToEntityMap[i]["Team"]["Team"];
+            if (m_CapturePointNumberToEntityMap[i].FirstChildByName("Red").ID != EntityID_Invalid) {
+                (bool&)m_CapturePointNumberToEntityMap[i].FirstChildByName("Red")["Model"]["Visible"] = owner == redTeam ? true : false;
+                (bool&)m_CapturePointNumberToEntityMap[i].FirstChildByName("Blue")["Model"]["Visible"] = owner == blueTeam ? true : false;
+                (bool&)m_CapturePointNumberToEntityMap[i].FirstChildByName("Spectator")["Model"]["Visible"] = owner == spectatorTeam ? true : false;
+            }
+        }
+        //save the next cap points and publish the captured event
        m_CapturedEvent.BlueTeamNextCapturePoint = m_CapturePointNumberToEntityMap[nextPossibleCapturePoint["Blue"]];
        m_CapturedEvent.RedTeamNextCapturePoint = m_CapturePointNumberToEntityMap[nextPossibleCapturePoint["Red"]];
        m_EventBroker->Publish(m_CapturedEvent);
@@ -83,6 +83,10 @@ bool PickupSpawnSystem::OnTriggerLeave(Events::TriggerLeave& e)
 }
 void PickupSpawnSystem::DoPickup(EntityWrapper &player, EntityWrapper &trigger)
 {
+    //trigger should be valid but if it isnt we just return (to avoid crash)
+    if (!trigger.Valid()) {
+        return;
+    }
    double healthGiven = 0.01*(double)trigger["HealthPickup"]["HealthGain"] * (double)player["Health"]["MaxHealth"];

    //only the server will increase the players hp and set it in the next delta
@@ -1,10 +1,12 @@
 #include "Systems/PlayerDeathSystem.h"
+#include "Core/ELockMouse.h"

 PlayerDeathSystem::PlayerDeathSystem(SystemParams params)
    : System(params)
 {
    EVENT_SUBSCRIBE_MEMBER(m_OnPlayerDeath, &PlayerDeathSystem::OnPlayerDeath);
    EVENT_SUBSCRIBE_MEMBER(m_EEntityDeleted, &PlayerDeathSystem::OnEntityDeleted);
+    EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &PlayerDeathSystem::OnInputCommand);
 }

 void PlayerDeathSystem::Update(double dt)
@@ -33,10 +35,10 @@ void PlayerDeathSystem::createDeathEffect(EntityWrapper player)

    //components that we need from player
    auto playerModel = player.FirstChildByName("PlayerModel");
-    if (!playerModel.Valid()) {
-        return;
-    }
    if (!playerModel.HasComponent("Model") || !playerModel.HasComponent("Animation")) {
+        if (player == LocalPlayer) {
+            setSpectatorCamera();
+        }
        return;
    }
    auto playerEntityModel = playerModel["Model"];
@@ -68,14 +70,35 @@ bool PlayerDeathSystem::OnEntityDeleted(Events::EntityDeleted& e)
    if (m_LocalPlayerDeathEffect.ID != e.DeletedEntity) {
        return false;
    }
-    
+
+    // If the player hasn't spawned already, activate the spectator camera.
+    if (!LocalPlayer.Valid()) {
+        setSpectatorCamera();
+    }
+    return true;
+}
+
+void PlayerDeathSystem::setSpectatorCamera()
+{
    // Look for the spectator camera entity in the level.
    EntityWrapper spectatorCam = m_World->GetFirstEntityByName("SpectatorCamera");
-    if (!spectatorCam.Valid() || !spectatorCam.HasComponent("Camera") || LocalPlayer.Valid()) {
-        return false;
+    if (!spectatorCam.HasComponent("Camera")) {
+        return;
    }
    Events::SetCamera eSetCamera;
    eSetCamera.CameraEntity = spectatorCam;
    m_EventBroker->Publish(eSetCamera);
-    return true;
+    Events::UnlockMouse unlock;
+    m_EventBroker->Publish(unlock);
 }
+
+bool PlayerDeathSystem::OnInputCommand(Events::InputCommand& e)
+{
+    if (e.Value == 0 ||  e.Command != "SwapToTeamPick" && e.Command != "SwapToClassPick") {
+        return false;
+    }
+
+    // Ensure that we don't set spectator camera if the player deliberately changes to class/team pick.
+    m_LocalPlayerDeathEffect = EntityWrapper::Invalid;
+    return true;
+}
@@ -1,4 +1,5 @@
 #include "Systems/PlayerSpawnSystem.h"
+#include "Core/ELockMouse.h"

 PlayerSpawnSystem::PlayerSpawnSystem(SystemParams params)
    : System(params)
@@ -59,7 +60,15 @@ void PlayerSpawnSystem::Update(double dt)
    }

    int numSpawnedPlayers = 0;
-    for (auto& req : m_SpawnRequests) {
+    int playersSpectating = 0;
+    const int numRequestsToHandle = (int)m_SpawnRequests.size();
+    for (auto it = m_SpawnRequests.begin(); it != m_SpawnRequests.end(); ++it) {
+        // It is valid if they didn't pick class yet
+        // but don't spawn anything, goto next spawnrequest.
+        if (it->Class == PlayerClass::None) {
+            ++playersSpectating;
+            continue;
+        }
        for (auto& cPlayerSpawn : *playerSpawns) {
            EntityWrapper spawner(m_World, cPlayerSpawn.EntityID);
            if (!spawner.HasComponent("Spawner")) {
@@ -69,43 +78,49 @@ void PlayerSpawnSystem::Update(double dt)
            // If the spawner has a team affiliation, check it
            if (spawner.HasComponent("Team")) {
                auto cSpawnerTeam = spawner["Team"];
-                if ((int)cSpawnerTeam["Team"] != req.Team) {
-                    // Increase num spawned players if someone picks spectator, since it is valid to pick spectator
-                    // but don't spawn anything, goto next spawnrequest.
-                    if (req.Team == (int)cSpawnerTeam["Team"].Enum("Spectator")) {
-                        ++numSpawnedPlayers;
+                if ((int)cSpawnerTeam["Team"] != it->Team) {
+                    // If they somehow has a valid class as spectator, don't spawn them.
+                    if (it->Team == cSpawnerTeam["Team"].Enum("Spectator")) {
+                        ++playersSpectating;
                        break;
                    }
                    continue;
                }
            }

+            // TODO: Choose a different spawner depending on class picked?
+
            // Spawn the player!
            EntityWrapper player = SpawnerSystem::Spawn(spawner, EntityWrapper::Invalid, "Player");
            // Set the player team affiliation
-            player["Team"]["Team"] = req.Team;
+            player["Team"]["Team"] = it->Team;

            // Publish a PlayerSpawned event
            Events::PlayerSpawned e;
-            e.PlayerID = req.PlayerID;
+            e.PlayerID = it->PlayerID;
            e.Player = player;
            e.Spawner = spawner;
            m_EventBroker->Publish(e);
            ++numSpawnedPlayers;
+            it = m_SpawnRequests.erase(it);
+            break;
+        }
+        if (it == m_SpawnRequests.end()) {
            break;
        }
    }
-    if (numSpawnedPlayers != (int)m_SpawnRequests.size()) {
-        LOG_DEBUG("%i players were supposed to be spawned or set as spectator, but only %i was handled.", (int)m_SpawnRequests.size(), numSpawnedPlayers);
+    if (numSpawnedPlayers != numRequestsToHandle - playersSpectating) {
+        LOG_DEBUG("%i players were supposed to be spawned, but only %i was successfully.", numRequestsToHandle - playersSpectating, numSpawnedPlayers);
    } else {
-        LOG_DEBUG("%i players were spawned or set as spectator.", numSpawnedPlayers);
+        std::string dbg = numSpawnedPlayers != 0 ? std::to_string(numSpawnedPlayers) + " players were spawned. " : "";
+        dbg += playersSpectating != 0 ? std::to_string(playersSpectating) + " players are spectating/picking class. " : "";
+        LOG_DEBUG(dbg.c_str());
    }
-    m_SpawnRequests.clear();
 }

 bool PlayerSpawnSystem::OnInputCommand(Events::InputCommand& e)
 {
-    if (e.Command != "PickTeam" && e.Command != "SwapToClassPick") {
+    if (e.Command != "PickTeam" && e.Command != "PickClass" && e.Command != "SwapToTeamPick" && e.Command != "SwapToClassPick") {
        return false;
    }

@@ -113,19 +128,6 @@ bool PlayerSpawnSystem::OnInputCommand(Events::InputCommand& e)
        return false;
    }

-    // A dead client should be able to swap to the overwatch camera.
-    if (IsClient && !LocalPlayer.Valid()) {
-        // Set the camera as active, if it exists.
-        // Find the respawn camera or class pick camera.
-        std::string camName = e.Command == "SwapToClassPick" ? "PickClassCamera" : "SpectatorCamera";
-        EntityWrapper spectatorCam = m_World->GetFirstEntityByName(camName);
-        if (spectatorCam.Valid() && spectatorCam.HasComponent("Camera")) {
-            Events::SetCamera eSetCamera;
-            eSetCamera.CameraEntity = spectatorCam;
-            m_EventBroker->Publish(eSetCamera);
-        }
-    }
-
    // Team picks should be processed ONLY server-side!
    // Don't make a spawn request if we're the client.
    if (!IsServer && m_NetworkEnabled) {
@@ -136,27 +138,38 @@ bool PlayerSpawnSystem::OnInputCommand(Events::InputCommand& e)
    auto iter = m_SpawnRequests.begin();
    for (; iter != m_SpawnRequests.end(); ++iter) {
        if (iter->PlayerID == e.PlayerID) {
-            // If player wants to switch class, remove their spawn request.
-            if (e.Command == "SwapToClassPick") {
-                m_SpawnRequests.erase(iter);
+            // If player wants to switch team or class , remove their selected class so they don't spawn.
+            if (e.Command == "SwapToTeamPick" || e.Command == "SwapToClassPick") {
+                iter->Class = PlayerClass::None;
+                return true;
            }
            break;
        }
    }

-    if (e.Command == "SwapToClassPick") {
-        return true;
-    }
+    //If we get here we got a PickTeam or PickClass, so add or alter a spawn request.

    if (iter != m_SpawnRequests.end()) {
-        // If player is in queue to spawn, then change their team affiliation in the request.
-        iter->Team = (ComponentInfo::EnumType)e.Value;
+        // If player is in queue to spawn, then change their team affiliation or class in the request.
+        if (e.Command == "PickTeam") {
+            iter->Team = (ComponentInfo::EnumType)e.Value;
+        } else {
+            iter->Class = static_cast<PlayerClass>((int)e.Value);
+        }
    } else if (m_PlayerEntities.count(e.PlayerID) == 0 || !m_PlayerEntities[e.PlayerID].Valid()) {
        // If player is not in queue to spawn, then create a spawn request, 
        // but only if they are spectating and/or just connected.
        SpawnRequest req;
        req.PlayerID = e.PlayerID;
-        req.Team = (ComponentInfo::EnumType)e.Value;
+        if (e.Command == "PickTeam") {
+            req.Team = (ComponentInfo::EnumType)e.Value;
+            req.Class = PlayerClass::None;
+        } else {
+            // Should never get here, since you should have picked a team before you ever get a chance to pick class.
+            LOG_WARNING("Sequence error: Should not be able to pick class before team");
+            req.Team = 1;           // TODO: 1 Signifies spectator, should probably have real enum here later.
+            req.Class = static_cast<PlayerClass>((int)e.Value);
+        }
        m_SpawnRequests.push_back(req);
    } else {
        return false;
@@ -191,6 +204,8 @@ bool PlayerSpawnSystem::OnPlayerSpawned(Events::PlayerSpawned& e)
        Events::SetCamera e;
        e.CameraEntity = cameraEntity;
        m_EventBroker->Publish(e);
+        Events::LockMouse lock;
+        m_EventBroker->Publish(lock);
    }

    // HACK: Set the player model color to team color
@@ -210,7 +225,7 @@ bool PlayerSpawnSystem::OnPlayerSpawned(Events::PlayerSpawned& e)

 bool PlayerSpawnSystem::OnPlayerDeath(Events::PlayerDeath& e)
 {
-    //Only spawn request if network is disabled or we are server.
+    // Only spawn request if network is disabled or we are server.
    if (!IsServer && m_NetworkEnabled) {
        return false;
    }
@@ -218,10 +233,6 @@ bool PlayerSpawnSystem::OnPlayerDeath(Events::PlayerDeath& e)
        return false;
    }
    ComponentWrapper cTeam = e.Player["Team"];
-    //A spectator can't die anyway
-    if ((ComponentInfo::EnumType)cTeam["Team"] == cTeam["Team"].Enum("Spectator")) {
-        return false;
-    }

    if (m_PlayerIDs.count(e.Player.ID) == 0) {
        return false;
@@ -230,6 +241,16 @@ bool PlayerSpawnSystem::OnPlayerDeath(Events::PlayerDeath& e)
    SpawnRequest req;
    req.PlayerID = m_PlayerIDs.at(e.Player.ID);
    req.Team = cTeam["Team"];
+    // TODO: Something better than temp class state code, if we ever add class enums in .xml
+    if (e.Player.HasComponent("DashAbility")) {
+        req.Class = PlayerClass::Assault;
+    } else if (e.Player.HasComponent("SprintAbility")) {
+        req.Class = PlayerClass::Sniper;
+    } else if (e.Player.HasComponent("ShieldAbility")) {
+        req.Class = PlayerClass::Defender;
+    } else {
+        req.Class = PlayerClass::None;
+    }
    m_SpawnRequests.push_back(req);

    return true;
@@ -0,0 +1,90 @@
+#include "Systems/SpectatorCameraSystem.h"
+#include "Rendering/ESetCamera.h"
+#include "Core/ELockMouse.h"
+
+SpectatorCameraSystem::SpectatorCameraSystem(SystemParams params)
+    : System(params)
+    , m_CamSetToTeamPick(false)
+    , m_PickedTeam(-1)
+{
+    EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &SpectatorCameraSystem::OnInputCommand);
+}
+
+void SpectatorCameraSystem::Update(double dt)
+{
+    if (!m_CamSetToTeamPick && IsClient) {
+        // Find the class pick camera and set them to it, since they need to pick a team before they can leave the screen.
+        EntityWrapper spectatorCam = m_World->GetFirstEntityByName("PickTeamCamera");
+        if (spectatorCam.HasComponent("Camera")) {
+            m_CamSetToTeamPick = true;
+            Events::SetCamera eSetCamera;
+            eSetCamera.CameraEntity = spectatorCam;
+            m_EventBroker->Publish(eSetCamera);
+            Events::UnlockMouse unlock;
+            m_EventBroker->Publish(unlock);
+        }
+    }
+}
+
+bool SpectatorCameraSystem::OnInputCommand(const Events::InputCommand& e)
+{
+    // Only the client should do this, and only if player is not spawned.
+    if (!IsClient || LocalPlayer.Valid()) {
+        return false;
+    }
+    bool swapToClass = e.Command == "PickTeam" || e.Command == "SwapToClassPick";
+    if (e.Value == 0 || !swapToClass && e.Command != "SwapToTeamPick" && e.Command != "PickClass") {
+        return false;
+    }
+
+    if (e.Command == "PickTeam") {
+        m_PickedTeam = e.Value;
+    }
+
+    // If a team has not been picked, they may not exit the pick team screen.
+    if (m_PickedTeam == -1) {
+        return false;
+    }
+
+    // A dead client should be able to swap to and between the overwatch cameras.
+    std::string camName;
+    // TODO: 1 Signifies spectator, should probably have real enum here later.
+    // Spectators should never end up at the class select, instead put them at the SpectatorCamera.
+    if (swapToClass && m_PickedTeam != 1) {
+        camName = "PickClassCamera";
+    } else if (e.Command == "SwapToTeamPick") {
+        camName = "PickTeamCamera";
+    } else {
+        camName = "SpectatorCamera";
+    }
+    EntityWrapper spectatorCam = m_World->GetFirstEntityByName(camName);
+    // Set the camera as active, if it exists.
+    if (spectatorCam.HasComponent("Camera")) {
+        // Set the class pick button visible if a blue or red team is picked, else invisible.
+        EntityWrapper HUD;
+        if (camName == "SpectatorCamera") {
+            HUD = spectatorCam.FirstChildByName("SpectatorHUD");
+        } else if (camName == "PickTeamCamera") {
+            HUD = spectatorCam.FirstChildByName("PickTeamHUD");
+        }
+        // If we are at the class pick already, or if HUD is invalid for any other reason, do nothing.
+        if (HUD.Valid()) {
+            EntityWrapper toClassButton = spectatorCam.FirstChildByName("ToClassPick");
+            if (toClassButton.Valid()) {
+                // Set ClassButton as invisible if spectator, else visible.
+                bool visible = m_PickedTeam != 1;   // TODO: 1 Signifies spectator.
+                toClassButton["Sprite"]["Visible"] = visible;
+                for (auto& child : toClassButton.ChildrenWithComponent("Text")) {
+                    child["Text"]["Visible"] = visible;
+                }
+            }
+        }
+        Events::SetCamera eSetCamera;
+        eSetCamera.CameraEntity = spectatorCam;
+        m_EventBroker->Publish(eSetCamera);
+        Events::UnlockMouse unlock;
+        m_EventBroker->Publish(unlock);
+    }
+
+    return true;
+}
Author	SHA1	Message	Date
William Moberg	f24a5a36b4	Tiny compiler bug fix.	2016-03-09 11:44:07 +01:00
William Moberg	534d6639e5	Class enum instead of hardcoded ints. Removed superfluous .Valid() checks. Check for spectator spawnrequest in case they somehow has a class, so we don't get "x players were supposed to be spawned but failed" if it happens.	2016-03-09 11:35:32 +01:00
William Moberg	b782e73556	Falsified DepthSort for SpectatorCamera buttons and CP-HUD elements.	2016-03-09 10:56:05 +01:00
William Moberg	6c673db2f4	Merge branch 'TeamPickCamera' of github.com:teamfisk/TacticalZ into TeamPickCamera	2016-03-08 19:24:55 +01:00
William Moberg	7bc3c9f7b1	Don't force to spectator camera if player presses pickTeam/Class prematurely. Players team should be remembered after picked, spawn request is not erased anymore.	2016-03-08 18:26:17 +01:00
verysecrethero	7ee4ea637b	Merge remote-tracking branch 'origin/master' into TeamPickCamera	2016-03-08 17:30:22 +01:00
William Moberg	d7f09b1a8f	Added clickable buttons to switch to class/team screens, as a better alternative to Comma/Period on the keyboard.	2016-03-08 11:59:15 +01:00
William Moberg	3436ba6656	Merge pull request #177 from teamfisk/AmmoPickup Fixed some systems added twice in Game.cpp	2016-03-08 09:46:36 +01:00
William Moberg	fcf87104c3	Replaced test textures for class picking with more proper icons.	2016-03-07 17:50:03 +01:00
William Moberg	1516ed8e2d	Removed debug logging. PlayerID in InputCommands from buttons is corrected.	2016-03-07 17:35:01 +01:00
verysecrethero	fc3a3a8f2e	Fixed a crashbug in Ammo/HealthPickup which was actually caused by systems being added twice in Game.cpp. This is also a possible fix for DamageIndicator,Capturepoint,TextField,KillFeed	2016-03-07 17:16:18 +01:00
Tobias Dahl	3edc2f4819	Merge pull request #174 from teamfisk/CapturePointFixBranch CapturePoints now have red/blue/spectator model-children	2016-03-07 15:25:22 +01:00
William Moberg	962521fa59	Merge branch 'master' into TeamPickCamera # Conflicts: # src/Game/Systems/PlayerDeathSystem.cpp	2016-03-07 15:20:46 +01:00
Adam Byléhn	9c3fa25834	Merge pull request #176 from teamfisk/PlayerHUD Player hud	2016-03-07 15:14:37 +01:00
William Moberg	282e0bf7c4	Only set spectator camera if player haven't spawned already. Don't spawn player if they switch to class pick screen.	2016-03-07 15:05:37 +01:00
verysecrethero	3eaad275ba	New CapturePointAddition fixed to work on Network by Joachim	2016-03-07 14:50:31 +01:00
verysecrethero	64df3fd7ad	CapturePoints now have red/blue/spectator model-children	2016-03-07 14:30:27 +01:00
William Moberg	0dfe00b406	Unlocks mouse when changing to SpectatorCamera and locking when respawning.	2016-03-04 09:49:27 +01:00
William Moberg	7a2f1ac9fd	Merge branch 'Weapons' into TeamPickCamera	2016-03-04 08:34:27 +01:00
William Moberg	03843774d7	Moved buttons and fixed so you can't spawn with no class.	2016-03-04 07:01:47 +01:00
William Moberg	2ecc53ecca	Merge branch 'master' into TeamPickCamera # Conflicts: # src/Game/Game.cpp	2016-03-04 05:58:49 +01:00
William Moberg	06614aa907	SpectatorCameraSystem handles the overwatch cameras. Set camera to a class pick screen when connecting. Cannot spawn until both team and class has been picked. Preparations for class aware PlayerSpawnSystem.	2016-03-04 05:41:29 +01:00