diff --git a/BizHawk.Client.Common/Api/Classes/MemApi.cs b/BizHawk.Client.Common/Api/Classes/MemApi.cs index c76dd0edb9..702512af95 100644 --- a/BizHawk.Client.Common/Api/Classes/MemApi.cs +++ b/BizHawk.Client.Common/Api/Classes/MemApi.cs @@ -95,7 +95,7 @@ namespace BizHawk.Client.Common private void WriteUnsignedByte(long addr, uint v, string domain = null) { var d = NamedDomainOrCurrent(domain); - if (!d.CanPoke()) + if (!d.Writable) { LogCallback($"Error: the domain {d.Name} is not writable"); return; @@ -235,7 +235,7 @@ namespace BizHawk.Client.Common public void WriteByteRange(long addr, List memoryblock, string domain = null) { var d = NamedDomainOrCurrent(domain); - if (!d.CanPoke()) + if (!d.Writable) { LogCallback($"Error: the domain {d.Name} is not writable"); return; @@ -261,7 +261,7 @@ namespace BizHawk.Client.Common public void WriteFloat(long addr, double value, string domain = null) { var d = NamedDomainOrCurrent(domain); - if (!d.CanPoke()) + if (!d.Writable) { LogCallback($"Error: the domain {Domain.Name} is not writable"); return; diff --git a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs index ef366b3ab0..ae26b4c960 100644 --- a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs +++ b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs @@ -629,7 +629,7 @@ namespace BizHawk.Client.EmuHawk HexScrollBar.Value = 0; } - AddressesLabel.ForeColor = _domain.CanPoke() + AddressesLabel.ForeColor = _domain.Writable ? SystemColors.ControlText : SystemColors.ControlDarkDark; @@ -649,7 +649,7 @@ namespace BizHawk.Client.EmuHawk private void UpdateGroupBoxTitle() { var addressesString = "0x" + $"{_domain.Size / DataSize:X8}".TrimStart('0'); - var viewerText = $"{Emulator.SystemId} {_domain}{(_domain.CanPoke() ? string.Empty : " (READ-ONLY)")} - {addressesString} addresses"; + var viewerText = $"{Emulator.SystemId} {_domain}{(_domain.Writable ? string.Empty : " (READ-ONLY)")} - {addressesString} addresses"; if (_nibbles.Any()) { viewerText += $" Typing: ({MakeNibbles()})"; @@ -1245,7 +1245,7 @@ namespace BizHawk.Client.EmuHawk private void importAsBinaryToolStripMenuItem_Click(object sender, EventArgs e) { - if(!_domain.CanPoke()) + if(!_domain.Writable) { MessageBox.Show("This Memory Domain can't be Poked; so importing can't work"); return; @@ -1360,10 +1360,10 @@ namespace BizHawk.Client.EmuHawk { var data = Clipboard.GetDataObject(); PasteMenuItem.Enabled = - _domain.CanPoke() && - (_highlightedAddress.HasValue || _secondaryHighlightedAddresses.Any()) && - data != null && - data.GetDataPresent(DataFormats.Text); + _domain.Writable + && (_highlightedAddress.HasValue || _secondaryHighlightedAddresses.Any()) + && data != null + && data.GetDataPresent(DataFormats.Text); FindNextMenuItem.Enabled = !string.IsNullOrWhiteSpace(_findStr); } @@ -1536,7 +1536,7 @@ namespace BizHawk.Client.EmuHawk PokeAddressMenuItem.Enabled = FreezeAddressMenuItem.Enabled = _highlightedAddress.HasValue && - _domain.CanPoke(); + _domain.Writable; } private void MemoryDomainsMenuItem_DropDownOpened(object sender, EventArgs e) @@ -1619,7 +1619,7 @@ namespace BizHawk.Client.EmuHawk private void FreezeAddressMenuItem_Click(object sender, EventArgs e) { - if (!_domain.CanPoke()) + if (!_domain.Writable) { return; } @@ -1648,7 +1648,7 @@ namespace BizHawk.Client.EmuHawk private void PokeAddressMenuItem_Click(object sender, EventArgs e) { - if (!_domain.CanPoke()) + if (!_domain.Writable) { return; } @@ -1933,7 +1933,7 @@ namespace BizHawk.Client.EmuHawk return; } - if (!_domain.CanPoke() || !_highlightedAddress.HasValue) + if (!_domain.Writable || !_highlightedAddress.HasValue) { return; } @@ -1984,10 +1984,10 @@ namespace BizHawk.Client.EmuHawk DecrementContextItem.Visible = ContextSeparator2.Visible = (_highlightedAddress.HasValue || _secondaryHighlightedAddresses.Any()) && - _domain.CanPoke(); + _domain.Writable; UnfreezeAllContextItem.Visible = Global.CheatList.ActiveCount > 0; - PasteContextItem.Visible = _domain.CanPoke() && data != null && data.GetDataPresent(DataFormats.Text); + PasteContextItem.Visible = _domain.Writable && data != null && data.GetDataPresent(DataFormats.Text); ContextSeparator1.Visible = _highlightedAddress.HasValue || @@ -2011,7 +2011,7 @@ namespace BizHawk.Client.EmuHawk private void IncrementContextItem_Click(object sender, EventArgs e) { - if (!_domain.CanPoke()) + if (!_domain.Writable) { return; } @@ -2028,7 +2028,7 @@ namespace BizHawk.Client.EmuHawk private void DecrementContextItem_Click(object sender, EventArgs e) { - if (!_domain.CanPoke()) + if (!_domain.Writable) { return; } diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs index 524dad7566..8606fd4901 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs @@ -440,8 +440,8 @@ namespace BizHawk.Client.EmuHawk PokeAddressToolBarItem.Enabled = FreezeAddressToolBarItem.Enabled = - SelectedIndices.Any() && - _searches.Domain.CanPoke(); + SelectedIndices.Any() + && _searches.Domain.Writable; } private long? CompareToValue @@ -1227,7 +1227,7 @@ namespace BizHawk.Client.EmuHawk PokeAddressMenuItem.Enabled = FreezeAddressMenuItem.Enabled = SelectedIndices.Any() && - SelectedWatches.All(w => w.Domain.CanPoke()); + SelectedWatches.All(w => w.Domain.Writable); UndoMenuItem.Enabled = ClearUndoMenuItem.Enabled = @@ -1439,7 +1439,7 @@ namespace BizHawk.Client.EmuHawk PokeContextMenuItem.Enabled = FreezeContextMenuItem.Visible = SelectedIndices.Any() && - SelectedWatches.All(w => w.Domain.CanPoke()); + SelectedWatches.All(w => w.Domain.Writable); UnfreezeAllContextMenuItem.Visible = Global.CheatList.ActiveCount > 0; @@ -1742,8 +1742,8 @@ namespace BizHawk.Client.EmuHawk PokeAddressToolBarItem.Enabled = FreezeAddressToolBarItem.Enabled = - SelectedIndices.Any() && - _searches.Domain.CanPoke(); + SelectedIndices.Any() + && _searches.Domain.Writable; } private void WatchListView_Enter(object sender, EventArgs e) diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs index d71fe4db1c..6d7df55ced 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs @@ -193,8 +193,8 @@ namespace BizHawk.Client.EmuHawk UpdateValues(); PokeAddressToolBarItem.Enabled = FreezeAddressToolBarItem.Enabled = - SelectedIndices.Any() && - SelectedWatches.All(w => w.Domain.CanPoke()); + SelectedIndices.Any() + && SelectedWatches.All(w => w.Domain.Writable); } } } @@ -496,7 +496,7 @@ namespace BizHawk.Client.EmuHawk PokeAddressToolBarItem.Enabled = FreezeAddressToolBarItem.Enabled = SelectedIndices.Any() && - SelectedWatches.All(w => w.Domain.CanPoke()); + SelectedWatches.All(w => w.Domain.Writable); } } @@ -712,7 +712,7 @@ namespace BizHawk.Client.EmuHawk PokeAddressMenuItem.Enabled = FreezeAddressMenuItem.Enabled = SelectedIndices.Any() && - SelectedWatches.All(w => w.Domain.CanPoke()); + SelectedWatches.All(w => w.Domain.Writable); PauseMenuItem.Text = _paused ? "Unpause" : "Pause"; } @@ -1059,7 +1059,7 @@ namespace BizHawk.Client.EmuHawk PokeAddressToolBarItem.Enabled = FreezeAddressToolBarItem.Enabled = SelectedIndices.Any() && - SelectedWatches.All(w => w.Domain.CanPoke()); + SelectedWatches.All(w => w.Domain.Writable); } private void ColumnToggleCallback() @@ -1109,8 +1109,8 @@ namespace BizHawk.Client.EmuHawk PokeContextMenuItem.Enabled = FreezeContextMenuItem.Visible = - SelectedIndices.Any() && - SelectedWatches.All(w => w.Domain.CanPoke()); + SelectedIndices.Any() + && SelectedWatches.All(w => w.Domain.Writable); var allCheats = SelectedWatches.All(x => Global.CheatList.IsActive(x.Domain, x.Address)); @@ -1209,8 +1209,8 @@ namespace BizHawk.Client.EmuHawk { PokeAddressToolBarItem.Enabled = FreezeAddressToolBarItem.Enabled = - SelectedIndices.Any() && - SelectedWatches.All(w => w.Domain.CanPoke()); + SelectedIndices.Any() + && SelectedWatches.All(w => w.Domain.Writable); } private void WatchListView_MouseDoubleClick(object sender, MouseEventArgs e) diff --git a/BizHawk.Emulation.Common/Extensions.cs b/BizHawk.Emulation.Common/Extensions.cs index 4af01c1aef..d56f37b1bd 100644 --- a/BizHawk.Emulation.Common/Extensions.cs +++ b/BizHawk.Emulation.Common/Extensions.cs @@ -201,11 +201,6 @@ namespace BizHawk.Emulation.Common return core.ServiceProvider.GetService(); } - public static bool CanPoke(this MemoryDomain d) - { - return d.Writable; - } - public static bool HasRegions(this IEmulator core) { return core != null && core.ServiceProvider.HasService();