diff --git a/Blarg.GameFramework/Blarg.GameFramework.csproj b/Blarg.GameFramework/Blarg.GameFramework.csproj index 684c704..5385b18 100644 --- a/Blarg.GameFramework/Blarg.GameFramework.csproj +++ b/Blarg.GameFramework/Blarg.GameFramework.csproj @@ -194,6 +194,7 @@ + diff --git a/Blarg.GameFramework/Content/ContentManagementException.cs b/Blarg.GameFramework/Content/ContentManagementException.cs new file mode 100644 index 0000000..7356d6f --- /dev/null +++ b/Blarg.GameFramework/Content/ContentManagementException.cs @@ -0,0 +1,23 @@ +using System; + +namespace Blarg.GameFramework.Content +{ + public class ContentManagementException : Exception + { + public ContentManagementException() + : base() + { + } + + public ContentManagementException(String message) + : base(message) + { + } + + public ContentManagementException(String message, Exception innerException) + : base(message, innerException) + { + } + } +} + diff --git a/Blarg.GameFramework/Content/ContentManager.cs b/Blarg.GameFramework/Content/ContentManager.cs index 45986a3..a070152 100644 --- a/Blarg.GameFramework/Content/ContentManager.cs +++ b/Blarg.GameFramework/Content/ContentManager.cs @@ -32,7 +32,7 @@ namespace Blarg.GameFramework.Content { var loader = GetLoader(); if (loader == null) - throw new InvalidOperationException("No registered loader for this content type."); + throw new ContentManagementException("No registered loader for this content type."); else return loader.Get(name, null); @@ -42,7 +42,7 @@ namespace Blarg.GameFramework.Content { var loader = GetLoader(); if (loader == null) - throw new InvalidOperationException("No registered loader for this content type."); + throw new ContentManagementException("No registered loader for this content type."); else return loader.Get(name, contentParameters); } @@ -51,7 +51,7 @@ namespace Blarg.GameFramework.Content { var loader = GetLoader(); if (loader == null) - throw new InvalidOperationException("No registered loader for this content type."); + throw new ContentManagementException("No registered loader for this content type."); else return loader.Pin(name, null); } @@ -60,7 +60,7 @@ namespace Blarg.GameFramework.Content { var loader = GetLoader(); if (loader == null) - throw new InvalidOperationException("No registered loader for this content type."); + throw new ContentManagementException("No registered loader for this content type."); else return loader.Pin(name, contentParameters); } @@ -75,7 +75,7 @@ namespace Blarg.GameFramework.Content { var loader = GetLoader(); if (loader == null) - throw new InvalidOperationException("No registered loader for this content type."); + throw new ContentManagementException("No registered loader for this content type."); else loader.RemoveAll(removePinnedContent); } @@ -87,7 +87,7 @@ namespace Blarg.GameFramework.Content var loader = GetLoader(); if (loader == null) - throw new InvalidOperationException("No registered loader for this content type."); + throw new ContentManagementException("No registered loader for this content type."); else return loader.GetNameOf(content); } diff --git a/Blarg.GameFramework/Content/Types/SpriteFontLoader.cs b/Blarg.GameFramework/Content/Types/SpriteFontLoader.cs index 7714261..37edb96 100644 --- a/Blarg.GameFramework/Content/Types/SpriteFontLoader.cs +++ b/Blarg.GameFramework/Content/Types/SpriteFontLoader.cs @@ -48,7 +48,7 @@ namespace Blarg.GameFramework.Content.Types using (var stream = Framework.FileSystem.Open(fontFilename)) { if (stream == null) - throw new Exception("Failed to load font file when reloading sprite font."); + throw new ContentManagementException("Failed to load font file when reloading sprite font."); SpriteFontTrueTypeLoader.Load(Framework.GraphicsDevice, stream, size, font); } @@ -76,7 +76,7 @@ namespace Blarg.GameFramework.Content.Types int startOfSize = filename.LastIndexOf(':'); if (startOfSize == -1) - throw new InvalidOperationException("Font filename does not contain any size information."); + throw new ContentManagementException("Font filename does not contain any size information."); fontFilename = filename.Substring(0, startOfSize); size = Convert.ToInt32(filename.Substring(startOfSize + 1)); diff --git a/Blarg.GameFramework/Content/Types/TextureLoader.cs b/Blarg.GameFramework/Content/Types/TextureLoader.cs index 2659cf5..21d99a9 100644 --- a/Blarg.GameFramework/Content/Types/TextureLoader.cs +++ b/Blarg.GameFramework/Content/Types/TextureLoader.cs @@ -45,10 +45,10 @@ namespace Blarg.GameFramework.Content.Types var image = LoadImage(file); if (image == null) - throw new Exception("Failed to load image when reloading texture."); + throw new ContentManagementException("Failed to load image when reloading texture."); if (texture.Width != image.Width || texture.Height != image.Height) - throw new Exception("Image dimensions have changed since original texture creation."); + throw new ContentManagementException("Image dimensions have changed since original texture creation."); texture.Update(image, 0, 0); }