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

Replace dynamic type w/ casts in CoreInventory/CLP 

dynamic introduced in cc9d7df9f
This commit is contained in:
YoshiRulz 2020-07-12 17:09:32 +10:00
parent c712bde84e
commit 9ee4821148
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
View File

@ -5,7 +5,6 @@
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.Memory" Version="4.5.4" /> <PackageReference Include="System.Memory" Version="4.5.4" />
<Reference Include="FlatBuffers.Core" HintPath="$(ProjectDir)../../References/FlatBuffers.Core.dll" Private="true" /> <Reference Include="FlatBuffers.Core" HintPath="$(ProjectDir)../../References/FlatBuffers.Core.dll" Private="true" />
<Reference Include="Virtu" HintPath="$(ProjectDir)../../References/Virtu.dll" Private="true" /> <Reference Include="Virtu" HintPath="$(ProjectDir)../../References/Virtu.dll" Private="true" />

6
src/BizHawk.Emulation.Cores/CoreInventory.cs
View File

@ -113,13 +113,11 @@ namespace BizHawk.Emulation.Cores
{ {
if (_useCoreLoadParameters) if (_useCoreLoadParameters)
{ {
var paramType = typeof(CoreLoadParameters<,>).MakeGenericType(new[] { SettingsType, SyncSettingsType });
// TODO: clean this up // TODO: clean this up
dynamic param = Activator.CreateInstance(paramType); var param = (ICoreLoadParameters<object, object>) Activator.CreateInstance(typeof(CoreLoadParameters<,>).MakeGenericType(SettingsType, SyncSettingsType));
param.Comm = comm; param.Comm = comm;
param.Game = game; param.Game = game;
param.Settings = (dynamic)settings; param.PutSettings(settings, syncSettings);
param.SyncSettings = (dynamic)syncSettings;
param.Roms.Add(new RomGameFake param.Roms.Add(new RomGameFake
{ {
RomData = rom, RomData = rom,

18
src/BizHawk.Emulation.Cores/CoreLoadParameters.cs
View File

@ -1,3 +1,4 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
@ -17,7 +18,15 @@ namespace BizHawk.Emulation.Cores
DiscType DiscType { get; } DiscType DiscType { get; }
public string DiscName { get; set; } public string DiscName { get; set; }
} }
public class CoreLoadParameters<TSettiing, TSync> internal interface ICoreLoadParameters<in TSettiing, in TSync>
{
CoreComm Comm { set; }
GameInfo Game { set; }
List<IRomGame> Roms { get; }
bool DeterministicEmulationRequested { set; }
void PutSettings(object settings, object syncSettings);
}
public class CoreLoadParameters<TSettiing, TSync> : ICoreLoadParameters<TSettiing, TSync>
{ {
public CoreComm Comm { get; set; } public CoreComm Comm { get; set; }
public GameInfo Game { get; set; } public GameInfo Game { get; set; }
@ -41,5 +50,12 @@ namespace BizHawk.Emulation.Cores
/// <value></value> /// <value></value>
public List<IDiscGame> Discs { get; set; } = new List<IDiscGame>(); public List<IDiscGame> Discs { get; set; } = new List<IDiscGame>();
public bool DeterministicEmulationRequested { get; set; } public bool DeterministicEmulationRequested { get; set; }
void ICoreLoadParameters<TSettiing, TSync>.PutSettings(object settings, object syncSettings)
{
if (!(settings is TSettiing typedSettings)) throw new ArgumentException("type does not match type param", nameof(settings));
if (!(syncSettings is TSync typedSyncSettings)) throw new ArgumentException("type does not match type param", nameof(syncSettings));
Settings = typedSettings;
SyncSettings = typedSyncSettings;
}
} }
} }