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

Separated Emulator unpaused & frame advance conditions since they are not functionally the same. Frame advance now pauses the emulator if pressed while emulator is unpaused.

This commit is contained in:
andres.delikat 2011-02-15 18:15:01 +00:00
parent fdf27ba49b
commit f5ccba7918
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BizHawk.MultiClient/MainForm.cs
View File

@ -473,13 +473,20 @@ namespace BizHawk.MultiClient
ToggleFullscreen(); ToggleFullscreen();
} }
if (EmulatorPaused == false || Global.ClientControls["Frame Advance"]) if (EmulatorPaused == false)
{ {
CaptureRewindState(); CaptureRewindState();
Global.Emulator.FrameAdvance(true); Global.Emulator.FrameAdvance(true);
if (EmulatorPaused)
Global.ClientControls.UnpressButton("Frame Advance");
} }
if (Global.ClientControls["Frame Advance"])
{
if (EmulatorPaused == false)
EmulatorPaused = true;
Global.Emulator.FrameAdvance(true);
Global.ClientControls.UnpressButton("Frame Advance");
}
Global.Sound.UpdateSound(Global.Emulator.SoundProvider); Global.Sound.UpdateSound(Global.Emulator.SoundProvider);
Render(); Render();
//RamWatch1.UpdateValues(); //TODO: This should update only once per frame //RamWatch1.UpdateValues(); //TODO: This should update only once per frame