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

Lua - Fix gui.Alert() to at least work. However, in trunk the alert font was gimped into regular font with the opengl change, and this is probably for the best. Will remove this lua feature and alert font code in a later commit

This commit is contained in:
adelikat 2014-03-23 17:12:25 +00:00
parent 555c9dfb45
commit 1226603697
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
View File

@ -213,7 +213,7 @@ namespace BizHawk.Client.EmuHawk
//g.DrawString(GUITextList[x].Message, MessageFont, Color.Gray, posx + 1, posy + 1);
if (GUITextList[x].Alert)
g.DrawString(GUITextList[x].Message, MessageFont, FixedMessagesColor, posx, posy);
g.DrawString(GUITextList[x].Message, AlertFont, FixedMessagesColor, posx, posy);
else
g.DrawString(GUITextList[x].Message, MessageFont, GUITextList[x].ForeColor, posx, posy);
}

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

@ -125,17 +125,14 @@ namespace BizHawk.Client.EmuHawk
object forecolor = null,
string anchor = null)
{
if (!alert)
if (forecolor == null)
{
if (forecolor == null)
{
forecolor = "white";
}
forecolor = "white";
}
if (background == null)
{
background = "black";
}
if (background == null)
{
background = "black";
}
var a = 0;