浏览代码

Use Path.Combine for paths to textures. More changes like this required.

Dominique Louis 1 月之前
父节点
当前提交
d2d127619c

+ 18 - 17
RolePlayingGame/Core/GameScreens/Hud.cs

@@ -11,6 +11,7 @@ using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Content;
 using RolePlaying.Data;
+using System.IO;
 
 namespace RolePlaying
 {
@@ -110,39 +111,39 @@ namespace RolePlaying
             ContentManager content = screenManager.Game.Content;
 
             backgroundHudTexture = 
-                content.Load<Texture2D>(@"Textures\HUD\HudBkgd");
+                content.Load<Texture2D>(Path.Combine("Textures", "HUD", "HudBkgd"));
             topHudTexture = 
-                content.Load<Texture2D>(@"Textures\HUD\CombatStateInfoStrip");
+                content.Load<Texture2D>(Path.Combine("Textures", "HUD", "CombatStateInfoStrip"));
             activeCharInfoTexture =
-                content.Load<Texture2D>(@"Textures\HUD\PlankActive");
+                content.Load<Texture2D>(Path.Combine("Textures", "HUD", "PlankActive"));
             inActiveCharInfoTexture =
-                content.Load<Texture2D>(@"Textures\HUD\PlankInActive");
+                content.Load<Texture2D>(Path.Combine("Textures", "HUD", "PlankInActive"));
             cantUseCharInfoTexture = 
-                content.Load<Texture2D>(@"Textures\HUD\PlankCantUse");
+                content.Load<Texture2D>(Path.Combine("Textures", "HUD", "PlankCantUse"));
             selectionBracketTexture = 
-                content.Load<Texture2D>(@"Textures\HUD\SelectionBrackets");
+                content.Load<Texture2D>(Path.Combine("Textures", "HUD", "SelectionBrackets"));
             deadPortraitTexture = 
-                content.Load<Texture2D>(@"Textures\Characters\Portraits\Tombstone");
+                content.Load<Texture2D>(Path.Combine("Textures", "Characters", "Portraits", "Tombstone"));
             combatPopupTexture = 
-                content.Load<Texture2D>(@"Textures\HUD\CombatPopup");
+                content.Load<Texture2D>(Path.Combine("Textures", "HUD", "CombatPopup"));
             charSelFadeLeftTexture =
-                content.Load<Texture2D>(@"Textures\Buttons\CharSelectFadeLeft");
+                content.Load<Texture2D>(Path.Combine("Textures", "Buttons", "CharSelectFadeLeft"));
             charSelFadeRightTexture = 
-                content.Load<Texture2D>(@"Textures\Buttons\CharSelectFadeRight");
+                content.Load<Texture2D>(Path.Combine("Textures", "Buttons", "CharSelectFadeRight"));
             charSelArrowLeftTexture =
-                content.Load<Texture2D>(@"Textures\Buttons\CharSelectHlLeft");
+                content.Load<Texture2D>(Path.Combine("Textures", "Buttons", "CharSelectHlLeft"));
             charSelArrowRightTexture = 
-                content.Load<Texture2D>(@"Textures\Buttons\CharSelectHlRight");
+                content.Load<Texture2D>(Path.Combine("Textures", "Buttons", "CharSelectHlRight"));
             actionTexture = 
-                content.Load<Texture2D>(@"Textures\HUD\HudSelectButton");
+                content.Load<Texture2D>(Path.Combine("Textures", "HUD", "HudSelectButton"));
             yButtonTexture =
-                content.Load<Texture2D>(@"Textures\Buttons\YButton");
+                content.Load<Texture2D>(Path.Combine("Textures", "Buttons", "YButton"));
             startButtonTexture = 
-                content.Load<Texture2D>(@"Textures\Buttons\StartButton");
+                content.Load<Texture2D>(Path.Combine("Textures", "Buttons", "StartButton"));
             menuTexture = 
-                content.Load<Texture2D>(@"Textures\HUD\Menu");
+                content.Load<Texture2D>(Path.Combine("Textures", "HUD", "Menu"));
             statsTexture =
-                content.Load<Texture2D>(@"Textures\HUD\Stats");
+                content.Load<Texture2D>(Path.Combine("Textures", "HUD", "Stats"));
         }
 
 

+ 1 - 1
RolePlayingGame/RolePlayingGameData/Animation/AnimatingSprite.cs

@@ -480,7 +480,7 @@ namespace RolePlaying.Data
             {
                 TextureName = (string)xElement.Element("TextureName"),
                 Texture = contentManager.Load<Texture2D>(
-                    Path.Combine(@"Textures\", (string)xElement.Element("TextureName"))),
+                    Path.Combine(@"Textures", (string)xElement.Element("TextureName"))),
                 FrameDimensions = new Point(
                     int.Parse(xElement.Element("FrameDimensions").Value.Split(' ')[0]),
                     int.Parse(xElement.Element("FrameDimensions").Value.Split(' ')[1])),

+ 6 - 9
RolePlayingGame/RolePlayingGameData/Characters/Player.cs

@@ -239,18 +239,15 @@ namespace RolePlaying.Data
                 player.ActivePortraitTextureName = input.ReadString();
                 player.activePortraitTexture =
                     input.ContentManager.Load<Texture2D>(
-                        System.IO.Path.Combine(@"Textures\Characters\Portraits",
-                        player.ActivePortraitTextureName));
+                        Path.Combine("Textures", "Characters", "Portraits", player.ActivePortraitTextureName));
                 player.InactivePortraitTextureName = input.ReadString();
                 player.inactivePortraitTexture =
                     input.ContentManager.Load<Texture2D>(
-                        System.IO.Path.Combine(@"Textures\Characters\Portraits",
-                        player.InactivePortraitTextureName));
+                        Path.Combine("Textures", "Characters", "Portraits", player.InactivePortraitTextureName));
                 player.UnselectablePortraitTextureName = input.ReadString();
                 player.unselectablePortraitTexture =
                     input.ContentManager.Load<Texture2D>(
-                        System.IO.Path.Combine(@"Textures\Characters\Portraits",
-                        player.UnselectablePortraitTextureName));
+                        Path.Combine("Textures", "Characters", "Portraits", player.UnselectablePortraitTextureName));
 
                 return player;
             }
@@ -331,13 +328,13 @@ namespace RolePlaying.Data
                 JoinRejectedDialogue = (string)asset.Element("JoinRejectedDialogue"),
                 ActivePortraitTextureName = (string)asset.Element("ActivePortraitTextureName"),
                 ActivePortraitTexture = contentManager.Load<Texture2D>(
-                    Path.Combine(@"Textures\Characters\Portraits", (string)asset.Element("ActivePortraitTextureName"))),
+                    Path.Combine("Textures", "Characters", "Portraits", (string)asset.Element("ActivePortraitTextureName"))),
                 InactivePortraitTextureName = (string)asset.Element("InactivePortraitTextureName"),
                 InactivePortraitTexture = contentManager.Load<Texture2D>(
-                    Path.Combine(@"Textures\Characters\Portraits", (string)asset.Element("InactivePortraitTextureName"))),
+                    Path.Combine("Textures", "Characters", "Portraits", (string)asset.Element("InactivePortraitTextureName"))),
                 UnselectablePortraitTextureName = (string)asset.Element("UnselectablePortraitTextureName"),
                 UnselectablePortraitTexture = contentManager.Load<Texture2D>(
-                    Path.Combine(@"Textures\Characters\Portraits", (string)asset.Element("UnselectablePortraitTextureName"))),
+                    Path.Combine("Textures", "Characters", "Portraits", (string)asset.Element("UnselectablePortraitTextureName"))),
                 Inventory = asset.Element("Inventory")?.Elements("Item")
                     .Select(x => new ContentEntry<Gear>
                     {

+ 2 - 2
RolePlayingGame/RolePlayingGameData/Map/Inn.cs

@@ -142,7 +142,7 @@ namespace RolePlaying.Data
                 inn.NotEnoughGoldMessage = input.ReadString();
                 inn.ShopkeeperTextureName = input.ReadString();
                 inn.shopkeeperTexture = input.ContentManager.Load<Texture2D>(
-                    System.IO.Path.Combine(@"Textures\Characters\Portraits", 
+                    System.IO.Path.Combine("Textures", "Characters", "Portraits", 
                     inn.ShopkeeperTextureName));
 
                 return inn;
@@ -162,7 +162,7 @@ namespace RolePlaying.Data
                 NotEnoughGoldMessage = asset.Element("NotEnoughGoldMessage").Value,
                 ShopkeeperTextureName = asset.Element("ShopkeeperTextureName").Value,
                 ShopkeeperTexture = contentManager.Load<Texture2D>(
-                    System.IO.Path.Combine(@"Textures\Characters\Portraits",
+                    System.IO.Path.Combine("Textures", "Characters", "Portraits",
                     asset.Element("ShopkeeperTextureName").Value)),
             };
             return inn;