dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-07-04 05:55:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Gamesetup cleanup, refs #5322.

Browse source 
Inline toggleReady from d1d7afe46c which became a oneline proxy to
setReady in 903803ceec used only in one place.
Inline senderFont and use setStringTags using 3cfb8730a8 from
Freagarachs patch in D2151.

This was SVN commit r22828.
This commit is contained in:
elexis 2019-09-01 18:07:06 +00:00
parent f04c6b68de
commit 283c7b58e2
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
binaries/data/mods/public/gui/gamesetup/gamesetup.js
View file

@ -49,7 +49,7 @@ var g_PlayerAssignmentColors = {
/**
* Used for highlighting the sender of chat messages.
*/
var g_SenderFont = "sans-bold-13";
var g_SenderFontTag = { "font": "sans-bold-13" };
/**
* This yields [1, 2, ..., MaxPlayers].
@ -160,7 +160,7 @@ var g_FormatChatMessage = {
"kicked": (msg, user) => systemMessage(sprintf(translate("%(username)s has been kicked"), { "username": user })),
"banned": (msg, user) => systemMessage(sprintf(translate("%(username)s has been banned"), { "username": user })),
"chat": (msg, user) => sprintf(translate("%(username)s %(message)s"), {
"username": senderFont(sprintf(translate("<%(username)s>"), { "username": user })),
"username": setStringTags(sprintf(translate("<%(username)s>"), { "username": user }), g_SenderFontTag),
"message": escapeText(msg.text || "")
}),
"ready": (msg, user) => sprintf(g_ReadyData[msg.status].chat, { "username": user }),
@ -1059,7 +1059,7 @@ var g_MiscControls = {
if (g_IsController)
launchGame();
else
toggleReady();
setReady((g_IsReady + 1) % 3, true);
},
"onPressRight": () => function() {
if (!g_IsController && g_IsReady)
@ -2534,14 +2534,9 @@ function submitChatInput()
chatInput.focus();
}
function senderFont(text)
{
return '[font="' + g_SenderFont + '"]' + text + '[/font]';
}
function systemMessage(message)
{
return senderFont(sprintf(translate("== %(message)s"), { "message": message }));
return setStringTags(sprintf(translate("== %(message)s"), { "message": message }), g_SenderFontTag);
}
function colorizePlayernameByGUID(guid, username = "")
@ -2605,11 +2600,6 @@ function clearChatMessages()
Engine.GetGUIObjectByName("chatText").caption = "";
}
function toggleReady()
{
setReady((g_IsReady + 1) % 3, true);
}
function setReady(ready, sendMessage)
{
g_IsReady = ready;