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

-Imported .LSMV buttons. 

--Haven't done anything with the flags because I don't know what they are supposed to do yet.
--Speedy Gonzales v2 doesn't sync after being converted, but I don't think that's my fault.
-Flags and other data will be parsed soon.
This commit is contained in:
brandman211 2012-09-12 05:59:09 +00:00
parent 8a24de458f
commit ae4dfbc00e
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Emulation/CPUs/CP1610/Execute.cs
View File

@ -87,8 +87,8 @@ namespace BizHawk.Emulation.CPUs.CP1610
public int Execute()
{
/*
Take an interrupt if the previous instruction was interruptible, interrupts are enabled, and IntRM has a
falling edge.
Take an interrupt if the previous instruction was interruptible, interrupts are enabled, and IntRM has a
falling edge.
*/
if (FlagI && Interruptible && !IntRM && !Interrupted)
{

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

@ -106,6 +106,12 @@ namespace BizHawk.MultiClient
buttons = new string[8] { "Up", "Down", "Left", "Right", "B1", "B2", "Run", "Select" };
controller = "PC Engine Controller";
break;
case ".LSMV":
buttons = new string[12] {
"B", "Y", "Select", "Start", "Up", "Down", "Left", "Right", "A", "X", "L", "R"
};
controller = "SNES Controller";
break;
}
SimpleController controllers = new SimpleController();
controllers.Type = new ControllerDefinition();
@ -144,13 +150,23 @@ namespace BizHawk.MultiClient
}
}
/*
Skip the first two sections of the split, which consist of everything before the starting | and the
command. Do not use the section after the last |. In other words, get the sections for the players.
Skip the first two sections of the split, which consist of everything before the starting | and the command.
Do not use the section after the last |. In other words, get the sections for the players.
*/
for (int section = 2; section < sections.Length - 1; section++)
int start = 2;
int end = sections.Length - 1;
int player_offset = -1;
if (Path.GetExtension(path).ToUpper() == ".LSMV")
{
// LSNES frames don't start or end with a |.
start--;
end++;
player_offset++;
}
for (int section = start; section < end; section++)
{
// The player number is one less than the section number for the reasons explained above.
int player = section - 1;
int player = section + player_offset;
// Only count lines with that have the right number of buttons and are for valid players.
if (
sections[section].Length == buttons.Length &&
@ -863,6 +879,14 @@ namespace BizHawk.MultiClient
hf.BindArchiveMember(item.index);
var stream = hf.GetStream();
string input = Encoding.UTF8.GetString(Util.ReadAllBytes(stream));
int lineNum = 0;
using (StringReader reader = new StringReader(input))
{
lineNum++;
string line;
while ((line = reader.ReadLine()) != null)
m = ImportTextFrame(line, lineNum, m, path, ref warningMsg);
}
}
}
return m;