From 67624e14aefe152c48c2dfd1ecfcd6e22bdcbc60 Mon Sep 17 00:00:00 2001 From: Raymond Date: Mon, 9 Aug 2021 12:03:50 -0400 Subject: [PATCH] Name the tuple in BaseAddressResolver --- Dalamud/Game/{Internal => }/BaseAddressResolver.cs | 6 +++--- Dalamud/Interface/Internal/Windows/DataWindow.cs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename Dalamud/Game/{Internal => }/BaseAddressResolver.cs (94%) diff --git a/Dalamud/Game/Internal/BaseAddressResolver.cs b/Dalamud/Game/BaseAddressResolver.cs similarity index 94% rename from Dalamud/Game/Internal/BaseAddressResolver.cs rename to Dalamud/Game/BaseAddressResolver.cs index 287bacaaa..b1873b0d7 100644 --- a/Dalamud/Game/Internal/BaseAddressResolver.cs +++ b/Dalamud/Game/BaseAddressResolver.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; -namespace Dalamud.Game.Internal +namespace Dalamud.Game { /// /// Base memory address resolver. @@ -11,9 +11,9 @@ namespace Dalamud.Game.Internal public abstract class BaseAddressResolver { /// - /// A list of memory addresses that were found, to list in /xldata. + /// Gets a list of memory addresses that were found, to list in /xldata. /// - public static Dictionary> DebugScannedValues = new(); + public static Dictionary> DebugScannedValues { get; } = new(); /// /// Gets or sets a value indicating whether the resolver has successfully run or . diff --git a/Dalamud/Interface/Internal/Windows/DataWindow.cs b/Dalamud/Interface/Internal/Windows/DataWindow.cs index f024af818..23f869f9d 100644 --- a/Dalamud/Interface/Internal/Windows/DataWindow.cs +++ b/Dalamud/Interface/Internal/Windows/DataWindow.cs @@ -286,11 +286,11 @@ namespace Dalamud.Interface.Internal.Windows foreach (var valueTuple in debugScannedValue.Value) { ImGui.TextUnformatted( - $" {valueTuple.Item1} - 0x{valueTuple.Item2.ToInt64():x}"); + $" {valueTuple.ClassName} - 0x{valueTuple.Address.ToInt64():x}"); ImGui.SameLine(); if (ImGui.Button($"C##copyAddress{this.copyButtonIndex++}")) - ImGui.SetClipboardText(valueTuple.Item2.ToInt64().ToString("x")); + ImGui.SetClipboardText(valueTuple.Address.ToInt64().ToString("x")); } } }