From db11df380418132f8257c4689a7c5ad66df8798a Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Sun, 15 Sep 2024 22:53:21 -0700
Subject: [PATCH] A few more Stella cleanups
---
.../Consoles/Atari/Stella/Stella.IEmulator.cs | 2 +-
.../Consoles/Atari/Stella/Stella.IMemoryDomains.cs | 9 ++++-----
.../Consoles/Atari/Stella/Stella.IVideoProvider.cs | 2 +-
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IEmulator.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IEmulator.cs
index e6533af2c8..894f10d9b2 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IEmulator.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IEmulator.cs
@@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Cores.Atari.Stella
public ControllerDefinition ControllerDefinition => _controllerDeck.Definition;
- private bool _leftDifficultyToggled;
+ private bool _leftDifficultyToggled;
private bool _rightDifficultyToggled;
public bool FrameAdvance(IController controller, bool render, bool renderSound)
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IMemoryDomains.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IMemoryDomains.cs
index 1d0403bb98..4bcf42ce91 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IMemoryDomains.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IMemoryDomains.cs
@@ -6,12 +6,11 @@ namespace BizHawk.Emulation.Cores.Atari.Stella
{
public partial class Stella
{
- internal IMemoryDomains MemoryDomains;
- private uint _cartMemSize;
+ private IMemoryDomains MemoryDomains;
private void SetupMemoryDomains()
{
- _cartMemSize = Core.stella_get_cartram_size();
+ var cartMemSize = Core.stella_get_cartram_size();
var mainRamAddress = IntPtr.Zero;
Core.stella_get_mainram_ptr(ref mainRamAddress);
@@ -42,11 +41,11 @@ namespace BizHawk.Emulation.Cores.Atari.Stella
1)
};
- if (_cartMemSize > 0)
+ if (cartMemSize > 0)
{
domains.Add(new MemoryDomainDelegate(
"Cart Ram",
- _cartMemSize,
+ cartMemSize,
MemoryDomain.Endian.Little,
addr => Core.stella_peek_cartram((uint)addr),
(addr, value) => Core.stella_poke_cartram((uint)addr, value),
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IVideoProvider.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IVideoProvider.cs
index 21f9407f93..dc730817b1 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IVideoProvider.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IVideoProvider.cs
@@ -31,7 +31,7 @@ namespace BizHawk.Emulation.Cores.Atari.Stella
var src = IntPtr.Zero;
Core.stella_get_video(out var width, out var height, out _, ref src);
- BufferWidth = width;
+ BufferWidth = width;
BufferHeight = height;
if (_vidBuff.Length < BufferWidth * BufferHeight)