From dff8a536f0efd8131e82ae7cbfa56dd9c0c838bb Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 28 Feb 2020 13:09:05 -0600 Subject: [PATCH] address some typos --- .../AVOut/FFmpegWriterForm.cs | 2 +- BizHawk.Client.EmuHawk/AVOut/NutWriter.cs | 2 +- .../config/FirmwaresConfig.cs | 2 +- BizHawk.Client.EmuHawk/tools/CDL.cs | 14 +++++----- BizHawk.Client.EmuHawk/tools/GameShark.cs | 6 ++--- BizHawk.Client.EmuHawk/tools/ToolBox.cs | 2 +- BizHawk.sln.DotSettings | 27 ++++++++++++++++++- 7 files changed, 40 insertions(+), 15 deletions(-) diff --git a/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.cs b/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.cs index bdecd7fedd..f947ca9732 100644 --- a/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.cs +++ b/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.cs @@ -61,7 +61,7 @@ namespace BizHawk.Client.EmuHawk "-c:a aac -c:v libx264 -f mp4", false, "mp4"), new FormatPreset("WebM", "VP8 video and Vorbis audio in a WebM container.", "-c:a libvorbis -c:v libvpx -auto-alt-ref 0 -f webm", false, "webm"), - new FormatPreset("Ogg", "Theora video and Vorbis audio in an Ogg contrainer.", + new FormatPreset("Ogg", "Theora video and Vorbis audio in an Ogg container.", "-c:a libvorbis -c:v libtheora -f ogg", false, "ogg"), new FormatPreset("Xvid", "Xvid video and MP3 audio in an AVI container.", "-c:a libmp3lame -c:v libxvid -f avi", false, "avi"), diff --git a/BizHawk.Client.EmuHawk/AVOut/NutWriter.cs b/BizHawk.Client.EmuHawk/AVOut/NutWriter.cs index 251e29bbf9..db577b42be 100644 --- a/BizHawk.Client.EmuHawk/AVOut/NutWriter.cs +++ b/BizHawk.Client.EmuHawk/AVOut/NutWriter.cs @@ -10,7 +10,7 @@ namespace BizHawk.Client.EmuHawk /// dumps in the "nut" container format /// uncompressed video and audio /// - [VideoWriter("nut", "NUT writer", "Writes a series of .nut files to disk, a container format which can be opened by ffmpeg. All data is uncompressed. Splits occur on resolution changes. NOT RECCOMENDED FOR USE.")] + [VideoWriter("nut", "NUT writer", "Writes a series of .nut files to disk, a container format which can be opened by ffmpeg. All data is uncompressed. Splits occur on resolution changes. NOT RECOMMENDED FOR USE.")] public class NutWriter : IVideoWriter { /// diff --git a/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs b/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs index c43219c7b2..696cf02b2c 100644 --- a/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs +++ b/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs @@ -30,7 +30,7 @@ namespace BizHawk.Client.EmuHawk private readonly MainForm _mainForm; // friendlier names than the system Ids - // Redundant with SystemLookup? Not so fast. That datadrives things. This is one step abstracted. Don't be such a smart guy. Keep this redundant list up to date. + // Redundant with SystemLookup? Not so fast. That data drives things. This is one step abstracted. Don't be such a smart guy. Keep this redundant list up to date. private static readonly Dictionary SystemGroupNames = new Dictionary { ["NES"] = "NES", diff --git a/BizHawk.Client.EmuHawk/tools/CDL.cs b/BizHawk.Client.EmuHawk/tools/CDL.cs index 34182b21d9..24c783330d 100644 --- a/BizHawk.Client.EmuHawk/tools/CDL.cs +++ b/BizHawk.Client.EmuHawk/tools/CDL.cs @@ -7,13 +7,13 @@ using BizHawk.Emulation.Common; using BizHawk.Client.Common; using BizHawk.Client.EmuHawk.ToolExtensions; -//TODO - select which memorydomains go out to the CDL file. will this cause a problem when re-importing it? - //perhaps missing domains shouldn't fail a check -//OR - just add a contextmenu option to the listview item that selects it for export. -//TODO - add a contextmenu option which warps to the hexeditor with the provided domain selected for visualizing on the hex editor. -//TODO - consider setting colors for columns in CDL -//TODO - option to print domain name in caption instead of 0x01 etc. -//TODO - context menu should have copy option too +// TODO - select which memorydomains go out to the CDL file. will this cause a problem when re-importing it? +// perhaps missing domains shouldn't fail a check +// OR - just add a contextmenu option to the ListView item that selects it for export. +// TODO - add a contextmenu option which warps to the HexEditor with the provided domain selected for visualizing on the hex editor. +// TODO - consider setting colors for columns in CDL +// TODO - option to print domain name in caption instead of 0x01 etc. +// TODO - context menu should have copy option too namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/tools/GameShark.cs b/BizHawk.Client.EmuHawk/tools/GameShark.cs index 8edd8c5a37..4dc11a6c73 100644 --- a/BizHawk.Client.EmuHawk/tools/GameShark.cs +++ b/BizHawk.Client.EmuHawk/tools/GameShark.cs @@ -2102,7 +2102,7 @@ namespace BizHawk.Client.EmuHawk //4 Byte byteSize = 32; } - //I need the Incriment Value (Add to RAM Address) + //I need the Increment Value (Add to RAM Address) //I also need the Loop Value incriment = int.Parse(RAMValue.Remove(0, 4), NumberStyles.HexNumber); looper = int.Parse(RAMValue.Remove(4, 4), NumberStyles.HexNumber); @@ -2664,14 +2664,14 @@ namespace BizHawk.Client.EmuHawk { //We have a Byte sized value var watch = Watch.GenerateWatch(MemoryDomains["RDRAM"], long.Parse(RAMAddress, NumberStyles.HexNumber), WatchSize.Byte, Common.DisplayType.Hex, true, txtDescription.Text); - //Take Watch, Add our Value we want, and it should be active when addded? + //Take Watch, Add our Value we want, and it should be active when added? Global.CheatList.Add(new Cheat(watch, int.Parse(RAMValue, NumberStyles.HexNumber))); } if (byteSize == 16) { //We have a Word (Double Byte) sized Value var watch = Watch.GenerateWatch(MemoryDomains["RDRAM"], long.Parse(RAMAddress, NumberStyles.HexNumber), WatchSize.Word, Common.DisplayType.Hex, true, txtDescription.Text); - //Take Watch, Add our Value we want, and it should be active when addded? + //Take Watch, Add our Value we want, and it should be active when added? Global.CheatList.Add(new Cheat(watch, int.Parse(RAMValue, NumberStyles.HexNumber))); } } diff --git a/BizHawk.Client.EmuHawk/tools/ToolBox.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.cs index eb1b66176e..54f8681889 100644 --- a/BizHawk.Client.EmuHawk/tools/ToolBox.cs +++ b/BizHawk.Client.EmuHawk/tools/ToolBox.cs @@ -58,7 +58,7 @@ namespace BizHawk.Client.EmuHawk continue; if (!typeof(Form).IsAssignableFrom(t)) continue; - if (typeof(ToolBox).IsAssignableFrom(t)) //yo dawg i head you like toolboxes + if (typeof(ToolBox).IsAssignableFrom(t)) continue; if (VersionInfo.DeveloperBuild && t.GetCustomAttributes(false).OfType().Any(a => !a.Released)) continue; diff --git a/BizHawk.sln.DotSettings b/BizHawk.sln.DotSettings index 10a30ea928..f81408114e 100644 --- a/BizHawk.sln.DotSettings +++ b/BizHawk.sln.DotSettings @@ -188,6 +188,7 @@ True True True + True True True True @@ -200,6 +201,7 @@ True True True + True True True True @@ -215,6 +217,7 @@ True True True + True True True True @@ -227,6 +230,7 @@ True True True + True True True True @@ -241,9 +245,11 @@ True True True + True True True True + True True True True @@ -280,7 +286,9 @@ True True True + True True + True True True True @@ -292,6 +300,7 @@ True True True + True True True True @@ -299,14 +308,18 @@ True True True + True True True True + True True True True True True + True + True True True True @@ -333,10 +346,12 @@ True True True + True True True True True + True True True True @@ -346,6 +361,7 @@ True True True + True True True True @@ -370,14 +386,17 @@ True True True + True True True True True + True True True True True + True True True True @@ -400,12 +419,15 @@ True True True + True True True True True True True + True + True True True True @@ -509,8 +531,11 @@ True True True + True True True True - True + True + True + True \ No newline at end of file