From 92e4c9b8f711618d8050cd4b0640c608c697effc Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 7 Apr 2020 13:40:49 -0700 Subject: [PATCH] Visualization fixes --- NHSE.Core/Save/Files/MainSave.cs | 2 +- NHSE.Core/Structures/Item/FieldItem/FieldItem.cs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NHSE.Core/Save/Files/MainSave.cs b/NHSE.Core/Save/Files/MainSave.cs index 7ae578e..2b7ad28 100644 --- a/NHSE.Core/Save/Files/MainSave.cs +++ b/NHSE.Core/Save/Files/MainSave.cs @@ -65,7 +65,7 @@ public void SetAcreBytes(byte[] data) public TerrainTile[] GetTerrain() => TerrainTile.GetArray(Data.Slice(Offsets.Terrain, MapGrid.MapTileCount16x16 * TerrainTile.SIZE)); public void SetTerrain(IReadOnlyList array) => TerrainTile.SetArray(array).CopyTo(Data, Offsets.Terrain); - public FieldItem[] GetFieldItems() => FieldItem.GetArray(Data.Slice(Offsets.FieldItem, MapGrid.MapTileCount32x32 * FieldItem.SIZE)); + public FieldItem[] GetFieldItems() => FieldItem.GetArray(Data.Slice(Offsets.FieldItem, MapGrid.MapTileCount32x32 * FieldItem.SIZE * 2)); public void SetFieldItems(IReadOnlyList array) => FieldItem.SetArray(array).CopyTo(Data, Offsets.FieldItem); public uint PlazaX diff --git a/NHSE.Core/Structures/Item/FieldItem/FieldItem.cs b/NHSE.Core/Structures/Item/FieldItem/FieldItem.cs index 1a2c4f0..d832c23 100644 --- a/NHSE.Core/Structures/Item/FieldItem/FieldItem.cs +++ b/NHSE.Core/Structures/Item/FieldItem/FieldItem.cs @@ -12,7 +12,7 @@ public class FieldItem public bool IsNone => ItemType == NONE; public bool IsExtension => ItemType == EXTENSION; - public bool IsItem => !IsExtension; + public bool IsRoot => ItemType < EXTENSION; // Item Definition [FieldOffset(0)] public ushort ItemId; @@ -31,6 +31,8 @@ public class FieldItem public ushort DisplayItemId => IsExtension ? ExtensionItemId : ItemId; + public FieldItem() { } // marshalling + public void CopyFrom(FieldItem item) { ItemType = item.ItemType;