mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-25 07:44:38 +01:00
Code Issues Releases Wiki Activity

Remove Network function name prefixes given namespace qualifiers

Browse Source
This commit is contained in:
Aaron van Geffen
2025-08-31 16:02:43 +02:00
parent 58569d6d50
commit 5a4cc7d00d
73 changed files with 1060 additions and 1044 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/interface/Chat.cpp
View File

@@ -44,8 +44,8 @@ static int32_t ChatHistoryDrawString(RenderTarget& rt, const char* text, const S
bool ChatAvailable()
{
return NetworkGetMode() != NETWORK_MODE_NONE && NetworkGetStatus() == NETWORK_STATUS_CONNECTED
&& NetworkGetAuthstatus() == NetworkAuth::Ok;
return Network::GetMode() != Network::Mode::none && Network::GetStatus() == Network::Status::connected
&& Network::GetAuthstatus() == Network::Auth::ok;
}
void ChatOpen()
@@ -243,7 +243,7 @@ void ChatAddHistory(std::string_view s)
_chatHistoryTime.push_front(Platform::GetTicks());
// Log to file (src only as logging does its own timestamp)
NetworkAppendChatLog(s);
Network::AppendChatLog(s);
CreateAudioChannel(SoundId::NewsItem, 0, kMixerVolumeMax, 0.5f, 1.5f, true);
}
@@ -255,7 +255,7 @@ void ChatInput(enum ChatInput input)
case ChatInput::Send:
if (!_chatCurrentLine.empty())
{
NetworkSendChat(_chatCurrentLine.c_str());
Network::SendChat(_chatCurrentLine.c_str());
}
ChatClearInput();
ChatClose();

20
src/openrct2/interface/InteractiveConsole.cpp
View File

@@ -1176,7 +1176,7 @@ static void ConsoleCommandOpen(InteractiveConsole& console, const arguments_t& a
bool invalidTitle = false;
if (argv[0] == "object_selection" && InvalidArguments(&invalidTitle, !title))
{
if (NetworkGetMode() != NETWORK_MODE_NONE)
if (Network::GetMode() != Network::Mode::none)
{
console.WriteLineError("Cannot open this window in multiplayer mode.");
}
@@ -1190,7 +1190,7 @@ static void ConsoleCommandOpen(InteractiveConsole& console, const arguments_t& a
}
else if (argv[0] == "inventions_list" && InvalidArguments(&invalidTitle, !title))
{
if (NetworkGetMode() != NETWORK_MODE_NONE)
if (Network::GetMode() != Network::Mode::none)
{
console.WriteLineError("Cannot open this window in multiplayer mode.");
}
@@ -1362,8 +1362,8 @@ static void ConsoleCommandSavePark([[maybe_unused]] InteractiveConsole& console,
static void ConsoleCommandSay(InteractiveConsole& console, const arguments_t& argv)
{
if (NetworkGetMode() == NETWORK_MODE_NONE || NetworkGetStatus() != NETWORK_STATUS_CONNECTED
|| NetworkGetAuthstatus() != NetworkAuth::Ok)
if (Network::GetMode() == Network::Mode::none || Network::GetStatus() != Network::Status::connected
|| Network::GetAuthstatus() != Network::Auth::ok)
{
console.WriteFormatLine("This command only works in multiplayer mode.");
return;
@@ -1371,7 +1371,7 @@ static void ConsoleCommandSay(InteractiveConsole& console, const arguments_t& ar
if (!argv.empty())
{
NetworkSendChat(argv[0].c_str());
Network::SendChat(argv[0].c_str());
return;
}
@@ -1380,7 +1380,7 @@ static void ConsoleCommandSay(InteractiveConsole& console, const arguments_t& ar
static void ConsoleCommandReplayStartRecord(InteractiveConsole& console, const arguments_t& argv)
{
if (NetworkGetMode() != NETWORK_MODE_NONE)
if (Network::GetMode() != Network::Mode::none)
{
console.WriteFormatLine("This command is currently not supported in multiplayer mode.");
return;
@@ -1423,7 +1423,7 @@ static void ConsoleCommandReplayStartRecord(InteractiveConsole& console, const a
static void ConsoleCommandReplayStopRecord(InteractiveConsole& console, const arguments_t& argv)
{
if (NetworkGetMode() != NETWORK_MODE_NONE)
if (Network::GetMode() != Network::Mode::none)
{
console.WriteFormatLine("This command is currently not supported in multiplayer mode.");
return;
@@ -1454,7 +1454,7 @@ static void ConsoleCommandReplayStopRecord(InteractiveConsole& console, const ar
static void ConsoleCommandReplayStart(InteractiveConsole& console, const arguments_t& argv)
{
if (NetworkGetMode() != NETWORK_MODE_NONE)
if (Network::GetMode() != Network::Mode::none)
{
console.WriteFormatLine("This command is currently not supported in multiplayer mode.");
return;
@@ -1492,7 +1492,7 @@ static void ConsoleCommandReplayStart(InteractiveConsole& console, const argumen
static void ConsoleCommandReplayStop(InteractiveConsole& console, const arguments_t& argv)
{
if (NetworkGetMode() != NETWORK_MODE_NONE)
if (Network::GetMode() != Network::Mode::none)
{
console.WriteFormatLine("This command is currently not supported in multiplayer mode.");
return;
@@ -1507,7 +1507,7 @@ static void ConsoleCommandReplayStop(InteractiveConsole& console, const argument
static void ConsoleCommandReplayNormalise(InteractiveConsole& console, const arguments_t& argv)
{
if (NetworkGetMode() != NETWORK_MODE_NONE)
if (Network::GetMode() != Network::Mode::none)
{
console.WriteFormatLine("This command is currently not supported in multiplayer mode.");
}