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

Removes the unused "gone" presence state from the lobby. Refs #3383.

Browse Source 
This was SVN commit r17358.
This commit is contained in:
elexis 2015-12-02 14:41:32 +00:00
parent eeaffa05ee
commit 02c065e2c9
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
binaries/data/mods/public/gui/lobby/lobby.js
View File

@ -218,7 +218,7 @@ function updatePlayerList()
return g_PlayerListOrder;
return 0;
case 'status':
let order = ["available", "away", "playing", "gone", "offline"];
let order = ["available", "away", "playing", "offline"];
let presenceA = order.indexOf(a.presence);
let presenceB = order.indexOf(b.presence);
if (presenceA < presenceB)
@ -543,7 +543,6 @@ function formatPlayerListEntry(nickname, presence, rating)
color = "125 0 0";
status = translate("Busy");
break;
case "gone":
case "away":
color = "229 76 13";
status = translate("Away");

3
source/lobby/XmppClient.cpp
View File

@ -924,7 +924,6 @@ void XmppClient::SetPresence(const std::string& presence)
else IF("chat", Chat);
else IF("away", Away);
else IF("playing", DND);
else IF("gone", XA);
else IF("offline", Unavailable);
// The others are not to be set
#undef IF
@ -978,7 +977,7 @@ void XmppClient::GetPresenceString(const gloox::Presence::PresenceType p, std::s
CASE(Chat, "chat");
CASE(Away, "away");
CASE(DND, "playing");
CASE(XA, "gone");
CASE(XA, "away");
CASE(Unavailable, "offline");
CASE(Probe, "probe");
CASE(Error, "error");