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

Lua - Better output for movie.getinput()

This commit is contained in:
andres.delikat 2012-03-27 19:21:10 +00:00
parent 3e84fc9936
commit 489086716d
1 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
BizHawk.MultiClient/LuaImplementation.cs
View File

@ -142,10 +142,10 @@ namespace BizHawk.MultiClient
{ {
int n = lua_args.Length; int n = lua_args.Length;
int trim = 0; int trim = 0;
for (int i = n-1; i >= 0; --i) for (int i = n - 1; i >= 0; --i)
if (lua_args[i] == null) ++trim; if (lua_args[i] == null) ++trim;
object[] lua_result = new object[n-trim]; object[] lua_result = new object[n - trim];
Array.Copy(lua_args, lua_result, n-trim); Array.Copy(lua_args, lua_result, n - trim);
return lua_result; return lua_result;
} }
@ -699,8 +699,8 @@ namespace BizHawk.MultiClient
private uint M_R_U_LE(int addr, int size) private uint M_R_U_LE(int addr, int size)
{ {
uint v = 0; uint v = 0;
for(int i = 0; i < size; ++i) for (int i = 0; i < size; ++i)
v |= M_R_U8(addr+i) << 8*i; v |= M_R_U8(addr + i) << 8 * i;
return v; return v;
} }
@ -712,8 +712,8 @@ namespace BizHawk.MultiClient
private uint M_R_U_BE(int addr, int size) private uint M_R_U_BE(int addr, int size)
{ {
uint v = 0; uint v = 0;
for(int i = 0; i < size; ++i) for (int i = 0; i < size; ++i)
v |= M_R_U8(addr+i) << 8*(size-1-i); v |= M_R_U8(addr + i) << 8 * (size - 1 - i);
return v; return v;
} }
@ -724,8 +724,8 @@ namespace BizHawk.MultiClient
private void M_W_U_LE(int addr, uint v, int size) private void M_W_U_LE(int addr, uint v, int size)
{ {
for(int i = 0; i < size; ++i) for (int i = 0; i < size; ++i)
M_W_U8(addr+i, (v>>(8*i)) & 0xFF); M_W_U8(addr + i, (v >> (8 * i)) & 0xFF);
} }
private void M_W_S_BE(int addr, int v, int size) private void M_W_S_BE(int addr, int v, int size)
@ -735,8 +735,8 @@ namespace BizHawk.MultiClient
private void M_W_U_BE(int addr, uint v, int size) private void M_W_U_BE(int addr, uint v, int size)
{ {
for(int i = 0; i < size; ++i) for (int i = 0; i < size; ++i)
M_W_U8(addr+i, (v>>(8*(size-1-i))) & 0xFF); M_W_U8(addr + i, (v >> (8 * (size - 1 - i))) & 0xFF);
} }
private uint M_R_U8(int addr) private uint M_R_U8(int addr)
@ -956,8 +956,8 @@ namespace BizHawk.MultiClient
private uint MM_R_U_LE(int addr, int size) private uint MM_R_U_LE(int addr, int size)
{ {
uint v = 0; uint v = 0;
for(int i = 0; i < size; ++i) for (int i = 0; i < size; ++i)
v |= MM_R_U8(addr+i) << 8*i; v |= MM_R_U8(addr + i) << 8 * i;
return v; return v;
} }
@ -969,8 +969,8 @@ namespace BizHawk.MultiClient
private uint MM_R_U_BE(int addr, int size) private uint MM_R_U_BE(int addr, int size)
{ {
uint v = 0; uint v = 0;
for(int i = 0; i < size; ++i) for (int i = 0; i < size; ++i)
v |= MM_R_U8(addr+i) << 8*(size-1-i); v |= MM_R_U8(addr + i) << 8 * (size - 1 - i);
return v; return v;
} }
@ -981,8 +981,8 @@ namespace BizHawk.MultiClient
private void MM_W_U_LE(int addr, uint v, int size) private void MM_W_U_LE(int addr, uint v, int size)
{ {
for(int i = 0; i < size; ++i) for (int i = 0; i < size; ++i)
MM_W_U8(addr+i, (v>>(8*i)) & 0xFF); MM_W_U8(addr + i, (v >> (8 * i)) & 0xFF);
} }
private void MM_W_S_BE(int addr, int v, int size) private void MM_W_S_BE(int addr, int v, int size)
@ -992,8 +992,8 @@ namespace BizHawk.MultiClient
private void MM_W_U_BE(int addr, uint v, int size) private void MM_W_U_BE(int addr, uint v, int size)
{ {
for(int i = 0; i < size; ++i) for (int i = 0; i < size; ++i)
MM_W_U8(addr+i, (v>>(8*(size-1-i))) & 0xFF); MM_W_U8(addr + i, (v >> (8 * (size - 1 - i))) & 0xFF);
} }
private uint MM_R_U8(int addr) private uint MM_R_U8(int addr)
@ -1009,8 +1009,8 @@ namespace BizHawk.MultiClient
private int U2S(uint u, int size) private int U2S(uint u, int size)
{ {
int s = (int)u; int s = (int)u;
s <<= 8*(4-size); s <<= 8 * (4 - size);
s >>= 8*(4-size); s >>= 8 * (4 - size);
return s; return s;
} }
@ -1132,9 +1132,10 @@ namespace BizHawk.MultiClient
string s = Global.MovieSession.Movie.GetInputFrame(LuaInt(frame)); string s = Global.MovieSession.Movie.GetInputFrame(LuaInt(frame));
foreach (char c in s) MovieControllerAdapter m = new MovieControllerAdapter();
if (c.ToString() != "|" && c.ToString() != ".") m.SetControllersAsMnemonic(s);
input[c.ToString()] = true; foreach (string button in m.Type.BoolButtons)
input[button] = m[button];
return input; return input;
} }