diff --git a/SDK/Engine/Chips/Graphics/DisplayChip.cs b/SDK/Engine/Chips/Graphics/DisplayChip.cs index e4038adb..a6e00761 100755 --- a/SDK/Engine/Chips/Graphics/DisplayChip.cs +++ b/SDK/Engine/Chips/Graphics/DisplayChip.cs @@ -212,7 +212,6 @@ public override void Configure() // layers = Enum.GetNames(typeof(DrawMode)).Length - 1; MaxDrawRequests = 1024; - } public override void Deactivate() diff --git a/SDK/Engine/Utils/PixelDataUtil.cs b/SDK/Engine/Utils/PixelDataUtil.cs index 3335b42e..76321f1f 100755 --- a/SDK/Engine/Utils/PixelDataUtil.cs +++ b/SDK/Engine/Utils/PixelDataUtil.cs @@ -112,7 +112,6 @@ public static void Clear(PixelData pixelData, int colorRef = -1) int destX, int destY, bool flipH = false, bool flipV = false, int colorOffset = 0, bool ignoreTransparent = true) { - _mergeDestWidth = dest.Width; ValidateBounds(ref sampleWidth, ref sampleHeight, ref destX, ref destY, _mergeDestWidth, dest.Height); diff --git a/SDK/Runner/DesktopRunner.cs b/SDK/Runner/DesktopRunner.cs index e229c9a2..6bbb9af1 100755 --- a/SDK/Runner/DesktopRunner.cs +++ b/SDK/Runner/DesktopRunner.cs @@ -1594,22 +1594,14 @@ public void CompileFromSource(string[] files, bool buildDebugData = true) MetadataReference.CreateFromFile(typeof(Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo).Assembly.Location), //Microsoft.CSharp MetadataReference.CreateFromFile(typeof(GameChip).Assembly.Location), //PixelVision8Runner MetadataReference.CreateFromFile(typeof(Game).Assembly.Location), //MonoGameFramework - MetadataReference.CreateFromFile(typeof(Point).Assembly.Location), //XNA Framework + //MetadataReference.CreateFromFile(typeof(Point).Assembly.Location), //XNA Framework, automatic as part of PixelVision8Runner. needs declared in code.cs, not here. MetadataReference.CreateFromFile(Assembly.Load("netstandard").Location), //Required due to a .NET Standard 2.0 dependency somewhere. MetadataReference.CreateFromFile(Assembly.Load("System.Collections").Location), //required for Linq MetadataReference.CreateFromFile(Assembly.Load("System.Linq").Location), + MetadataReference.CreateFromFile(Assembly.Load("System.Linq.Queryable").Location), MetadataReference.CreateFromFile(Assembly.Load("System.Linq.Expressions").Location), - //MetadataReference.CreateFromFile(typeof(System.Linq.Queryable).Assembly.Location), //System.Linq.Queryable. - //MetadataReference.CreateFromFile(typeof(System.Linq.Expressions.Expression).Assembly.Location), //System.Linq.Expressions - //MetadataReference.CreateFromFile(typeof(System.Net.WebClient).Assembly.Location), //System.Net.WebClient. - }; - //Possibilities: - //Systems.Collections.Generic() - works fine, needs declared in code.cs - //File IO - System.IO.File fails to run (probably good) - //Networking - System.Net calls very little by itself. - var compiler = CSharpCompilation.Create("LoadedGame", syntaxTrees, references, options); //var pdbFilePath = Path.GetTempPath() + "RoslynGame.pdb"; @@ -1617,7 +1609,7 @@ public void CompileFromSource(string[] files, bool buildDebugData = true) var dllStream = new MemoryStream(); var pdbStream = new MemoryStream(); - //This wont help unless we hit a runtime error. + //This lets us get data if we hit a runtime error. var emitOptions = new EmitOptions( debugInformationFormat: DebugInformationFormat.PortablePdb //pdbFilePath: pdbFilePath