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

Move some extension methods from the generic extensions file to NumberExtensions and fix up namespaces

This commit is contained in:
adelikat 2014-07-03 15:35:50 +00:00
parent 3a68f96b7a
commit f546a8080c
26 changed files with 31 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.Client.Common/RomGame.cs
View File

@ -2,6 +2,7 @@
using System.Globalization;
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
using BizHawk.Emulation.Common;
namespace BizHawk.Client.Common

2
BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs
View File

@ -3,7 +3,7 @@ using System.Drawing;
using System.Text;
using System.Windows.Forms;
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
using BizHawk.Client.Common;
using BizHawk.Emulation.Cores.Nintendo.Gameboy;

2
BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs
View File

@ -2,7 +2,7 @@
using System.Drawing;
using System.Windows.Forms;
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
using BizHawk.Client.Common;
using BizHawk.Emulation.Cores.Nintendo.Gameboy;
using BizHawk.Emulation.Cores.Nintendo.GBA;

3
BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
View File

@ -8,9 +8,10 @@ using System.Linq;
using System.Text;
using System.Windows.Forms;
using BizHawk.Client.Common;
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
using BizHawk.Emulation.Common;
using BizHawk.Client.Common;
namespace BizHawk.Client.EmuHawk
{

2
BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs
View File

@ -29,7 +29,7 @@ using System.Drawing;
using System.Reflection;
using System.Windows.Forms;
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
using BizHawk.Client.Common;
using BizHawk.Emulation.Cores.Nintendo.SNES;
using BizHawk.Client.EmuHawk; //TODO: What??

3
BizHawk.Client.EmuHawk/tools/Watch/WatchValueBox.cs
View File

@ -2,8 +2,9 @@
using System.Globalization;
using System.Windows.Forms;
using BizHawk.Client.Common;
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
using BizHawk.Client.Common;
namespace BizHawk.Client.EmuHawk
{

45
BizHawk.Common/Extensions/Extensions.cs
View File

@ -4,7 +4,6 @@ using System.Reflection;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Text;
namespace BizHawk.Common
{
@ -74,26 +73,6 @@ namespace BizHawk.Common
else return mid;
}
public static string ToHexString(this int n, int numdigits)
{
return String.Format("{0:X" + numdigits + "}", n);
}
public static string ToHexString(this uint n, int numdigits)
{
return String.Format("{0:X" + numdigits + "}", n);
}
public static string ToHexString(this byte n, int numdigits)
{
return String.Format("{0:X" + numdigits + "}", n);
}
public static string ToHexString(this ushort n, int numdigits)
{
return String.Format("{0:X" + numdigits + "}", n);
}
// http://stackoverflow.com/questions/1766328/can-linq-use-binary-search-when-the-collection-is-ordered
public static T BinarySearch<T, TKey>(this IList<T> list, Func<T, TKey> keySelector, TKey key)
where TKey : IComparable<TKey>
@ -165,21 +144,6 @@ namespace BizHawk.Common
return (b & (1 << index)) != 0;
}
public static bool Bit(this int b, int index)
{
return (b & (1 << index)) != 0;
}
public static bool Bit(this ushort b, int index)
{
return (b & (1 << index)) != 0;
}
public static bool In(this int i, params int[] options)
{
return options.Any(j => i == j);
}
public static bool ContainsStartsWith(this IEnumerable<string> options, string str)
{
return options.Any(opt => opt.StartsWith(str));
@ -353,14 +317,13 @@ namespace BizHawk.Common
{
return c - '0';
}
else if (c <= 'F')
if (c <= 'F')
{
return c - '7';
}
else
{
return c - 'W';
}
return c - 'W';
}
public static unsafe void ReadFromHexFast(this byte[] buffer, string hex)

3
BizHawk.Emulation.Common/Sound/HuC6280PSG.cs
View File

@ -1,9 +1,8 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
namespace BizHawk.Emulation.Common.Components
{

1
BizHawk.Emulation.Cores/CPUs/MOS 6502X/Execute.cs
View File

@ -2,6 +2,7 @@
using System;
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
namespace BizHawk.Emulation.Cores.Components.M6502
{

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs
View File

@ -1,6 +1,7 @@
using System;
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Components.M6502;

1
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/APU.cs
View File

@ -15,6 +15,7 @@ using System;
using System.Collections.Generic;
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{

6
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/GameGenie.cs
View File

@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{

1
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_19.cs
View File

@ -1,4 +1,5 @@
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{

1
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MLT-ACTION52.cs
View File

@ -1,4 +1,5 @@
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{

3
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper191.cs
View File

@ -1,6 +1,5 @@
using System;
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{

1
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper057.cs
View File

@ -1,4 +1,5 @@
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{

1
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper058.cs
View File

@ -1,4 +1,5 @@
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{

1
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper200.cs
View File

@ -1,4 +1,5 @@
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{

1
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper225.cs
View File

@ -1,4 +1,5 @@
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{

1
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper227.cs
View File

@ -1,4 +1,5 @@
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{

1
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper231.cs
View File

@ -1,4 +1,5 @@
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{

1
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper242.cs
View File

@ -1,4 +1,5 @@
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{

1
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper61.cs
View File

@ -1,4 +1,5 @@
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{

1
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper62.cs
View File

@ -1,4 +1,5 @@
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{

1
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NES-EVENT.cs
View File

@ -1,4 +1,5 @@
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{

1
BizHawk.Emulation.DiscSystem/Blobs/Blob_ECM.cs
View File

@ -28,6 +28,7 @@ using System.IO;
using System.Collections.Generic;
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
namespace BizHawk.Emulation.DiscSystem
{