diff --git a/HaCreator/MapEditor/Info/BackgroundInfo.cs b/HaCreator/MapEditor/Info/BackgroundInfo.cs index c362b817..52e3d004 100644 --- a/HaCreator/MapEditor/Info/BackgroundInfo.cs +++ b/HaCreator/MapEditor/Info/BackgroundInfo.cs @@ -196,6 +196,7 @@ public BoardItem CreateInstance(Board board, int x, int y, int z, int rx, int ry #region Members + [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "")] public string bS { get { return _bS; } @@ -211,6 +212,7 @@ public BackgroundInfoType Type set { this._type = value; } } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "")] public string no { get { return _no; } diff --git a/HaCreator/MapEditor/Instance/BackgroundInstance.cs b/HaCreator/MapEditor/Instance/BackgroundInstance.cs index aa91f012..50e777fc 100644 --- a/HaCreator/MapEditor/Instance/BackgroundInstance.cs +++ b/HaCreator/MapEditor/Instance/BackgroundInstance.cs @@ -140,30 +140,35 @@ public int ry set { _ry = value; } } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "")] public int cx { get { return _cx; } set { _cx = value; } } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "")] public int cy { get { return _cy; } set { _cy = value; } } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "")] public int a { get { return _a; } set { _a = value; } } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "")] public BackgroundType type { get { return _type; } set { _type = value; } } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "")] public bool front { get { return _front; } diff --git a/HaCreator/MapSimulator/MapSimulatorLoader.cs b/HaCreator/MapSimulator/MapSimulatorLoader.cs index 2714965e..ecd7f643 100644 --- a/HaCreator/MapSimulator/MapSimulatorLoader.cs +++ b/HaCreator/MapSimulator/MapSimulatorLoader.cs @@ -510,6 +510,9 @@ public static NpcItem CreateNpcFromProperty(TexturePool texturePool, NpcInstance /// public static MinimapItem CreateMinimapFromProperty(WzSubProperty minimapFrameProperty, Board mapBoard, GraphicsDevice device, string MapName, string StreetName) { + if (mapBoard.MiniMap == null) + return null; + WzSubProperty maxMapProperty = (WzSubProperty)minimapFrameProperty["MaxMap"]; WzSubProperty miniMapProperty = (WzSubProperty)minimapFrameProperty["MinMap"]; WzSubProperty maxMapMirrorProperty = (WzSubProperty)minimapFrameProperty["MaxMapMirror"]; // for Zero maps