From 85faec638a12ff365804737cb2d97f8da4125477 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Mon, 30 Nov 2020 20:45:21 +1000 Subject: [PATCH] Update or remove comments mentioning GlobalWin --- src/BizHawk.Client.Common/config/Config.cs | 1 - src/BizHawk.Client.EmuHawk/Program.cs | 9 --------- src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs | 2 +- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/BizHawk.Client.Common/config/Config.cs b/src/BizHawk.Client.Common/config/Config.cs index 1506f5cf3e..7b9e2d8a9a 100644 --- a/src/BizHawk.Client.Common/config/Config.cs +++ b/src/BizHawk.Client.Common/config/Config.cs @@ -190,7 +190,6 @@ namespace BizHawk.Client.Common return true; } - /// warning: we don't even want to deal with changing this at runtime. but we want it changed here for config purposes. so don't check this variable. check in GlobalWin or something like that. public EDispMethod DispMethod { get; set; } = DetectDirectX() ? EDispMethod.SlimDX9 : EDispMethod.OpenGL; public int DispChromeFrameWindowed { get; set; } = 2; diff --git a/src/BizHawk.Client.EmuHawk/Program.cs b/src/BizHawk.Client.EmuHawk/Program.cs index bb4e18d888..c909c94f51 100644 --- a/src/BizHawk.Client.EmuHawk/Program.cs +++ b/src/BizHawk.Client.EmuHawk/Program.cs @@ -258,15 +258,6 @@ namespace BizHawk.Client.EmuHawk Input.Instance?.Adapter?.DeInitAll(); } - //cleanup: - //cleanup IGL stuff so we can get better refcounts when exiting process, for debugging - //DOESNT WORK FOR SOME REASON - //GlobalWin.IGL_GL = new IGL_TK(); - //GLManager.Instance.Dispose(); - //if (GlobalWin.IGL_GL != GlobalWin.GL) - // GlobalWin.GL.Dispose(); - //((IDisposable)GlobalWin.IGL_GL).Dispose(); - //return 0 assuming things have gone well, non-zero values could be used as error codes or for scripting purposes return exitCode; } //SubMain diff --git a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs index 0ce33dcb15..803cb8fadc 100644 --- a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs +++ b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs @@ -254,7 +254,7 @@ namespace BizHawk.Client.EmuHawk } - // Upon Load State, TAStudio uses GlobalWin.Tools.UpdateBefore(); as well as GlobalWin.Tools.UpdateAfter(); + // Upon Load State, TAStudio uses global ToolManager.UpdateBefore(); as well as global ToolManager.UpdateAfter(); // Both of which will Call UpdateValues() and Update() which both end up in the Update() function. Calling Update() will cause the Log to add an additional log. // By not handling both of those calls the _currentBotAttempt.Log.Count will be 2 more than expected. // However this also causes a problem with RamWatch not being up to date since that TOO gets called.