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

Mostly whitespace cleanup to reduce difference with mono-portable branch.

This commit is contained in:
J.D. Purcell 2017-05-02 23:09:50 -04:00
parent e3fab1a4d5
commit 8b2b12585a
3 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.Common/lua/LuaSandbox.cs
View File

@ -54,7 +54,7 @@ namespace BizHawk.Client.Common
Environment.CurrentDirectory = CurrentDirectory; //thats right, you can't set a directory as current that doesnt exist because .net's got to do SENSELESS SLOW-ASS SECURITY CHECKS on it and it can't do that on a NONEXISTENT DIRECTORY
return true;
}
else return false
else return false;
#endif
}

42
BizHawk.Client.EmuHawk/tools/GameShark.cs
View File

@ -18,7 +18,7 @@ namespace BizHawk.Client.EmuHawk
//They work but feel bad
//Verify all wording in the error reports
[ToolAttributes(released: true, supportedSystems: new[] { "GB", "GBA", "GEN", "N64", "NES", "PSX", "SAT", "SMS", "SNES" })]
public partial class GameShark : Form, IToolForm, IToolFormAutoConfig
@ -80,24 +80,24 @@ namespace BizHawk.Client.EmuHawk
};
//This only applies to the NES
private readonly Dictionary<char, int> _NESgameGenieTable = new Dictionary<char, int>
{
{ 'A', 0 }, // 0000
{ 'P', 1 }, // 0001
{ 'Z', 2 }, // 0010
{ 'L', 3 }, // 0011
{ 'G', 4 }, // 0100
{ 'I', 5 }, // 0101
{ 'T', 6 }, // 0110
{ 'Y', 7 }, // 0111
{ 'E', 8 }, // 1000
{ 'O', 9 }, // 1001
{ 'X', 10 }, // 1010
{ 'U', 11 }, // 1011
{ 'K', 12 }, // 1100
{ 'S', 13 }, // 1101
{ 'V', 14 }, // 1110
{ 'N', 15 }, // 1111
};
{
{ 'A', 0 }, // 0000
{ 'P', 1 }, // 0001
{ 'Z', 2 }, // 0010
{ 'L', 3 }, // 0011
{ 'G', 4 }, // 0100
{ 'I', 5 }, // 0101
{ 'T', 6 }, // 0110
{ 'Y', 7 }, // 0111
{ 'E', 8 }, // 1000
{ 'O', 9 }, // 1001
{ 'X', 10 }, // 1010
{ 'U', 11 }, // 1011
{ 'K', 12 }, // 1100
{ 'S', 13 }, // 1101
{ 'V', 14 }, // 1110
{ 'N', 15 }, // 1111
};
// including transposition
// Code: D F 4 7 0 9 1 5 6 B C 8 A 2 3 E
// Hex: 0 1 2 3 4 5 6 7 8 9 A B C D E F
@ -148,7 +148,7 @@ namespace BizHawk.Client.EmuHawk
public void FastUpdate()
{
}
public void Restart()
@ -160,7 +160,7 @@ namespace BizHawk.Client.EmuHawk
public void UpdateValues()
{
}
//My Variables

21
BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi_CMD.cs
View File

@ -62,22 +62,23 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
public bool CMD_load_cartridge_super_game_boy(string rom_xml, byte[] rom_data, uint rom_size, byte[] dmg_data)
{
SetAscii(0, rom_xml, () =>
SetBytes(1, rom_data, () =>
SetBytes(2, dmg_data, () =>
{
Message(eMessage.eMessage_CMD_load_cartridge_sgb);
WaitForCMD();
})
)
SetBytes(1, rom_data, () =>
SetBytes(2, dmg_data, () =>
{
Message(eMessage.eMessage_CMD_load_cartridge_sgb);
WaitForCMD();
})
)
);
return comm->GetBool();
}
public bool CMD_load_cartridge_normal(byte[] rom_xml, byte[] rom_data)
{
string xml = rom_xml==null?null:System.Text.Encoding.ASCII.GetString(rom_xml);
SetAscii(0, xml??"", () =>
SetBytes(1, rom_data, () => {
string xml = rom_xml == null ? null : System.Text.Encoding.ASCII.GetString(rom_xml);
SetAscii(0, xml ?? "", () =>
SetBytes(1, rom_data, () =>
{
Message(eMessage.eMessage_CMD_load_cartridge_normal);
WaitForCMD();
})