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

add a few missed ServiceInjection uses

This commit is contained in:
goyuken 2014-12-21 18:25:04 +00:00
parent d28d5e5a9b
commit d1580567dd
6 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs
View File

@ -18,6 +18,7 @@ namespace BizHawk.Client.EmuHawk.tools.Debugger
public IDebuggable Core { get; set; }
public IMemoryCallbackSystem MCS { get; set; }
public GenericDebugger ParentDebugger { get; set; }
public MemoryDomainList MemoryDomains { get; set; }
private readonly BreakpointList Breakpoints = new BreakpointList();
public BreakpointControl()

1
BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
View File

@ -124,6 +124,7 @@ namespace BizHawk.Client.EmuHawk
BreakPointControl1.Core = Debuggable;
BreakPointControl1.MCS = MCS;
BreakPointControl1.ParentDebugger = this;
BreakPointControl1.MemoryDomains = MemoryDomains;
BreakPointControl1.GenerateUI();
StepIntoMenuItem.Enabled = StepIntoBtn.Enabled = CanStepInto;

4
BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.cs
View File

@ -15,6 +15,8 @@ namespace BizHawk.Client.EmuHawk
{
public partial class GreenzoneSettingsForm : Form
{
public IStatable Statable { get; set; }
private readonly TasStateManagerSettings Settings;
private decimal _stateSizeMb;
public GreenzoneSettingsForm(TasStateManagerSettings settings)
@ -25,7 +27,7 @@ namespace BizHawk.Client.EmuHawk
private void GreenzoneSettings_Load(object sender, EventArgs e)
{
_stateSizeMb = Global.Emulator.AsStatable().SaveStateBinary().Length / (decimal)1024 / (decimal)1024;
_stateSizeMb = Statable.SaveStateBinary().Length / (decimal)1024 / (decimal)1024;
SaveGreenzoneCheckbox.Checked = Settings.SaveGreenzone;
CapacityNumeric.Value = Settings.Capacitymb == 0 ? 1 : Settings.Capacitymb < CapacityNumeric.Maximum ?

4
BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
View File

@ -8,12 +8,14 @@ using System.Text;
using System.Windows.Forms;
using BizHawk.Client.Common;
using BizHawk.Emulation.Common;
namespace BizHawk.Client.EmuHawk
{
public partial class MarkerControl : UserControl
{
public TAStudio Tastudio { get; set; }
public IEmulator Emulator { get; set; }
public MarkerControl()
{
@ -48,7 +50,7 @@ namespace BizHawk.Client.EmuHawk
private void MarkerView_QueryItemBkColor(int index, InputRoll.RollColumn column, ref Color color)
{
var prev = Tastudio.CurrentTasMovie.Markers.PreviousOrCurrent(Global.Emulator.Frame);
var prev = Tastudio.CurrentTasMovie.Markers.PreviousOrCurrent(Emulator.Frame);
if (prev != null && index == Tastudio.CurrentTasMovie.Markers.IndexOf(prev))
{

3
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
View File

@ -576,7 +576,8 @@ namespace BizHawk.Client.EmuHawk
new GreenzoneSettingsForm(CurrentTasMovie.TasStateManager.Settings)
{
Owner = GlobalWin.MainForm,
Location = this.ChildPointToScreen(TasView)
Location = this.ChildPointToScreen(TasView),
Statable = this.StatableEmulator
}.Show();
UpdateChangesIndicator();
}

1
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -47,6 +47,7 @@ namespace BizHawk.Client.EmuHawk
WantsToControlStopMovie = true;
TasPlaybackBox.Tastudio = this;
MarkerControl.Tastudio = this;
MarkerControl.Emulator = this.Emulator;
TasView.QueryItemText += TasView_QueryItemText;
TasView.QueryItemBkColor += TasView_QueryItemBkColor;
TasView.QueryItemIcon += TasView_QueryItemIcon;