mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 16:24:35 +01:00
Code Issues Releases Wiki Activity

Rename public network config data members

Browse Source
This commit is contained in:
Hielke Morsink
2022-10-16 17:52:53 +02:00
parent 371470b5d5
commit bff430805f
11 changed files with 127 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/openrct2/network/NetworkBase.cpp
View File

@@ -282,7 +282,7 @@ bool NetworkBase::BeginClient(const std::string& host, uint16_t port)
// risk of tick collision with the server map and title screen map.
GameActions::SuspendQueue();
auto keyPath = network_get_private_key_path(gConfigNetwork.player_name);
auto keyPath = network_get_private_key_path(gConfigNetwork.PlayerName);
if (!File::Exists(keyPath))
{
Console::WriteLine("Generating key... This may take a while");
@@ -310,7 +310,7 @@ bool NetworkBase::BeginClient(const std::string& host, uint16_t port)
const std::string hash = _key.PublicKeyHash();
const utf8* publicKeyHash = hash.c_str();
keyPath = network_get_public_key_path(gConfigNetwork.player_name, publicKeyHash);
keyPath = network_get_public_key_path(gConfigNetwork.PlayerName, publicKeyHash);
Console::WriteLine("Key generated, saving public bits as %s", keyPath.c_str());
try
@@ -372,12 +372,12 @@ bool NetworkBase::BeginServer(uint16_t port, const std::string& address)
return false;
}
ServerName = gConfigNetwork.server_name;
ServerDescription = gConfigNetwork.server_description;
ServerGreeting = gConfigNetwork.server_greeting;
ServerProviderName = gConfigNetwork.provider_name;
ServerProviderEmail = gConfigNetwork.provider_email;
ServerProviderWebsite = gConfigNetwork.provider_website;
ServerName = gConfigNetwork.ServerName;
ServerDescription = gConfigNetwork.ServerDescription;
ServerGreeting = gConfigNetwork.ServerGreeting;
ServerProviderName = gConfigNetwork.ProviderName;
ServerProviderEmail = gConfigNetwork.ProviderEmail;
ServerProviderWebsite = gConfigNetwork.ProviderWebsite;
IsServerPlayerInvisible = gOpenRCT2Headless;
@@ -386,7 +386,7 @@ bool NetworkBase::BeginServer(uint16_t port, const std::string& address)
BeginChatLog();
BeginServerLog();
NetworkPlayer* player = AddPlayer(gConfigNetwork.player_name, "");
NetworkPlayer* player = AddPlayer(gConfigNetwork.PlayerName, "");
player->Flags |= NETWORK_PLAYER_FLAG_ISSERVER;
player->Group = 0;
player_id = player->Id;
@@ -407,7 +407,7 @@ bool NetworkBase::BeginServer(uint16_t port, const std::string& address)
status = NETWORK_STATUS_CONNECTED;
listening_port = port;
_serverState.gamestateSnapshotsEnabled = gConfigNetwork.desync_debugging;
_serverState.gamestateSnapshotsEnabled = gConfigNetwork.DesyncDebugging;
_advertiser = CreateServerAdvertiser(listening_port);
game_load_scripts();
@@ -796,7 +796,7 @@ bool NetworkBase::CheckDesynchronizaton()
intent.putExtra(INTENT_EXTRA_MESSAGE, std::string{ str_desync });
context_open_intent(&intent);
if (!gConfigNetwork.stay_connected)
if (!gConfigNetwork.StayConnected)
{
Close();
}
@@ -868,12 +868,12 @@ std::string NetworkBase::GenerateAdvertiseKey()
std::string NetworkBase::GetMasterServerUrl()
{
if (gConfigNetwork.master_server_url.empty())
if (gConfigNetwork.MasterServerUrl.empty())
{
return OPENRCT2_MASTER_SERVER_URL;
}
return gConfigNetwork.master_server_url;
return gConfigNetwork.MasterServerUrl;
}
NetworkGroup* NetworkBase::AddGroup()
@@ -1111,7 +1111,7 @@ void NetworkBase::BeginChatLog()
void NetworkBase::AppendChatLog(std::string_view s)
{
if (gConfigNetwork.log_chat && _chat_log_fs.is_open())
if (gConfigNetwork.LogChat && _chat_log_fs.is_open())
{
AppendLog(_chat_log_fs, s);
}
@@ -1149,7 +1149,7 @@ void NetworkBase::BeginServerLog()
void NetworkBase::AppendServerLog(const std::string& s)
{
if (gConfigNetwork.log_server_actions && _server_log_fs.is_open())
if (gConfigNetwork.LogServerActions && _server_log_fs.is_open())
{
AppendLog(_server_log_fs, s);
}
@@ -1583,10 +1583,10 @@ void NetworkBase::Server_Send_SETDISCONNECTMSG(NetworkConnection& connection, co
json_t NetworkBase::GetServerInfoAsJson() const
{
json_t jsonObj = {
{ "name", gConfigNetwork.server_name }, { "requiresPassword", _password.size() > 0 },
{ "version", network_get_version() }, { "players", GetNumVisiblePlayers() },
{ "maxPlayers", gConfigNetwork.maxplayers }, { "description", gConfigNetwork.server_description },
{ "greeting", gConfigNetwork.server_greeting }, { "dedicated", gOpenRCT2Headless },
{ "name", gConfigNetwork.ServerName }, { "requiresPassword", _password.size() > 0 },
{ "version", network_get_version() }, { "players", GetNumVisiblePlayers() },
{ "maxPlayers", gConfigNetwork.Maxplayers }, { "description", gConfigNetwork.ServerDescription },
{ "greeting", gConfigNetwork.ServerGreeting }, { "dedicated", gOpenRCT2Headless },
};
return jsonObj;
}
@@ -1599,9 +1599,9 @@ void NetworkBase::Server_Send_GAMEINFO(NetworkConnection& connection)
// Provider details
json_t jsonProvider = {
{ "name", gConfigNetwork.provider_name },
{ "email", gConfigNetwork.provider_email },
{ "website", gConfigNetwork.provider_website },
{ "name", gConfigNetwork.ProviderName },
{ "email", gConfigNetwork.ProviderEmail },
{ "website", gConfigNetwork.ProviderWebsite },
};
jsonObj["provider"] = jsonProvider;
@@ -2119,7 +2119,7 @@ std::string NetworkBase::MakePlayerNameUnique(const std::string& name)
void NetworkBase::Client_Handle_TOKEN(NetworkConnection& connection, NetworkPacket& packet)
{
auto keyPath = network_get_private_key_path(gConfigNetwork.player_name);
auto keyPath = network_get_private_key_path(gConfigNetwork.PlayerName);
if (!File::Exists(keyPath))
{
log_error("Key file (%s) was not found. Restart client to re-generate it.", keyPath.c_str());
@@ -2162,7 +2162,7 @@ void NetworkBase::Client_Handle_TOKEN(NetworkConnection& connection, NetworkPack
// when process dump gets collected at some point in future.
_key.Unload();
Client_Send_AUTH(gConfigNetwork.player_name, gCustomPassword, pubkey, signature);
Client_Send_AUTH(gConfigNetwork.PlayerName, gCustomPassword, pubkey, signature);
}
void NetworkBase::Server_Handle_REQUEST_GAMESTATE(NetworkConnection& connection, NetworkPacket& packet)
@@ -2561,7 +2561,7 @@ void NetworkBase::Server_Handle_AUTH(NetworkConnection& connection, NetworkPacke
if (verified)
{
log_verbose("Connection %s: Signature verification ok. Hash %s", hostName, hash.c_str());
if (gConfigNetwork.known_keys_only && _userManager.GetUserByHash(hash) == nullptr)
if (gConfigNetwork.KnownKeysOnly && _userManager.GetUserByHash(hash) == nullptr)
{
log_verbose("Connection %s: Hash %s, not known", hostName, hash.c_str());
connection.AuthStatus = NetworkAuth::UnknownKeyDisallowed;
@@ -2614,7 +2614,7 @@ void NetworkBase::Server_Handle_AUTH(NetworkConnection& connection, NetworkPacke
}
}
if (GetNumVisiblePlayers() >= gConfigNetwork.maxplayers)
if (GetNumVisiblePlayers() >= gConfigNetwork.Maxplayers)
{
connection.AuthStatus = NetworkAuth::Full;
log_info("Connection %s: Server is full.", hostName);
@@ -3825,7 +3825,7 @@ void network_send_game_action(const GameAction* action)
void network_send_password(const std::string& password)
{
auto& network = OpenRCT2::GetContext()->GetNetwork();
const auto keyPath = network_get_private_key_path(gConfigNetwork.player_name);
const auto keyPath = network_get_private_key_path(gConfigNetwork.PlayerName);
if (!File::Exists(keyPath))
{
log_error("Private key %s missing! Restart the game to generate it.", keyPath.c_str());
@@ -3848,7 +3848,7 @@ void network_send_password(const std::string& password)
// Don't keep private key in memory. There's no need and it may get leaked
// when process dump gets collected at some point in future.
network._key.Unload();
network.Client_Send_AUTH(gConfigNetwork.player_name, password, pubkey, signature);
network.Client_Send_AUTH(gConfigNetwork.PlayerName, password, pubkey, signature);
}
void network_set_password(const char* password)