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

Lua - gui.text() and gui.Alert() - strongly type the anchor parameters as a string, will still except 0, 1, 2, or 3 as it did previously, for which it will interpret them as string automatically

This commit is contained in:
adelikat 2014-02-17 01:57:25 +00:00
parent 45c6b9f095
commit 63e8702242
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs
View File

@ -123,7 +123,7 @@ namespace BizHawk.Client.EmuHawk
bool alert,
object background = null,
object forecolor = null,
object anchor = null)
string anchor = null)
{
if (!alert)
{
@ -140,31 +140,26 @@ namespace BizHawk.Client.EmuHawk
var a = 0;
if (anchor != null)
if (!string.IsNullOrEmpty(anchor))
{
int dummy;
if (int.TryParse(anchor.ToString(), out dummy) == false)
switch (anchor)
{
if (anchor.ToString().ToLower() == "topleft")
{
case "0":
case "topleft":
a = 0;
}
else if (anchor.ToString().ToLower() == "topright")
{
break;
case "1":
case "topright":
a = 1;
}
else if (anchor.ToString().ToLower() == "bottomleft")
{
break;
case "2":
case "bottomleft":
a = 2;
}
else if (anchor.ToString().ToLower() == "bottomright")
{
break;
case "3":
case "bottomright":
a = 3;
}
}
else
{
a = LuaInt(anchor);
break;
}
}
else
@ -195,7 +190,7 @@ namespace BizHawk.Client.EmuHawk
"alert",
"Functions the same as gui.text() but shows the message in the alert font"
)]
public void Alert(int x, int y, string message, object anchor = null)
public void Alert(int x, int y, string message, string anchor = null)
{
DoGuiText(x, y, message, true, null, null, anchor); // TODO: refactor DoGuiText to take luaStr as string and refactor
}
@ -557,7 +552,7 @@ namespace BizHawk.Client.EmuHawk
string message,
object background = null,
object forecolor = null,
object anchor = null)
string anchor = null)
{
DoGuiText(x, y, message, false, background, forecolor, anchor);
}