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

# Conflicts: # resources/Schema/Entities/Player.xml # resources/Schema/Types/Entity.xsd # src/Game/Systems/PlayerSpawnSystem.cpp
2016-02-12 07:18:20 +01:00
parent 78e318c032 f146971db0
commit 47f4711b85
13 changed files with 1593 additions and 12 deletions
@@ -181,10 +181,10 @@ bool PlayerSpawnSystem::OnPlayerDeath(Events::PlayerDeath& e)
        return false;
    }

-    SpawnRequest req;
-    req.PlayerID = m_PlayerIDs.at(e.Player.ID);
-    req.Team = cTeam["Team"];
-    m_SpawnRequests.push_back(req);
+        SpawnRequest req;
+        req.PlayerID = m_PlayerIDs.at(e.Player.ID);
+        req.Team = cTeam["Team"];
+        m_SpawnRequests.push_back(req);

    return true;
 }