diff --git a/src/BizHawk.BizInvoke/MemoryBlock.cs b/src/BizHawk.BizInvoke/MemoryBlock.cs index 04cea4fc8b..df81c12a46 100644 --- a/src/BizHawk.BizInvoke/MemoryBlock.cs +++ b/src/BizHawk.BizInvoke/MemoryBlock.cs @@ -8,8 +8,8 @@ namespace BizHawk.BizInvoke { public class MemoryBlock : IDisposable /*, IBinaryStateable */ { - /// allocate bytes starting at a particular address - /// is not aligned or is 0 + /// allocate bytes + /// is not aligned or is 0 public MemoryBlock(ulong size) { if (!WaterboxUtils.Aligned(size)) diff --git a/src/BizHawk.Client.Common/Api/HttpCommunication.cs b/src/BizHawk.Client.Common/Api/HttpCommunication.cs index 7ea7541c2f..74d3d6f395 100644 --- a/src/BizHawk.Client.Common/Api/HttpCommunication.cs +++ b/src/BizHawk.Client.Common/Api/HttpCommunication.cs @@ -1,3 +1,5 @@ +#pragma warning disable CA2007 + using System; using System.Collections.Generic; using System.Net.Http; diff --git a/src/BizHawk.Client.Common/lua/LuaDocumentation.cs b/src/BizHawk.Client.Common/lua/LuaDocumentation.cs index 3769c2bf99..415bb41f51 100644 --- a/src/BizHawk.Client.Common/lua/LuaDocumentation.cs +++ b/src/BizHawk.Client.Common/lua/LuaDocumentation.cs @@ -121,21 +121,21 @@ __Types and notation__ sb .Append("${") .Append(i + 1) - .Append(":"); + .Append(':'); sb.Append(parameters[i].IsOptional ? $"[{parameters[i].Name}]" : parameters[i].Name); - sb.Append("}"); + sb.Append('}'); if (i < parameters.Count - 1) { - sb.Append(","); + sb.Append(','); } } - sb.Append(")"); + sb.Append(')'); } else { diff --git a/src/BizHawk.Client.Common/movie/Subtitle.cs b/src/BizHawk.Client.Common/movie/Subtitle.cs index e46359c448..b8e7c2afe0 100644 --- a/src/BizHawk.Client.Common/movie/Subtitle.cs +++ b/src/BizHawk.Client.Common/movie/Subtitle.cs @@ -35,11 +35,11 @@ namespace BizHawk.Client.Common { var sb = new StringBuilder("subtitle "); sb - .Append(Frame).Append(" ") - .Append(X).Append(" ") - .Append(Y).Append(" ") - .Append(Duration).Append(" ") - .Append($"{Color:X8}").Append(" ") + .Append(Frame).Append(' ') + .Append(X).Append(' ') + .Append(Y).Append(' ') + .Append(Duration).Append(' ') + .Append($"{Color:X8}").Append(' ') .Append(Message); return sb.ToString(); @@ -49,7 +49,7 @@ namespace BizHawk.Client.Common { var sb = new StringBuilder(); - sb.Append(index.ToString()); + sb.Append(index); sb.Append("\r\n"); // Frame timing diff --git a/src/BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs b/src/BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs index eb1ee121f1..e399150522 100644 --- a/src/BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs +++ b/src/BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs @@ -30,7 +30,7 @@ namespace BizHawk.Client.Common foreach (var group in _source.Definition.ControlsOrdered.Where(c => c.Any())) { - sb.Append("#"); + sb.Append('#'); foreach (var button in group) { sb.Append(button).Append('|'); diff --git a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs index bec6f1d655..bceddd5b69 100644 --- a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs +++ b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs @@ -260,10 +260,12 @@ namespace BizHawk.Client.Common public void InsertEmptyFrame(int frame, int count = 1) { +#pragma warning disable CA1829 //TODO check StreamStringLog.Count is counting the same things as its enumerator if (frame > Log.Count()) { frame = Log.Count(); } +#pragma warning restore CA1829 var lg = LogGeneratorInstance(Session.MovieController); Log.InsertRange(frame, Enumerable.Repeat(lg.EmptyEntry, count).ToList()); diff --git a/src/BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_TK.cs b/src/BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_TK.cs index 10397183a5..fb093d958a 100644 --- a/src/BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_TK.cs +++ b/src/BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_TK.cs @@ -163,8 +163,8 @@ namespace BizHawk.Client.EmuHawk private class ShaderWrapper { public int sid; - public Dictionary MapCodeToNative; - public Dictionary MapNativeToCode; +// public Dictionary MapCodeToNative; +// public Dictionary MapNativeToCode; } private class PipelineWrapper diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs index 4d048a6181..b490d1065d 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -159,7 +159,7 @@ namespace BizHawk.Client.EmuHawk if (requestedExtToolDll != null) { var enabled = ExternalToolManager.ToolStripMenu.Where(item => item.Enabled) - .Select(item => (ValueTuple) item.Tag) + .Select(item => ((string, string)) item.Tag) .ToList(); try { diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs index e34fd2cead..9af43a0ca3 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs @@ -233,7 +233,7 @@ namespace BizHawk.Client.EmuHawk } blob.Append(_disassemblyLines[index].Address.ToHexString(_pcRegisterSize)) - .Append(" ") + .Append(' ') .Append(_disassemblyLines[index].Mnemonic); } diff --git a/src/BizHawk.Common/FFmpegService.cs b/src/BizHawk.Common/FFmpegService.cs index ef8b949348..75d2c0e8d0 100644 --- a/src/BizHawk.Common/FFmpegService.cs +++ b/src/BizHawk.Common/FFmpegService.cs @@ -10,7 +10,7 @@ namespace BizHawk.Common { public class FFmpegService { - public static string FFmpegPath; + public static string FFmpegPath = string.Empty; // always updated in DiscoHawk.Program/EmuHawk.Program //could return a different version for different operating systems.. shouldnt be hard. public static readonly string Version = "N-92462-g529debc987"; diff --git a/src/BizHawk.Emulation.Cores/CPUs/68000/Instructions/DataMovement.cs b/src/BizHawk.Emulation.Cores/CPUs/68000/Instructions/DataMovement.cs index 4aaaeef58d..3054e4f128 100644 --- a/src/BizHawk.Emulation.Cores/CPUs/68000/Instructions/DataMovement.cs +++ b/src/BizHawk.Emulation.Cores/CPUs/68000/Instructions/DataMovement.cs @@ -401,13 +401,13 @@ namespace BizHawk.Emulation.Cores.Components.M68000 { if (!snip) { - str.Append("-"); + str.Append('-'); snip = true; } } else { - if (count > 0 && !snip) str.Append(","); + if (count > 0 && !snip) str.Append(','); str.Append("D" + i); snip = false; } @@ -424,13 +424,13 @@ namespace BizHawk.Emulation.Cores.Components.M68000 { if (!snip) { - str.Append("-"); + str.Append('-'); snip = true; } } else { - if (count > 0 && !snip) str.Append(","); + if (count > 0 && !snip) str.Append(','); str.Append("A" + i); snip = false; } @@ -456,13 +456,13 @@ namespace BizHawk.Emulation.Cores.Components.M68000 { if (!snip) { - str.Append("-"); + str.Append('-'); snip = true; } } else { - if (count > 0 && !snip) str.Append(","); + if (count > 0 && !snip) str.Append(','); str.Append("D" + i); snip = false; } @@ -479,13 +479,13 @@ namespace BizHawk.Emulation.Cores.Components.M68000 { if (!snip) { - str.Append("-"); + str.Append('-'); snip = true; } } else { - if (count > 0 && !snip) str.Append(","); + if (count > 0 && !snip) str.Append(','); str.Append("A" + i); snip = false; } diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.ISettable.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.ISettable.cs index fec01c9ec1..fac6bdeb5e 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.ISettable.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.ISettable.cs @@ -226,11 +226,11 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC for (int i = 0; i < makeup; i++) { if (tLen > 4) - sb.Append("\t"); + sb.Append('\t'); else { makeup--; - sb.Append("\t"); + sb.Append('\t'); } } @@ -258,8 +258,8 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC { if (i != 0) { - sb.Append("\t"); - sb.Append("\t"); + sb.Append('\t'); + sb.Append('\t'); } sb.Append(builder[i]); @@ -279,38 +279,38 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC StringBuilder sb = new StringBuilder(); sb.Append(m.Name); - sb.Append("\n"); + sb.AppendLine(); sb.Append("-----------------------------------------------------------------\n"); // Release sb.Append("Released:"); - sb.Append(" "); + sb.Append(' '); sb.Append(m.Released); - sb.Append("\n"); + sb.AppendLine(); // CPU sb.Append("CPU:"); sb.Append(" "); sb.Append(m.CPU); - sb.Append("\n"); + sb.AppendLine(); // Memory sb.Append("Memory:"); sb.Append(" "); sb.Append(m.Memory); - sb.Append("\n"); + sb.AppendLine(); // Video sb.Append("Video:"); sb.Append(" "); sb.Append(m.Video); - sb.Append("\n"); + sb.AppendLine(); // Audio sb.Append("Audio:"); sb.Append(" "); sb.Append(m.Audio); - sb.Append("\n"); + sb.AppendLine(); // Audio sb.Append("Media:"); sb.Append(" "); sb.Append(m.Media); - sb.Append("\n"); + sb.AppendLine(); sb.Append("-----------------------------------------------------------------\n"); // description diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Datacorder/DatacorderDevice.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Datacorder/DatacorderDevice.cs index ed66c530ea..070b9869de 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Datacorder/DatacorderDevice.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Datacorder/DatacorderDevice.cs @@ -304,7 +304,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC var bl = _dataBlocks[targetBlockId]; StringBuilder sbd = new StringBuilder(); - sbd.Append("("); + sbd.Append('('); sbd.Append((targetBlockId + 1) + " of " + _dataBlocks.Count); sbd.Append(") : "); //sbd.Append("ID" + bl.BlockID.ToString("X2") + " - "); @@ -313,7 +313,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC { sbd.Append(" - "); sbd.Append(bl.MetaData.First().Key + ": " + bl.MetaData.First().Value); - //sbd.Append("\n"); + //sbd.AppendLine(); //sbd.Append(bl.MetaData.Skip(1).First().Key + ": " + bl.MetaData.Skip(1).First().Value); } @@ -485,7 +485,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC var bl = _dataBlocks[_currentDataBlockIndex]; StringBuilder sbd = new StringBuilder(); - sbd.Append("("); + sbd.Append('('); sbd.Append((_currentDataBlockIndex + 1) + " of " + _dataBlocks.Count); sbd.Append(") : "); //sbd.Append("ID" + bl.BlockID.ToString("X2") + " - "); @@ -511,7 +511,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // notify about the current block (we are skipping it because its empty) var bl = _dataBlocks[_currentDataBlockIndex]; StringBuilder sbd = new StringBuilder(); - sbd.Append("("); + sbd.Append('('); sbd.Append((_currentDataBlockIndex + 1) + " of " + _dataBlocks.Count); sbd.Append(") : "); //sbd.Append("ID" + bl.BlockID.ToString("X2") + " - "); diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.IPortIODevice.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.IPortIODevice.cs index 5af3d77e2b..64ff48a317 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.IPortIODevice.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.IPortIODevice.cs @@ -44,19 +44,19 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC for (int i = 0; i < 3; i++) { sb.Append(workingArr[i]); - sb.Append(","); + sb.Append(','); workingArr[i] = ""; } - sb.Append(ActiveCommand.CommandCode).Append(","); + sb.Append(ActiveCommand.CommandCode).Append(','); - sb.Append(CMD_FLAG_MT).Append(","); - sb.Append(CMD_FLAG_MF).Append(","); - sb.Append(CMD_FLAG_SK).Append(","); + sb.Append(CMD_FLAG_MT).Append(','); + sb.Append(CMD_FLAG_MF).Append(','); + sb.Append(CMD_FLAG_SK).Append(','); - sb.Append(CommCounter).Append(","); - sb.Append(ResCounter).Append(","); - sb.Append(ExecCounter).Append(","); + sb.Append(CommCounter).Append(','); + sb.Append(ResCounter).Append(','); + sb.Append(ExecCounter).Append(','); sb.Append(ExecLength); //sb.Append("\r\n"); diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs index b658f3ebf5..61812b6030 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs @@ -1733,7 +1733,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC sb.Append(type + ": "); sb.Append(fileName + " "); sb.Append(GetWordValue(blockdata, 14)); - sb.Append(":"); + sb.Append(':'); sb.Append(GetWordValue(blockdata, 12)); description = sb.ToString(); } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs index 94e3364e81..a949c29a7d 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs @@ -275,7 +275,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum var bl = _dataBlocks[targetBlockId]; StringBuilder sbd = new StringBuilder(); - sbd.Append("("); + sbd.Append('('); sbd.Append((targetBlockId + 1) + " of " + _dataBlocks.Count); sbd.Append(") : "); sbd.Append(bl.BlockDescription); @@ -491,7 +491,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum var bl = _dataBlocks[_currentDataBlockIndex]; StringBuilder sbd = new StringBuilder(); - sbd.Append("("); + sbd.Append('('); sbd.Append((_currentDataBlockIndex + 1) + " of " + _dataBlocks.Count); sbd.Append(") : "); sbd.Append(bl.BlockDescription); @@ -514,7 +514,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // notify about the current block (we are skipping it because its empty) var bl = _dataBlocks[_currentDataBlockIndex]; StringBuilder sbd = new StringBuilder(); - sbd.Append("("); + sbd.Append('('); sbd.Append((_currentDataBlockIndex + 1) + " of " + _dataBlocks.Count); sbd.Append(") : "); sbd.Append(bl.BlockDescription); diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.IPortIODevice.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.IPortIODevice.cs index 1429e21e7a..1dd082b7d0 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.IPortIODevice.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.IPortIODevice.cs @@ -44,19 +44,19 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum for (int i = 0; i < 3; i++) { sb.Append(workingArr[i]); - sb.Append(","); + sb.Append(','); workingArr[i] = ""; } - sb.Append(ActiveCommand.CommandCode).Append(","); + sb.Append(ActiveCommand.CommandCode).Append(','); - sb.Append(CMD_FLAG_MT).Append(","); - sb.Append(CMD_FLAG_MF).Append(","); - sb.Append(CMD_FLAG_SK).Append(","); + sb.Append(CMD_FLAG_MT).Append(','); + sb.Append(CMD_FLAG_MF).Append(','); + sb.Append(CMD_FLAG_SK).Append(','); - sb.Append(CommCounter).Append(","); - sb.Append(ResCounter).Append(","); - sb.Append(ExecCounter).Append(","); + sb.Append(CommCounter).Append(','); + sb.Append(ResCounter).Append(','); + sb.Append(ExecCounter).Append(','); sb.Append(ExecLength); //sb.Append("\r\n"); diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TAP/TapConverter.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TAP/TapConverter.cs index 76c51ce8ba..6c5fa94fab 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TAP/TapConverter.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TAP/TapConverter.cs @@ -243,7 +243,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum sb.Append(type + ": "); sb.Append(fileName + " "); sb.Append(GetWordValue(blockdata, 14)); - sb.Append(":"); + sb.Append(':'); sb.Append(GetWordValue(blockdata, 12)); description = sb.ToString(); } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TZX/TzxConverter.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TZX/TzxConverter.cs index acbcefe2eb..1d9ff5d938 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TZX/TzxConverter.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TZX/TzxConverter.cs @@ -1629,7 +1629,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum sb.Append(type + ": "); sb.Append(fileName + " "); sb.Append(GetWordValue(blockdata, 14)); - sb.Append(":"); + sb.Append(':'); sb.Append(GetWordValue(blockdata, 12)); description = sb.ToString(); } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.ISettable.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.ISettable.cs index d492fce33a..562d22ce00 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.ISettable.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.ISettable.cs @@ -369,11 +369,11 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum for (int i = 0; i < makeup; i++) { if (tLen > 4) - sb.Append("\t"); + sb.Append('\t'); else { makeup--; - sb.Append("\t"); + sb.Append('\t'); } } @@ -402,8 +402,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum { if (i != 0) { - sb.Append("\t"); - sb.Append("\t"); + sb.Append('\t'); + sb.Append('\t'); } sb.Append(builder[i]); diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/Audio.cs b/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/Audio.cs index bcae065dae..21fc4dbc4f 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/Audio.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/Audio.cs @@ -17,11 +17,13 @@ namespace BizHawk.Emulation.Cores.Consoles.ChannelF private int tone = 0; private double[] tone_freqs = { 0, 1000, 500, 120 }; +#pragma warning disable CS0414 private double amplitude = 0; private double decay = 0.998; private double time = 0; private double cycles = 0; private int samplePos = 0; +#pragma warning restore CS0414 private int lastCycle = 0; private BlipBuffer _blip; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.IEmulator.cs b/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.IEmulator.cs index bc16814320..5afa545854 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.IEmulator.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.IEmulator.cs @@ -53,8 +53,10 @@ namespace BizHawk.Emulation.Cores.Consoles.ChannelF } private int _frame; +#pragma warning disable CS0414 private int _lagcount; private bool _islag; +#pragma warning restore CS0414 public void ResetCounters() { diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Disassembler.cs b/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Disassembler.cs index 09b2c6f61b..918ad93ca4 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Disassembler.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Disassembler.cs @@ -298,7 +298,7 @@ namespace BizHawk.Emulation.Cores.Consoles.ChannelF public string Disassemble(ushort addr, Func read, out int size) { ushort start_addr = addr; - ushort extra_inc = 0; +// ushort extra_inc = 0; byte A = read(addr++); string format; format = mnemonics[A]; diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.ICodeDataLog.cs b/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.ICodeDataLog.cs index f3f9e4d8b3..8f4e1f47c0 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.ICodeDataLog.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.ICodeDataLog.cs @@ -42,6 +42,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Vectrex Data = 0x04 } +#pragma warning disable CS0649 private struct CDLog_MapResults { public CDLog_AddrType Type; @@ -50,6 +51,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Vectrex private delegate CDLog_MapResults MapMemoryDelegate(ushort addr, bool write); private MapMemoryDelegate MapMemory; +#pragma warning restore CS0649 private ICodeDataLog CDL; private void RunCDL(ushort address, CDLog_Flags flags) diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs index 42d2450274..6de26144c0 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs @@ -288,7 +288,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk } } +#pragma warning disable CS0414 private PrinterCallback _printerCallback = null; +#pragma warning restore CS0414 public void SetPrinterCallback(PrinterCallback callback) { diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper60.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper60.cs index 0e3438d675..66fb941156 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper60.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper60.cs @@ -10,8 +10,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int _reg; private bool IsPrg16Mode => _reg.Bit(7); +#pragma warning disable CS0649 [MapperProp] public int Mapper60_DipSwitch; +#pragma warning restore CS0169 private const int DipSwitchMask = 3; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.ICodeDataLogger.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.ICodeDataLogger.cs index a9db3059c0..c9c1654c39 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.ICodeDataLogger.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.ICodeDataLogger.cs @@ -56,6 +56,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES Data = 0x04 } +#pragma warning disable CS0649 private struct CDLog_MapResults { public CDLog_AddrType Type; @@ -64,6 +65,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private delegate CDLog_MapResults MapMemoryDelegate(ushort addr, bool write); private MapMemoryDelegate MapMemory; +#pragma warning restore CS0649 private ICodeDataLog CDL; private void RunCDL(ushort address, CDLog_Flags flags) diff --git a/src/BizHawk.Emulation.Cores/Libretro/LibretroApi_Structs.cs b/src/BizHawk.Emulation.Cores/Libretro/LibretroApi_Structs.cs index 1fd15cf945..0fd94760df 100644 --- a/src/BizHawk.Emulation.Cores/Libretro/LibretroApi_Structs.cs +++ b/src/BizHawk.Emulation.Cores/Libretro/LibretroApi_Structs.cs @@ -23,7 +23,9 @@ namespace BizHawk.Emulation.Cores.Libretro public sbyte* valid_extensions; public bool need_fullpath; public bool block_extract; +#pragma warning disable CS0169 short _pad; +#pragma warning restore CS0169 } public struct retro_system_timing diff --git a/src/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Load.cs b/src/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Load.cs index ff0ec35b71..97d76122c6 100644 --- a/src/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Load.cs +++ b/src/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Load.cs @@ -56,7 +56,7 @@ namespace BizHawk.Emulation.DiscSystem.CUE //not sure if we need this... private class TrackInfo { - public int Length; +// public int Length; public CompiledCueTrack CompiledCueTrack; } diff --git a/src/BizHawk.Emulation.DiscSystem/Internal/Jobs/Synthesize_Leadout_Job.cs b/src/BizHawk.Emulation.DiscSystem/Internal/Jobs/Synthesize_Leadout_Job.cs index 1b2a762b7d..67e743eb9a 100644 --- a/src/BizHawk.Emulation.DiscSystem/Internal/Jobs/Synthesize_Leadout_Job.cs +++ b/src/BizHawk.Emulation.DiscSystem/Internal/Jobs/Synthesize_Leadout_Job.cs @@ -11,8 +11,14 @@ namespace BizHawk.Emulation.DiscSystem /// internal class Synthesize_LeadoutJob { - public int Length; - public Disc Disc; + private readonly int Length; + private readonly Disc Disc; + + public Synthesize_LeadoutJob(int length, Disc disc) + { + Length = length; + Disc = disc; + } public void Run() {