ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

some nitpick cleanups

This commit is contained in:
adelikat 2020-04-12 12:38:02 -05:00
parent acf959fd4b
commit 6e40c46aa1
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs
View File

@ -540,7 +540,7 @@ namespace BizHawk.Client.EmuHawk
#endregion
unsafe void DrawEverything()
private unsafe void DrawEverything()
{
ushort dispcnt = ((ushort*)_mmio)[0];
@ -654,7 +654,7 @@ namespace BizHawk.Client.EmuHawk
return mdv;
}
void GenerateWidgets()
private void GenerateWidgets()
{
listBoxWidgets.BeginUpdate();
_bg0 = MakeMBVWidget("Background 0", 256, 256);
@ -688,7 +688,7 @@ namespace BizHawk.Client.EmuHawk
}
}
static void BringToFrontHack(Control c, Control top)
private static void BringToFrontHack(Control c, Control top)
{
c.Click += (o, e) => top.BringToFront();
if (c.HasChildren)
@ -742,7 +742,7 @@ namespace BizHawk.Client.EmuHawk
// Do nothing
}
void ShowSelectedWidget()
private void ShowSelectedWidget()
{
if (listBoxWidgets.SelectedItem != null)
{

18
BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs
View File

@ -54,12 +54,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
ServiceProvider = ser;
PutSettings(_settings);
_tracer = new TraceBuffer
Tracer = new TraceBuffer
{
Header = "ARM7: PC, machine code, mnemonic, operands, registers"
};
_tracecb = new LibmGBA.TraceCallback((msg) => _tracer.Put(_traceInfo(msg)));
ser.Register(_tracer);
_tracecb = msg => Tracer.Put(_traceInfo(msg));
ser.Register(Tracer);
MemoryCallbacks = new MGBAMemoryCallbackSystem(this);
}
catch
@ -75,7 +75,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
public ControllerDefinition ControllerDefinition => GBA.GBAController;
private ITraceable _tracer { get; set; }
private ITraceable Tracer { get; }
private LibmGBA.TraceCallback _tracecb { get; set; }
@ -102,7 +102,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
};
}
public bool FrameAdvance(IController controller, bool render, bool rendersound = true)
public bool FrameAdvance(IController controller, bool render, bool renderSound = true)
{
Frame++;
if (controller.IsPressed("Power"))
@ -113,14 +113,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
WireMemoryDomainPointers();
}
LibmGBA.BizSetTraceCallback(_tracer.Enabled ? _tracecb : null);
LibmGBA.BizSetTraceCallback(Tracer.Enabled ? _tracecb : null);
IsLagFrame = LibmGBA.BizAdvance(
Core,
VBANext.GetButtons(controller),
render ? _videobuff : _dummyvideobuff,
ref _nsamp,
rendersound ? _soundbuff : _dummysoundbuff,
renderSound ? _soundbuff : _dummysoundbuff,
RTCTime(),
(short)controller.AxisValue("Tilt X"),
(short)controller.AxisValue("Tilt Y"),
@ -245,9 +245,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
return (long)DateTime.Now.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
}
long basetime = (long)_syncSettings.RTCInitialTime.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
long baseTime = (long)_syncSettings.RTCInitialTime.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
long increment = Frame * 4389L >> 18;
return basetime + increment;
return baseTime + increment;
}
}
}