Merge branch 'develop' of https://github.com/NoobDevGame/GameJam2017 …

…into develop
NoobDevGame · Jan 8, 2017 · 4eebcf6 · 4eebcf6
2 parents f91e3de + 5bf9a39
commit 4eebcf6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/GameJam2017/NoobFight/Screens/OptionsScreen.cs b/GameJam2017/NoobFight/Screens/OptionsScreen.cs
@@ -32,11 +32,11 @@ public OptionsScreen(ScreenComponent manager) : base(manager)
             HorizontalAlignment = HorizontalAlignment.Stretch;
             Controls.Add(mainStack);
 
-            var playerTextures = File.ReadAllLines("content/playertextures.txt").ToList();
+            var playerTextures = manager.Content.ListContent("player");
 
             List<PlayerTexture> playerTex = new List<PlayerTexture>();
 
-            foreach(var tex in playerTextures)
+            foreach(var tex in playerTextures.Select(Path.GetFileNameWithoutExtension))
             {
                 try
                 {