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

susch19 · susch19 · commit 4eebcf672639 · 2017-01-08T19:15:48.000+01:00
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
                 {

Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,11 @@ public OptionsScreen(ScreenComponent manager) : base(manager)`
`32`	`32`	`HorizontalAlignment = HorizontalAlignment.Stretch;`
`33`	`33`	`Controls.Add(mainStack);`
`34`	`34`
`35`		`- var playerTextures = File.ReadAllLines("content/playertextures.txt").ToList();`
	`35`	`+ var playerTextures = manager.Content.ListContent("player");`
`36`	`36`
`37`	`37`	`List<PlayerTexture> playerTex = new List<PlayerTexture>();`
`38`	`38`
`39`		`- foreach(var tex in playerTextures)`
	`39`	`+ foreach(var tex in playerTextures.Select(Path.GetFileNameWithoutExtension))`
`40`	`40`	`{`
`41`	`41`	`try`
`42`	`42`	`{`