ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't show chosen team color for spectator

Browse Source
This commit is contained in:
Benau 2019-02-03 15:39:48 +08:00
parent f048e19bb1
commit 2eed6254f4
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/protocols/client_lobby.hpp
View File

@ -46,6 +46,8 @@ struct LobbyPlayer
uint32_t m_online_id;
/* Icon used in networking lobby, see NetworkingLobby::loadedFromFile. */
int m_icon_id;
/* Icon id for spectator in NetworkingLobby::loadedFromFile is 5. */
bool isSpectator() const { return m_icon_id == 5; }
};
class ClientLobby : public LobbyProtocol

10
src/states_screens/online/networking_lobby.cpp
View File

@ -512,7 +512,10 @@ void NetworkingLobby::updatePlayerPings()
if (id != -1)
{
m_player_list->renameItem(id, name_with_ping, p.second.m_icon_id);
if (p.second.m_kart_team == KART_TEAM_RED)
// Don't show chosen team color for spectator
if (p.second.isSpectator())
m_player_list->markItemRed(id, false/*red*/);
else if (p.second.m_kart_team == KART_TEAM_RED)
m_player_list->markItemRed(id);
else if (p.second.m_kart_team == KART_TEAM_BLUE)
m_player_list->markItemBlue(id);
@ -664,7 +667,10 @@ void NetworkingLobby::updatePlayers()
StringUtils::toString(player.m_local_player_id);
m_player_list->addItem(internal_name, player.m_user_name,
player.m_icon_id);
if (cur_team == KART_TEAM_RED)
// Don't show chosen team color for spectator
if (player.isSpectator())
m_player_list->markItemRed(i, false/*red*/);
else if (cur_team == KART_TEAM_RED)
m_player_list->markItemRed(i);
else if (cur_team == KART_TEAM_BLUE)
m_player_list->markItemBlue(i);