From d6aa111f16320336f604772918d451d2041807a8 Mon Sep 17 00:00:00 2001 From: Benau Date: Thu, 20 Jun 2019 01:33:46 +0800 Subject: [PATCH] Rename country_flag capability to color_emoji for more usage --- data/stk_config.xml | 2 +- src/modes/soccer_world.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/stk_config.xml b/data/stk_config.xml index 428243d18..04078e823 100644 --- a/data/stk_config.xml +++ b/data/stk_config.xml @@ -586,6 +586,6 @@ --> - + diff --git a/src/modes/soccer_world.cpp b/src/modes/soccer_world.cpp index b71314d34..3e6c16023 100644 --- a/src/modes/soccer_world.cpp +++ b/src/modes/soccer_world.cpp @@ -337,7 +337,7 @@ void SoccerWorld::onCheckGoalTriggered(bool first_goal) { if (peer->isValidated() && !peer->isWaitingForGame()) { - if (peer->getClientCapabilities().find("country_flag") != + if (peer->getClientCapabilities().find("color_emoji") != peer->getClientCapabilities().end()) { peer->sendPacket(&p_with_flag, true/*reliable*/); @@ -777,7 +777,7 @@ void SoccerWorld::saveCompleteState(BareNetworkString* bns, STKPeer* peer) .addFloat(m_red_scorers[i].m_time) .encodeString(m_red_scorers[i].m_kart); core::stringw player_name = m_red_scorers[i].m_player; - if (peer->getClientCapabilities().find("country_flag") != + if (peer->getClientCapabilities().find("color_emoji") != peer->getClientCapabilities().end()) { player_name += L" "; @@ -795,7 +795,7 @@ void SoccerWorld::saveCompleteState(BareNetworkString* bns, STKPeer* peer) .addFloat(m_blue_scorers[i].m_time) .encodeString(m_blue_scorers[i].m_kart); core::stringw player_name = m_blue_scorers[i].m_player; - if (peer->getClientCapabilities().find("country_flag") != + if (peer->getClientCapabilities().find("color_emoji") != peer->getClientCapabilities().end()) { player_name += L" ";