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

Don't select "everyone" but the previously selected chat addressee when someone connected or disconnected. Fixes #3956.

Browse Source 
This was SVN commit r18369.
This commit is contained in:
elexis 2016-06-12 21:11:01 +00:00
parent 31decd6274
commit 320798f901
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
binaries/data/mods/public/gui/session/messages.js
View File

@ -520,6 +520,11 @@ function onClientLeave(guid)
function updateChatAddressees()
{
// Remember previously selected item
let chatAddressee = Engine.GetGUIObjectByName("chatAddressee");
let selectedName = chatAddressee.list_data[chatAddressee.selected] || "";
selectedName = selectedName.substr(0, 4) == "/msg" && selectedName.substr(5);
let addressees = [
{
"label": translateWithContext("chat addressee", "Everyone"),
@ -545,7 +550,8 @@ function updateChatAddressees()
});
// Add playernames for private messages
for (let guid of sortGUIDsByPlayerID())
let guids = sortGUIDsByPlayerID();
for (let guid of guids)
{
if (guid == Engine.GetPlayerGUID())
continue;
@ -564,10 +570,17 @@ function updateChatAddressees()
});
}
let chatAddressee = Engine.GetGUIObjectByName("chatAddressee");
// Select mock item if the selected addressee went offline
if (selectedName && guids.every(guid => g_PlayerAssignments[guid].name != selectedName))
addressees.push({
"cmd": "/msg " + selectedName,
"label": sprintf(translate("\\[OFFLINE] %(player)s"), { "player": selectedName })
});
let oldChatAddressee = chatAddressee.list_data[chatAddressee.selected];
chatAddressee.list = addressees.map(adressee => adressee.label);
chatAddressee.list_data = addressees.map(adressee => adressee.cmd);
chatAddressee.selected = 0;
chatAddressee.selected = Math.max(0, chatAddressee.list_data.indexOf(oldChatAddressee));
}
/**