Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix (but not perfectly) the functions for entity scripts to display messages in the GUI

Browse Source 
This was SVN commit r7233.
This commit is contained in:
Ykkrosh 2009-12-30 12:53:59 +00:00
parent 3d2b3b44ec
commit 8d94e1f0e3
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
binaries/data/mods/public/scripts/entity_functions.js
View File

@ -2242,8 +2242,12 @@ var messagesList = new Array();
function showMessage(text)
{
message = getGUIObjectByName("globalMessage");
messageUnder = getGUIObjectByName("globalMessageUnder");
message = getActiveGui().getGUIObjectByName("globalMessage");
messageUnder = getActiveGui().getGUIObjectByName("globalMessageUnder");
// BUG: The active GUI might be e.g. a message box, not the session GUI,
// so this won't be looking in the correct place for the GUI objects.
// (But that's hard to fix cleanly with the new GUI system, and this
// should probably get rewritten anyway.)
if (messagesList.length == MAX_MESSAGES)
{
@ -2271,8 +2275,8 @@ function hideMessage()
if (messagesList.length == 0)
{
getGUIObjectByName("globalMessage").hidden = true;
getGUIObjectByName("globalMessageUnder").hidden = true;
getActiveGui().getGUIObjectByName("globalMessage").hidden = true;
getActiveGui().getGUIObjectByName("globalMessageUnder").hidden = true;
}
else
{
@ -2288,7 +2292,7 @@ function updateMessageView()
{
result = result + messagesList[i] + "\n";
}
getGUIObjectByName("globalMessage").caption = result;
getGUIObjectByName("globalMessageUnder").caption = result;
getActiveGui().getGUIObjectByName("globalMessage").caption = result;
getActiveGui().getGUIObjectByName("globalMessageUnder").caption = result;
}