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

oops, put Rewinder in Global not GlobalWin

This commit is contained in:
adelikat 2013-12-27 01:19:38 +00:00
parent b5d3f68126
commit f122105b42
5 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.Client.Common/Global.cs
View File

@ -12,6 +12,7 @@ namespace BizHawk.Client.Common
public static GameInfo Game;
public static CheatCollection CheatList;
public static FirmwareManager FirmwareManager;
public static Rewinder Rewinder;
//Movie

1
BizHawk.Client.EmuHawk/GlobalWin.cs
View File

@ -9,7 +9,6 @@ namespace BizHawk.Client.EmuHawk
{
public static MainForm MainForm;
public static ToolManager Tools;
public static Rewinder Rewinder;
#if WINDOWS
public static DirectSound DSound;
public static Direct3D Direct3D;

16
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -47,7 +47,7 @@ namespace BizHawk.Client.EmuHawk
public MainForm(string[] args)
{
GlobalWin.MainForm = this;
GlobalWin.Rewinder = new Rewinder()
Global.Rewinder = new Rewinder()
{
MessageCallback = GlobalWin.OSD.AddMessage
};
@ -2473,12 +2473,12 @@ namespace BizHawk.Client.EmuHawk
// TODO: mostly likely this will need to be whacked, if not then refactor
bool ReturnToRecording = Global.MovieSession.Movie.IsRecording;
if (GlobalWin.Rewinder.RewindActive && (Global.ClientControls["Rewind"] || PressRewind))
if (Global.Rewinder.RewindActive && (Global.ClientControls["Rewind"] || PressRewind))
{
GlobalWin.Rewinder.Rewind(1);
Global.Rewinder.Rewind(1);
suppressCaptureRewind = true;
runFrame = !(GlobalWin.Rewinder.Count == 0);
runFrame = !(Global.Rewinder.Count == 0);
//we don't want to capture input when rewinding, even in record mode
if (Global.MovieSession.Movie.IsRecording)
@ -2539,7 +2539,7 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.OSD.FPS = fps_string;
}
if (!suppressCaptureRewind && GlobalWin.Rewinder.RewindActive) GlobalWin.Rewinder.CaptureRewindState();
if (!suppressCaptureRewind && Global.Rewinder.RewindActive) Global.Rewinder.CaptureRewindState();
if (!_runloopFrameadvance) genSound = true;
else if (!Global.Config.MuteFrameAdvance)
@ -2929,7 +2929,7 @@ namespace BizHawk.Client.EmuHawk
}
Text = DisplayNameForSystem(loader.Game.System) + " - " + loader.Game.Name;
GlobalWin.Rewinder.ResetRewindBuffer();
Global.Rewinder.ResetRewindBuffer();
if (Global.Emulator.CoreComm.RomStatusDetails == null && loader.Rom != null)
{
@ -2980,7 +2980,7 @@ namespace BizHawk.Client.EmuHawk
UpdateStatusSlots();
UpdateDumpIcon();
GlobalWin.Rewinder.CaptureRewindState();
Global.Rewinder.CaptureRewindState();
Global.StickyXORAdapter.ClearStickies();
Global.StickyXORAdapter.ClearStickyFloats();
@ -3164,7 +3164,7 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.Restart();
RewireSound();
GlobalWin.Rewinder.ResetRewindBuffer();
Global.Rewinder.ResetRewindBuffer();
Text = "BizHawk" + (VersionInfo.INTERIM ? " (interim) " : String.Empty);
HandlePlatformMenus();
_stateSlots.Clear();

15
BizHawk.Client.EmuHawk/config/RewindConfig.cs
View File

@ -19,10 +19,10 @@ namespace BizHawk.Client.EmuHawk
private void RewindConfig_Load(object sender, EventArgs e)
{
if (GlobalWin.Rewinder.HasBuffer)
if (Global.Rewinder.HasBuffer)
{
FullnessLabel.Text = String.Format("{0:0.00}", GlobalWin.Rewinder.FullnessRatio * 100) + "%";
RewindFramesUsedLabel.Text = GlobalWin.Rewinder.Count.ToString();
FullnessLabel.Text = String.Format("{0:0.00}", Global.Rewinder.FullnessRatio * 100) + "%";
RewindFramesUsedLabel.Text = Global.Rewinder.Count.ToString();
}
else
{
@ -126,11 +126,8 @@ namespace BizHawk.Client.EmuHawk
Global.Config.RewindEnabledSmall = SmallStateEnabledBox.Checked;
Global.Config.RewindEnabledMedium = MediumStateEnabledBox.Checked;
Global.Config.RewindEnabledLarge = LargeStateEnabledBox.Checked;
GlobalWin.Rewinder.DoRewindSettings();
Global.Rewinder.DoRewindSettings();
Global.Config.Rewind_UseDelta = UseDeltaCompression.Checked;
Global.Config.Rewind_MediumStateSize = (int)(MediumStateUpDown.Value * 1024);
Global.Config.Rewind_LargeStateSize = (int)(LargeStateUpDown.Value * 1024);
Global.Config.Rewind_OnDisk = DiskBufferCheckbox.Checked;
@ -260,9 +257,9 @@ namespace BizHawk.Client.EmuHawk
if (UseDeltaCompression.Checked || _stateSize == 0)
{
if (GlobalWin.Rewinder.Count > 0)
if (Global.Rewinder.Count > 0)
{
avg_state_size = GlobalWin.Rewinder.Size / GlobalWin.Rewinder.Count;
avg_state_size = Global.Rewinder.Size / Global.Rewinder.Count;
}
else
{

4
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs
View File

@ -67,12 +67,12 @@ namespace BizHawk.Client.EmuHawk
{
if (temp == "0" || temp.ToLower() == "false")
{
GlobalWin.Rewinder.RewindActive = false;
Global.Rewinder.RewindActive = false;
GlobalWin.OSD.AddMessage("Rewind suspended");
}
else
{
GlobalWin.Rewinder.RewindActive = true;
Global.Rewinder.RewindActive = true;
GlobalWin.OSD.AddMessage("Rewind enabled");
}
}