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

ImportVBM now supports L and R.

This commit is contained in:
brandman211 2014-05-26 05:02:46 +00:00
parent d2d6d2fe11
commit be82821b7d
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
BizHawk.Client.Common/movie/MovieImport.cs
View File

@ -2138,7 +2138,7 @@ namespace BizHawk.Client.Common
m.Header.Comments.Add(COMMENT + " " + movieDescription);
r.BaseStream.Position = firstFrameOffset;
SimpleController controllers = new SimpleController {Type = new ControllerDefinition()};
if (platform == "GBA")
if (platform != "GBA")
{
controllers.Type.Name = "Gameboy Controller";
}
@ -2146,20 +2146,20 @@ namespace BizHawk.Client.Common
{
controllers.Type.Name = "GBA Controller";
}
/*
* 01 00 A
* 02 00 B
* 04 00 Select
* 08 00 Start
* 10 00 Right
* 20 00 Left
* 40 00 Up
* 80 00 Down
* 00 01 R
* 00 02 L
*/
string[] buttons = new[] { "A", "B", "Select", "Start", "Right", "Left", "Up", "Down", "R", "L" };
/*
* 01 00 A
* 02 00 B
* 04 00 Select
* 08 00 Start
* 10 00 Right
* 20 00 Left
* 40 00 Up
* 80 00 Down
*/
string[] buttons = new[] { "A", "B", "Select", "Start", "Right", "Left", "Up", "Down" };
/*
* 00 01 R
* 00 02 L
* 00 04 Reset (old timing)
* 00 08 Reset (new timing since version 1.1)
* 00 10 Left motion sensor
@ -2168,8 +2168,8 @@ namespace BizHawk.Client.Common
* 00 80 Up motion sensor
*/
string[] other = new[] {
"R", "L", "Reset (old timing)" , "Reset (new timing since version 1.1)", "Left motion sensor",
"Right motion sensor", "Down motion sensor", "Up motion sensor"
"Reset (old timing)" , "Reset (new timing since version 1.1)", "Left motion sensor",
"Right motion sensor", "Down motion sensor", "Up motion sensor"
};
for (int frame = 1; frame <= frameCount; frame++)
{
@ -2181,22 +2181,22 @@ namespace BizHawk.Client.Common
for (int button = 0; button < buttons.Length; button++)
{
controllers[buttons[button]] = (((controllerState >> button) & 0x1) != 0);
if (((controllerState >> button) & 0x1) != 0 && button > 7)
{
continue;
}
}
// TODO: Handle the other buttons.
if (warningMsg == "")
{
for (int button = 0; button < other.Length; button++)
{
if (((controllerState >> (button + 8)) & 0x1) != 0)
if (((controllerState >> (button + 10)) & 0x1) != 0)
{
warningMsg = other[button];
warningMsg = "Unable to import " + warningMsg + " at frame " + frame + ".";
break;
}
}
if (warningMsg != "")
{
warningMsg = "Unable to import " + warningMsg + " at frame " + frame + ".";
}
}
// TODO: Handle the additional controllers.
for (int player = 2; player <= controllersUsed.Length; player++)