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

fix bug in mnemonics generator that made it not as versatile as it was meant to be

This commit is contained in:
zeromus 2012-02-18 20:44:54 +00:00
parent 9fb0393b7f
commit 7ea52dfc8d
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BizHawk.MultiClient/movie/InputAdapters.cs
View File

@ -164,15 +164,13 @@ namespace BizHawk.MultiClient
bool IsBasePressed(string name) bool IsBasePressed(string name)
{ {
bool ret = Source.IsPressed(name); bool ret = Source.IsPressed(name);
if (ret)
{
//int zzz=9;
}
return ret; return ret;
} }
public string GetControllersAsMnemonic() public string GetControllersAsMnemonic()
{ {
bool hasGlobalEmulator = Global.Emulator != null;
StringBuilder input = new StringBuilder("|"); StringBuilder input = new StringBuilder("|");
if (ControlType == "Genesis 3-Button Controller") if (ControlType == "Genesis 3-Button Controller")
@ -249,8 +247,8 @@ namespace BizHawk.MultiClient
if (ControlType == "NES Controls") if (ControlType == "NES Controls")
{ {
input.Append(IsBasePressed("Reset") ? "r" : input.Append(IsBasePressed("Reset") ? "r" :
Global.Emulator.IsLagFrame ? "L" : "."); (hasGlobalEmulator && Global.Emulator.IsLagFrame) ? "L" : ".");
input.Append("|"); input.Append("|");
for (int player = 1; player <= 4; player++) for (int player = 1; player <= 4; player++)
{ {