From 3cacb88e484413559e6b7f9d36a2f839f049ef61 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 14 Mar 2020 21:27:05 -0500 Subject: [PATCH] a few cleanups in octoshock --- BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs | 8 ++++---- BizHawk.sln.DotSettings | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs index 3ceb4575c0..e24441487e 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs @@ -43,13 +43,13 @@ namespace BizHawk.Emulation.Cores.Sony.PSX //note: its annoying that we have to have a disc before constructing this. //might want to change that later. HOWEVER - we need to definitely have a region, at least - public Octoshock(CoreComm comm, List discs, List discNames, byte[] exe, object settings, object syncSettings) + public Octoshock(CoreComm comm, List discs, List discNames, byte[] exe, object settings, object syncSettings) { Load(comm, discs, discNames, exe, settings, syncSettings, null); OctoshockDll.shock_PowerOn(psx); } - void Load(CoreComm comm, List discs, List discNames, byte[] exe, object settings, object syncSettings, PSF psf) + void Load(CoreComm comm, List discs, List discNames, byte[] exe, object settings, object syncSettings, PSF psf) { ConnectTracer(); CoreComm = comm; @@ -73,7 +73,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX foreach (var disc in discs) { var discInterface = new DiscInterface(disc, - (di) => + di => { //if current disc this delegate disc, activity is happening if (di == currentDiscInterface) @@ -138,7 +138,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX BufferHeight = 288; } CurrentVideoSize = new System.Drawing.Size(BufferWidth, BufferHeight); - var ri = Octoshock.CalculateResolution(SystemVidStandard, _Settings, BufferWidth, BufferHeight); + var ri = CalculateResolution(SystemVidStandard, _Settings, BufferWidth, BufferHeight); BufferWidth = VirtualWidth = ri.Resolution.Width; BufferHeight = VirtualHeight = ri.Resolution.Height; //VideoProvider_Padding = new System.Drawing.Size(50,50); diff --git a/BizHawk.sln.DotSettings b/BizHawk.sln.DotSettings index c34c239c51..d2382bd3aa 100644 --- a/BizHawk.sln.DotSettings +++ b/BizHawk.sln.DotSettings @@ -407,6 +407,7 @@ True True True + True True True True