From 48eb40449cf0a39df0472e5044f49c426b3fcf01 Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 17 Oct 2014 22:47:30 +0000 Subject: [PATCH] Make TasStateManagerSettings use default values from the config, next step: a ui to change the config values --- BizHawk.Client.Common/config/Config.cs | 1 + BizHawk.Client.Common/movie/tasproj/TasStateManager.cs | 2 +- .../movie/tasproj/TasStateManagerSettings.cs | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/BizHawk.Client.Common/config/Config.cs b/BizHawk.Client.Common/config/Config.cs index 53093b3969..f7b4ef9bc4 100644 --- a/BizHawk.Client.Common/config/Config.cs +++ b/BizHawk.Client.Common/config/Config.cs @@ -526,6 +526,7 @@ namespace BizHawk.Client.Common // TAStudio Dialog public ToolDialogSettings TAStudioSettings = new ToolDialogSettings(); public RecentFiles RecentTas = new RecentFiles(8); + public TasStateManagerSettings DefaultTasProjSettings = new TasStateManagerSettings(); public bool AutoloadTAStudio = false; public bool AutoloadTAStudioProject = false; public bool TAStudioDrawInput = true; diff --git a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs index c70ba21a3e..1a2dbdadb7 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs @@ -43,7 +43,7 @@ namespace BizHawk.Client.Common public TasStateManager(TasMovie movie) { _movie = movie; - Settings = new TasStateManagerSettings(); + Settings = new TasStateManagerSettings(Global.Config.DefaultTasProjSettings); var cap = Settings.Cap; diff --git a/BizHawk.Client.Common/movie/tasproj/TasStateManagerSettings.cs b/BizHawk.Client.Common/movie/tasproj/TasStateManagerSettings.cs index 34f5ea129f..d4c1ef52b5 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasStateManagerSettings.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasStateManagerSettings.cs @@ -12,6 +12,12 @@ namespace BizHawk.Client.Common Capacitymb = 512; } + public TasStateManagerSettings(TasStateManagerSettings settings) + { + SaveGreenzone = settings.SaveGreenzone; + Capacitymb = settings.Capacitymb; + } + /// /// Whether or not to save greenzone information to disk ///