Skip to content

Commit e9f28f5

Browse files
committed
Even less ServerConfig, chat stuff moved to another unit
Also refactors for sendString*, getMainName, KartTeamSet, and some functions moved to asset manager. Chat manager will be heavily refactored further.
1 parent 9954172 commit e9f28f5

22 files changed

+893
-757
lines changed

src/network/database_connector.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ void DatabaseConnector::onPlayerJoinQueries(std::shared_ptr<STKPeer> peer,
10161016
peer->getAddress().toString(false),
10171017
peer->getAddress().getPort(),
10181018
online_id,
1019-
Binder(coll, StringUtils::wideToUtf8(peer->getPlayerProfiles()[0]->getName()), "player_name"),
1019+
Binder(coll, peer->getMainName(), "player_name"),
10201020
player_count,
10211021
Binder(coll, country_code, "country_code", true),
10221022
Binder(coll, version_os.first, "version"),
@@ -1043,7 +1043,7 @@ void DatabaseConnector::onPlayerJoinQueries(std::shared_ptr<STKPeer> peer,
10431043
peer->getAddress().getIP(),
10441044
peer->getAddress().getPort(),
10451045
online_id,
1046-
Binder(coll, StringUtils::wideToUtf8(peer->getPlayerProfiles()[0]->getName()), "player_name"),
1046+
Binder(coll, peer->getMainName(), "player_name"),
10471047
player_count,
10481048
Binder(coll, country_code, "country_code", true),
10491049
Binder(coll, version_os.first, "version"),

src/network/game_setup.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,13 @@ void GameSetup::addServerInfo(NetworkString* ns)
139139
if (ServerConfig::m_owner_less)
140140
{
141141
ns->addUInt8(ServerConfig::m_min_start_game_players)
142-
.addFloat(std::max<float>(0.0f, ServerConfig::m_start_game_counter));
142+
.addFloat(std::max<float>(0.0f, getSettings()->getStartGameCounter()));
143143
}
144144
else
145145
ns->addUInt8(0).addFloat(0.0f);
146146

147147
ns->encodeString16(m_message_of_today);
148-
ns->addUInt8((uint8_t)ServerConfig::m_server_configurable);
148+
ns->addUInt8((uint8_t)getSettings()->getServerConfigurable());
149149
ns->addUInt8(getSettings()->isLivePlayers() ? 1 : 0);
150150
} // addServerInfo
151151

0 commit comments

Comments
 (0)