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

-Fixed up warningMsg code for various importers. 

-Made what seems to be progress with ImportZMV...still not functioning though.
This commit is contained in:
brandman211 2012-09-21 09:11:30 +00:00
parent 72d4fefbe0
commit eb9f37d6bd
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
BizHawk.MultiClient/movie/MovieImport.cs
View File

@ -1751,7 +1751,7 @@ namespace BizHawk.MultiClient
peripheral = "Multitap"; peripheral = "Multitap";
break; break;
} }
if (warningMsg != "" && peripheral != "") if (peripheral != "" && warningMsg == "")
warningMsg = "Unable to import " + peripheral + "."; warningMsg = "Unable to import " + peripheral + ".";
} }
ushort controllerState = (ushort)(((controllerState1 << 4) & 0x0F00) | controllerState2); ushort controllerState = (ushort)(((controllerState1 << 4) & 0x0F00) | controllerState2);
@ -1762,7 +1762,7 @@ namespace BizHawk.MultiClient
((controllerState >> button) & 0x1) != 0 ((controllerState >> button) & 0x1) != 0
); );
} }
else if (warningMsg != "") else if (warningMsg == "")
warningMsg = "Controller " + player + " not supported."; warningMsg = "Controller " + player + " not supported.";
} }
// The controller data contains <number_of_frames + 1> frames. // The controller data contains <number_of_frames + 1> frames.
@ -2203,14 +2203,14 @@ namespace BizHawk.MultiClient
} }
else else
commandName = "NESCMD_EXCONTROLLER, " + (command & 0xFF00); commandName = "NESCMD_EXCONTROLLER, " + (command & 0xFF00);
if (warningMsg != "" && commandName != "") if (commandName != "" && warningMsg == "")
warningMsg = "Unable to run command \"" + commandName + "\"."; warningMsg = "Unable to run command \"" + commandName + "\".";
} }
else if (controllerState == 0xF3) else if (controllerState == 0xF3)
{ {
uint dwdata = r.ReadUInt32(); uint dwdata = r.ReadUInt32();
// TODO: Make a clearer warning message. // TODO: Make a clearer warning message.
if (warningMsg != "") if (warningMsg == "")
warningMsg = "Unable to run SetSyncExData(" + dwdata + ")."; warningMsg = "Unable to run SetSyncExData(" + dwdata + ").";
} }
controllerState = r.ReadByte(); controllerState = r.ReadByte();
@ -2283,20 +2283,21 @@ namespace BizHawk.MultiClient
bit 0: super scope in second port bit 0: super scope in second port
*/ */
byte controllerFlags = r.ReadByte(); byte controllerFlags = r.ReadByte();
string peripheral = "";
bool superScope = ((controllerFlags & 0x1) != 0); bool superScope = ((controllerFlags & 0x1) != 0);
if (superScope) if (superScope)
warningMsg = "Super Scope"; peripheral = "Super Scope";
controllerFlags >>= 1; controllerFlags >>= 1;
bool secondMouse = ((controllerFlags & 0x1) != 0); bool secondMouse = ((controllerFlags & 0x1) != 0);
if (secondMouse && warningMsg != "") if (secondMouse && peripheral == "")
warningMsg = "Second Mouse"; peripheral = "Second Mouse";
controllerFlags >>= 1; controllerFlags >>= 1;
bool firstMouse = ((controllerFlags & 0x1) != 0); bool firstMouse = ((controllerFlags & 0x1) != 0);
if (firstMouse && warningMsg != "") if (firstMouse && peripheral == "")
warningMsg = "First Mouse"; peripheral = "First Mouse";
controllerFlags >>= 1; controllerFlags >>= 1;
if (warningMsg != "") if (peripheral != "")
warningMsg = "Unable to import " + warningMsg + "."; warningMsg = "Unable to import " + peripheral + ".";
bool[] controllersUsed = new bool[5]; bool[] controllersUsed = new bool[5];
for (int controller = 1; controller <= controllersUsed.Length; controller++) for (int controller = 1; controller <= controllersUsed.Length; controller++)
controllersUsed[controllersUsed.Length - controller] = ( controllersUsed[controllersUsed.Length - controller] = (
@ -2343,7 +2344,7 @@ namespace BizHawk.MultiClient
MnemonicsGenerator mg = new MnemonicsGenerator(); MnemonicsGenerator mg = new MnemonicsGenerator();
// R, L, X, A, Right, Left, Down, Up, Start, Select, Y, B. TODO: Confirm. // R, L, X, A, Right, Left, Down, Up, Start, Select, Y, B. TODO: Confirm.
string[] buttons = new string[12] { string[] buttons = new string[12] {
"Right", "Left", "Down", "Up", "Start", "Select", "Y", "B", "R", "L", "X", "A" "R", "L", "X", "A", "Right", "Left", "Down", "Up", "Start", "Select", "Y", "B"
}; };
int events = (int)(frameCount + internalChapters); int events = (int)(frameCount + internalChapters);
int frames = 1; int frames = 1;
@ -2378,6 +2379,8 @@ namespace BizHawk.MultiClient
{ {
// If the event is RLE data, next follows 4 bytes which is the frame to repeat current input till. // If the event is RLE data, next follows 4 bytes which is the frame to repeat current input till.
uint frame = r.ReadUInt32(); uint frame = r.ReadUInt32();
if (frame > frameCount)
continue;
mg.SetSource(controllers); mg.SetSource(controllers);
for (; frames <= frame; frames++) for (; frames <= frame; frames++)
{ {
@ -2412,9 +2415,8 @@ namespace BizHawk.MultiClient
byte leftOver = 0x0; byte leftOver = 0x0;
for (int player = 1; player <= controllersUsed.Length; player++) for (int player = 1; player <= controllersUsed.Length; player++)
{ {
// If the controller is enabled and has changed: // If the controller has changed:
if (controllersUsed[controllersUsed.Length - player] && if (((flag >> (controllersUsed.Length - player)) & 0x1) != 0)
(((flag >> (player - 1)) & 0x1) != 0))
{ {
byte controllerState1 = r.ReadByte(); byte controllerState1 = r.ReadByte();
uint controllerState; uint controllerState;
@ -2431,7 +2433,7 @@ namespace BizHawk.MultiClient
controllerState = (uint)(((controllerState1 << 8) & 0x0F00) | controllerState2); controllerState = (uint)(((controllerState1 << 8) & 0x0F00) | controllerState2);
leftOver = (byte)((controllerState1 >> 4) & 0x0F); leftOver = (byte)((controllerState1 >> 4) & 0x0F);
} }
else if ((leftOver & 0xF0) == leftOver) else if ((leftOver & 0x0F) == leftOver)
{ {
if (player == 2 && superScope) if (player == 2 && superScope)
{ {
@ -2445,14 +2447,16 @@ namespace BizHawk.MultiClient
else else
throw new ArgumentException("Unexpected number of leftover bits."); throw new ArgumentException("Unexpected number of leftover bits.");
if (player <= Global.PLAYERS[controllers.Type.Name]) if (player <= Global.PLAYERS[controllers.Type.Name])
if (player != 2 || !superScope) {
if (controllersUsed[player - 1] && (player != 2 || !superScope))
for (int button = 0; button < buttons.Length; button++) for (int button = 0; button < buttons.Length; button++)
{ {
controllers["P" + player + " " + buttons[button]] = ( controllers["P" + player + " " + buttons[button]] = (
((controllerState >> button) & 0x1) != 0 ((controllerState >> button) & 0x1) != 0
); );
} }
else if (warningMsg != "") }
else if (warningMsg == "")
warningMsg = "Controller " + player + " not supported."; warningMsg = "Controller " + player + " not supported.";
} }
} }