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

use globals a bit less

This commit is contained in:
adelikat 2020-01-03 13:59:39 -06:00
parent bea2012e0a
commit 57610488fe
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
View File

@ -104,7 +104,7 @@ namespace BizHawk.Client.EmuHawk
_exitRequestPending = true; _exitRequestPending = true;
break; break;
case "Record A/V": case "Record A/V":
if (OSTailoredCode.IsUnixHost) GlobalWin.OSD.AddMessage("(A/V only available on Windows for now)"); if (OSTailoredCode.IsUnixHost) AddOnScreenMessage("(A/V only available on Windows for now)");
else RecordAv(); else RecordAv();
break; break;
case "Stop A/V": case "Stop A/V":

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

@ -204,7 +204,7 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.MainForm = this; GlobalWin.MainForm = this;
Rewinder = new Rewinder Rewinder = new Rewinder
{ {
MessageCallback = GlobalWin.OSD.AddMessage MessageCallback = AddOnScreenMessage
}; };
Global.ControllerInputCoalescer = new ControllerInputCoalescer(); Global.ControllerInputCoalescer = new ControllerInputCoalescer();
@ -213,7 +213,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Movie = MovieService.DefaultInstance, Movie = MovieService.DefaultInstance,
MovieControllerAdapter = MovieService.DefaultInstance.LogGeneratorInstance().MovieControllerAdapter, MovieControllerAdapter = MovieService.DefaultInstance.LogGeneratorInstance().MovieControllerAdapter,
MessageCallback = GlobalWin.OSD.AddMessage, MessageCallback = AddOnScreenMessage,
AskYesNoCallback = StateErrorAskUser, AskYesNoCallback = StateErrorAskUser,
PauseCallback = PauseEmulator, PauseCallback = PauseEmulator,
ModeChangedCallback = SetMainformMovieInfo ModeChangedCallback = SetMainformMovieInfo

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

@ -330,7 +330,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Global.Config.TargetZoomFactors[Emulator.SystemId] = size; Global.Config.TargetZoomFactors[Emulator.SystemId] = size;
MainForm.FrameBufferResized(); MainForm.FrameBufferResized();
GlobalWin.OSD.AddMessage($"Window size set to {size}x"); MainForm.AddOnScreenMessage($"Window size set to {size}x");
} }
else else
{ {