This commit is contained in:
zeromus 2015-09-08 15:56:20 -05:00
parent 21da5ad45a
commit d69a17b25e
3 changed files with 6 additions and 4 deletions

View File

@ -678,7 +678,7 @@ namespace BizHawk.Client.EmuHawk
DisplayLagCounterMenuItem.Enabled = Global.Emulator.CanPollInput(); DisplayLagCounterMenuItem.Enabled = Global.Emulator.CanPollInput();
DisplayMessagesMenuItem.Checked = Global.Config.DisplayMessages; DisplayMessagesMenuItem.Checked = Global.Config.DisplayMessages;
} }
private void WindowSizeSubMenu_DropDownOpened(object sender, EventArgs e) private void WindowSizeSubMenu_DropDownOpened(object sender, EventArgs e)
{ {

View File

@ -1897,9 +1897,12 @@ namespace BizHawk.Client.EmuHawk
LoadState(ofd.FileName, Path.GetFileName(ofd.FileName)); LoadState(ofd.FileName, Path.GetFileName(ofd.FileName));
} }
private static void SaveSlotSelectedMessage() private void SaveSlotSelectedMessage()
{ {
GlobalWin.OSD.AddMessage("Slot " + Global.Config.SaveSlot + " selected."); int slot = Global.Config.SaveSlot;
string emptypart = _stateSlots.HasSlot(slot) ? "" : " (empty)";
string message = string.Format("Slot {0}{1} selected.", slot, emptypart);
GlobalWin.OSD.AddMessage(message);
} }
private void Render() private void Render()

View File

@ -99,7 +99,6 @@ namespace BizHawk.Client.EmuHawk
if (signal_continuousframeAdvancing) if (signal_continuousframeAdvancing)
{ {
int zzz = 9;
//dont ever skip frames when continuous frame advancing. it's meant for precision work. //dont ever skip frames when continuous frame advancing. it's meant for precision work.
//but we DO need to throttle //but we DO need to throttle
extraThrottle = true; extraThrottle = true;