From 2c224cfd5379290c3e2077dded27b464cea7c116 Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Wed, 18 Jan 2023 07:05:53 +0100 Subject: [PATCH] Rename snake_case functions in OpenRCT2/network folder (#19203) --- src/openrct2-ui/input/Shortcuts.cpp | 6 +- src/openrct2-ui/windows/Guest.cpp | 8 +- src/openrct2-ui/windows/Multiplayer.cpp | 89 ++-- src/openrct2-ui/windows/NetworkStatus.cpp | 4 +- src/openrct2-ui/windows/Options.cpp | 6 +- src/openrct2-ui/windows/Player.cpp | 56 +-- src/openrct2-ui/windows/Ride.cpp | 2 +- src/openrct2-ui/windows/RideConstruction.cpp | 4 +- src/openrct2-ui/windows/RideList.cpp | 8 +- src/openrct2-ui/windows/SavePrompt.cpp | 6 +- src/openrct2-ui/windows/Scenery.cpp | 4 +- src/openrct2-ui/windows/ServerList.cpp | 6 +- src/openrct2-ui/windows/ServerStart.cpp | 8 +- src/openrct2-ui/windows/Staff.cpp | 11 +- src/openrct2-ui/windows/TopToolbar.cpp | 18 +- src/openrct2/Context.cpp | 2 +- src/openrct2/Game.cpp | 2 +- src/openrct2/GameState.cpp | 44 +- src/openrct2/ReplayManager.cpp | 6 +- src/openrct2/actions/CheatSetAction.cpp | 2 +- src/openrct2/actions/GameAction.cpp | 38 +- .../actions/NetworkModifyGroupAction.cpp | 4 +- src/openrct2/actions/PeepPickupAction.cpp | 28 +- src/openrct2/actions/PlayerKickAction.cpp | 4 +- src/openrct2/actions/PlayerSetGroupAction.cpp | 4 +- src/openrct2/cmdline/RootCommands.cpp | 2 +- src/openrct2/core/DataSerialiserTraits.h | 4 +- src/openrct2/entity/Guest.cpp | 22 +- src/openrct2/entity/MoneyEffect.cpp | 2 +- src/openrct2/interface/Chat.cpp | 8 +- src/openrct2/interface/InteractiveConsole.cpp | 22 +- src/openrct2/network/DiscordService.cpp | 8 +- src/openrct2/network/NetworkBase.cpp | 474 +++++++++--------- src/openrct2/network/NetworkBase.h | 58 +-- .../network/NetworkServerAdvertiser.cpp | 4 +- src/openrct2/network/ServerList.cpp | 6 +- src/openrct2/network/network.h | 138 ++--- src/openrct2/park/ParkFile.cpp | 2 +- src/openrct2/ride/RideConstruction.cpp | 2 +- src/openrct2/scenario/Scenario.cpp | 2 +- src/openrct2/scripting/ScriptEngine.cpp | 12 +- .../scripting/bindings/network/ScNetwork.cpp | 42 +- .../scripting/bindings/network/ScPlayer.cpp | 24 +- .../bindings/network/ScPlayerGroup.cpp | 12 +- src/openrct2/world/Map.cpp | 4 +- src/openrct2/world/Scenery.cpp | 2 +- 46 files changed, 611 insertions(+), 609 deletions(-) diff --git a/src/openrct2-ui/input/Shortcuts.cpp b/src/openrct2-ui/input/Shortcuts.cpp index 6cf37487e2..b678c36b15 100644 --- a/src/openrct2-ui/input/Shortcuts.cpp +++ b/src/openrct2-ui/input/Shortcuts.cpp @@ -363,7 +363,7 @@ static void ShortcutReduceGameSpeed() if (gScreenFlags & SCREEN_FLAGS_TITLE_DEMO) return; - if (network_get_mode() == NETWORK_MODE_NONE) + if (NetworkGetMode() == NETWORK_MODE_NONE) GameReduceGameSpeed(); } @@ -372,7 +372,7 @@ static void ShortcutIncreaseGameSpeed() if (gScreenFlags & SCREEN_FLAGS_TITLE_DEMO) return; - if (network_get_mode() == NETWORK_MODE_NONE) + if (NetworkGetMode() == NETWORK_MODE_NONE) GameIncreaseGameSpeed(); } @@ -826,7 +826,7 @@ void ShortcutManager::RegisterDefaultShortcuts() RegisterShortcut(ShortcutId::InterfaceOpenStaff, STR_SHORTCUT_SHOW_STAFF_LIST, "S", []() { ShortcutShowStaffList(); }); RegisterShortcut(ShortcutId::InterfaceOpenMessages, STR_SHORTCUT_SHOW_RECENT_MESSAGES, "M", []() { ShortcutShowRecentMessages(); }); RegisterShortcut(ShortcutId::MultiplayerShow, STR_SHORTCUT_SHOW_MULTIPLAYER, []() { - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { OpenWindow(WindowClass::Multiplayer); } diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index f8b386c844..50fda4bd84 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -621,7 +621,7 @@ private: CoordsXYZ nullLoc{}; nullLoc.SetNull(); PeepPickupAction pickupAction{ PeepPickupType::Pickup, EntityId::FromUnderlying(number), nullLoc, - network_get_current_player_id() }; + NetworkGetCurrentPlayerId() }; pickupAction.SetCallback([peepnum = number](const GameAction* ga, const GameActions::Result* result) { if (result->Error != GameActions::Status::Ok) return; @@ -874,7 +874,7 @@ private: _beingWatchedTimer++; // Disable peep watching thought for multiplayer as it's client specific - if (network_get_mode() == NETWORK_MODE_NONE) + if (NetworkGetMode() == NETWORK_MODE_NONE) { // Create the "I have the strangest feeling I am being watched thought" if (_beingWatchedTimer >= 3840) @@ -961,7 +961,7 @@ private: PeepPickupAction pickupAction{ PeepPickupType::Place, EntityId::FromUnderlying(number), { destCoords, tileElement->GetBaseZ() }, - network_get_current_player_id() }; + NetworkGetCurrentPlayerId() }; pickupAction.SetCallback([](const GameAction* ga, const GameActions::Result* result) { if (result->Error != GameActions::Status::Ok) return; @@ -977,7 +977,7 @@ private: return; PeepPickupAction pickupAction{ - PeepPickupType::Cancel, EntityId::FromUnderlying(number), { _pickedPeepX, 0, 0 }, network_get_current_player_id() + PeepPickupType::Cancel, EntityId::FromUnderlying(number), { _pickedPeepX, 0, 0 }, NetworkGetCurrentPlayerId() }; GameActions::Execute(&pickupAction); } diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index 1ab0f5d72b..21d424df4b 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -285,24 +285,24 @@ static void WindowMultiplayerGroupsShowGroupDropdown(rct_window* w, Widget* widg dropdownWidget = widget - 1; - numItems = network_get_num_groups(); + numItems = NetworkGetNumGroups(); WindowDropdownShowTextCustomWidth( { w->windowPos.x + dropdownWidget->left, w->windowPos.y + dropdownWidget->top }, dropdownWidget->height() + 1, w->colours[1], 0, 0, numItems, widget->right - dropdownWidget->left); - for (i = 0; i < network_get_num_groups(); i++) + for (i = 0; i < NetworkGetNumGroups(); i++) { gDropdownItems[i].Format = STR_OPTIONS_DROPDOWN_ITEM; - gDropdownItems[i].Args = reinterpret_cast(network_get_group_name(i)); + gDropdownItems[i].Args = reinterpret_cast(NetworkGetGroupName(i)); } if (widget == &window_multiplayer_groups_widgets[WIDX_DEFAULT_GROUP_DROPDOWN]) { - Dropdown::SetChecked(network_get_group_index(network_get_default_group()), true); + Dropdown::SetChecked(NetworkGetGroupIndex(NetworkGetDefaultGroup()), true); } else if (widget == &window_multiplayer_groups_widgets[WIDX_SELECTED_GROUP_DROPDOWN]) { - Dropdown::SetChecked(network_get_group_index(_selectedGroup), true); + Dropdown::SetChecked(NetworkGetGroupIndex(_selectedGroup), true); } } @@ -343,13 +343,13 @@ static ScreenCoordsXY WindowMultiplayerInformationGetSize() // Server name is displayed word-wrapped, so figure out how high it will be. { - u8string buffer = network_get_server_name(); + u8string buffer = NetworkGetServerName(); GfxWrapString(buffer.data(), width, FontStyle::Medium, &numLines); height += ++numLines * lineHeight + (LIST_ROW_HEIGHT / 2); } // Likewise, for the optional server description -- which can be a little longer. - const auto& descString = network_get_server_description(); + const auto& descString = NetworkGetServerDescription(); if (!descString.empty()) { u8string buffer = descString; @@ -359,15 +359,15 @@ static ScreenCoordsXY WindowMultiplayerInformationGetSize() // Finally, account for provider info, if present. { - const auto& providerName = network_get_server_provider_name(); + const auto& providerName = NetworkGetServerProviderName(); if (!providerName.empty()) height += LIST_ROW_HEIGHT; - const auto& providerEmail = network_get_server_provider_email(); + const auto& providerEmail = NetworkGetServerProviderEmail(); if (!providerEmail.empty()) height += LIST_ROW_HEIGHT; - const auto& providerWebsite = network_get_server_provider_website(); + const auto& providerWebsite = NetworkGetServerProviderWebsite(); if (!providerWebsite.empty()) height += LIST_ROW_HEIGHT; } @@ -409,7 +409,7 @@ static void WindowMultiplayerInformationPaint(rct_window* w, rct_drawpixelinfo* auto screenCoords = ScreenCoordsXY{ 3, 50 }; int32_t width = w->width - 6; - const auto& name = network_get_server_name(); + const auto& name = NetworkGetServerName(); { auto ft = Formatter(); ft.Add(name.c_str()); @@ -417,7 +417,7 @@ static void WindowMultiplayerInformationPaint(rct_window* w, rct_drawpixelinfo* screenCoords.y += LIST_ROW_HEIGHT / 2; } - const auto& description = network_get_server_description(); + const auto& description = NetworkGetServerDescription(); if (!description.empty()) { auto ft = Formatter(); @@ -426,7 +426,7 @@ static void WindowMultiplayerInformationPaint(rct_window* w, rct_drawpixelinfo* screenCoords.y += LIST_ROW_HEIGHT / 2; } - const auto& providerName = network_get_server_provider_name(); + const auto& providerName = NetworkGetServerProviderName(); if (!providerName.empty()) { auto ft = Formatter(); @@ -435,7 +435,7 @@ static void WindowMultiplayerInformationPaint(rct_window* w, rct_drawpixelinfo* screenCoords.y += LIST_ROW_HEIGHT; } - const auto& providerEmail = network_get_server_provider_email(); + const auto& providerEmail = NetworkGetServerProviderEmail(); if (!providerEmail.empty()) { auto ft = Formatter(); @@ -444,7 +444,7 @@ static void WindowMultiplayerInformationPaint(rct_window* w, rct_drawpixelinfo* screenCoords.y += LIST_ROW_HEIGHT; } - const auto& providerWebsite = network_get_server_provider_website(); + const auto& providerWebsite = NetworkGetServerProviderWebsite(); if (!providerWebsite.empty()) { auto ft = Formatter(); @@ -460,7 +460,7 @@ static void WindowMultiplayerInformationPaint(rct_window* w, rct_drawpixelinfo* static bool IsServerPlayerInvisible() { - return network_is_server_player_invisible() && !gConfigGeneral.DebuggingTools; + return NetworkIsServerPlayerInvisible() && !gConfigGeneral.DebuggingTools; } static void WindowMultiplayerPlayersMouseup(rct_window* w, WidgetIndex widgetIndex) @@ -486,7 +486,7 @@ static void WindowMultiplayerPlayersResize(rct_window* w) { WindowSetResize(*w, 420, 124, 500, 450); - w->no_list_items = (IsServerPlayerInvisible() ? network_get_num_visible_players() : network_get_num_players()); + w->no_list_items = (IsServerPlayerInvisible() ? NetworkGetNumVisiblePlayers() : NetworkGetNumPlayers()); w->list_item_positions[0] = 0; w->widgets[WIDX_HEADER_PING].right = w->width - 5; @@ -511,7 +511,7 @@ static void WindowMultiplayerPlayersScrollgetsize(rct_window* w, int32_t scrollI w->Invalidate(); } - *height = network_get_num_players() * SCROLLABLE_ROW_HEIGHT; + *height = NetworkGetNumPlayers() * SCROLLABLE_ROW_HEIGHT; i = *height - window_multiplayer_players_widgets[WIDX_LIST].bottom + window_multiplayer_players_widgets[WIDX_LIST].top + 21; if (i < 0) i = 0; @@ -534,7 +534,7 @@ static void WindowMultiplayerPlayersScrollmousedown(rct_window* w, int32_t scrol w->Invalidate(); int32_t player = (IsServerPlayerInvisible() ? index + 1 : index); - WindowPlayerOpen(network_get_player_id(player)); + WindowPlayerOpen(NetworkGetPlayerID(player)); } static void WindowMultiplayerPlayersScrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords) @@ -581,7 +581,7 @@ static void WindowMultiplayerPlayersScrollpaint(rct_window* w, rct_drawpixelinfo const int32_t firstPlayerInList = (IsServerPlayerInvisible() ? 1 : 0); int32_t listPosition = 0; - for (int32_t player = firstPlayerInList; player < network_get_num_players(); player++) + for (int32_t player = firstPlayerInList; player < NetworkGetNumPlayers(); player++) { if (screenCoords.y > dpi->y + dpi->height) { @@ -601,12 +601,12 @@ static void WindowMultiplayerPlayersScrollpaint(rct_window* w, rct_drawpixelinfo GfxFilterRect( dpi, { 0, screenCoords.y, 800, screenCoords.y + SCROLLABLE_ROW_HEIGHT - 1 }, FilterPaletteID::PaletteDarken1); - _buffer += network_get_player_name(player); + _buffer += NetworkGetPlayerName(player); colour = w->colours[2]; } else { - if (network_get_player_flags(player) & NETWORK_PLAYER_FLAG_ISSERVER) + if (NetworkGetPlayerFlags(player) & NETWORK_PLAYER_FLAG_ISSERVER) { _buffer += "{BABYBLUE}"; } @@ -614,7 +614,7 @@ static void WindowMultiplayerPlayersScrollpaint(rct_window* w, rct_drawpixelinfo { _buffer += "{BLACK}"; } - _buffer += network_get_player_name(player); + _buffer += NetworkGetPlayerName(player); } screenCoords.x = 0; GfxClipString(_buffer.data(), 230, FontStyle::Medium); @@ -622,22 +622,22 @@ static void WindowMultiplayerPlayersScrollpaint(rct_window* w, rct_drawpixelinfo // Draw group name _buffer.resize(0); - int32_t group = network_get_group_index(network_get_player_group(player)); + int32_t group = NetworkGetGroupIndex(NetworkGetPlayerGroup(player)); if (group != -1) { _buffer += "{BLACK}"; screenCoords.x = 173; - _buffer += network_get_group_name(group); + _buffer += NetworkGetGroupName(group); GfxClipString(_buffer.data(), 80, FontStyle::Medium); GfxDrawString(dpi, screenCoords, _buffer.c_str(), { colour }); } // Draw last action - int32_t action = network_get_player_last_action(player, 2000); + int32_t action = NetworkGetPlayerLastAction(player, 2000); auto ft = Formatter(); if (action != -999) { - ft.Add(network_get_action_name_string_id(action)); + ft.Add(NetworkGetActionNameStringID(action)); } else { @@ -647,7 +647,7 @@ static void WindowMultiplayerPlayersScrollpaint(rct_window* w, rct_drawpixelinfo // Draw ping _buffer.resize(0); - int32_t ping = network_get_player_ping(player); + int32_t ping = NetworkGetPlayerPing(player); if (ping <= 100) { _buffer += "{GREEN}"; @@ -706,8 +706,8 @@ static void WindowMultiplayerGroupsMouseup(rct_window* w, WidgetIndex widgetInde } break; case WIDX_RENAME_GROUP:; - int32_t groupIndex = network_get_group_index(_selectedGroup); - const utf8* groupName = network_get_group_name(groupIndex); + int32_t groupIndex = NetworkGetGroupIndex(_selectedGroup); + const utf8* groupName = NetworkGetGroupName(groupIndex); WindowTextInputRawOpen(w, widgetIndex, STR_GROUP_NAME, STR_ENTER_NEW_NAME_FOR_THIS_GROUP, {}, groupName, 32); break; } @@ -717,7 +717,7 @@ static void WindowMultiplayerGroupsResize(rct_window* w) { WindowSetResize(*w, 320, 200, 320, 500); - w->no_list_items = network_get_num_actions(); + w->no_list_items = NetworkGetNumActions(); w->list_item_positions[0] = 0; w->selected_list_item = -1; @@ -748,13 +748,12 @@ static void WindowMultiplayerGroupsDropdown(rct_window* w, WidgetIndex widgetInd { case WIDX_DEFAULT_GROUP_DROPDOWN: { - auto networkModifyGroup = NetworkModifyGroupAction( - ModifyGroupType::SetDefault, network_get_group_id(dropdownIndex)); + auto networkModifyGroup = NetworkModifyGroupAction(ModifyGroupType::SetDefault, NetworkGetGroupID(dropdownIndex)); GameActions::Execute(&networkModifyGroup); } break; case WIDX_SELECTED_GROUP_DROPDOWN: - _selectedGroup = network_get_group_id(dropdownIndex); + _selectedGroup = NetworkGetGroupID(dropdownIndex); break; } @@ -777,7 +776,7 @@ static void WindowMultiplayerGroupsScrollgetsize(rct_window* w, int32_t scrollIn w->Invalidate(); } - *height = network_get_num_actions() * SCROLLABLE_ROW_HEIGHT; + *height = NetworkGetNumActions() * SCROLLABLE_ROW_HEIGHT; i = *height - window_multiplayer_groups_widgets[WIDX_LIST].bottom + window_multiplayer_groups_widgets[WIDX_LIST].top + 21; if (i < 0) i = 0; @@ -837,7 +836,7 @@ static void WindowMultiplayerGroupsInvalidate(rct_window* w) WindowAlignTabs(w, WIDX_TAB1, WIDX_TAB4); // select other group if one is removed - while (network_get_group_index(_selectedGroup) == -1 && _selectedGroup > 0) + while (NetworkGetGroupIndex(_selectedGroup) == -1 && _selectedGroup > 0) { _selectedGroup--; } @@ -851,11 +850,11 @@ static void WindowMultiplayerGroupsPaint(rct_window* w, rct_drawpixelinfo* dpi) WindowMultiplayerDrawTabImages(w, dpi); Widget* widget = &window_multiplayer_groups_widgets[WIDX_DEFAULT_GROUP]; - int32_t group = network_get_group_index(network_get_default_group()); + int32_t group = NetworkGetGroupIndex(NetworkGetDefaultGroup()); if (group != -1) { _buffer.assign("{WINDOW_COLOUR_2}"); - _buffer += network_get_group_name(group); + _buffer += NetworkGetGroupName(group); auto ft = Formatter(); ft.Add(_buffer.c_str()); @@ -877,11 +876,11 @@ static void WindowMultiplayerGroupsPaint(rct_window* w, rct_drawpixelinfo* dpi) INSET_RECT_FLAG_BORDER_INSET); widget = &window_multiplayer_groups_widgets[WIDX_SELECTED_GROUP]; - group = network_get_group_index(_selectedGroup); + group = NetworkGetGroupIndex(_selectedGroup); if (group != -1) { _buffer.assign("{WINDOW_COLOUR_2}"); - _buffer += network_get_group_name(group); + _buffer += NetworkGetGroupName(group); auto ft = Formatter(); ft.Add(_buffer.c_str()); DrawTextEllipsised( @@ -898,7 +897,7 @@ static void WindowMultiplayerGroupsScrollpaint(rct_window* w, rct_drawpixelinfo* GfxFillRect( dpi, { dpiCoords, dpiCoords + ScreenCoordsXY{ dpi->width - 1, dpi->height - 1 } }, ColourMapA[w->colours[1]].mid_light); - for (int32_t i = 0; i < network_get_num_actions(); i++) + for (int32_t i = 0; i < NetworkGetNumActions(); i++) { if (i == w->selected_list_item) { @@ -912,10 +911,10 @@ static void WindowMultiplayerGroupsScrollpaint(rct_window* w, rct_drawpixelinfo* if (screenCoords.y + SCROLLABLE_ROW_HEIGHT + 1 >= dpi->y) { - int32_t groupindex = network_get_group_index(_selectedGroup); + int32_t groupindex = NetworkGetGroupIndex(_selectedGroup); if (groupindex != -1) { - if (network_can_perform_action(groupindex, static_cast(i))) + if (NetworkCanPerformAction(groupindex, static_cast(i))) { screenCoords.x = 0; GfxDrawString(dpi, screenCoords, u8"{WINDOW_COLOUR_2}✓", {}); @@ -924,7 +923,7 @@ static void WindowMultiplayerGroupsScrollpaint(rct_window* w, rct_drawpixelinfo* // Draw action name auto ft = Formatter(); - ft.Add(network_get_action_name_string_id(i)); + ft.Add(NetworkGetActionNameStringID(i)); DrawTextBasic(dpi, { 10, screenCoords.y }, STR_WINDOW_COLOUR_2_STRINGID, ft); } screenCoords.y += SCROLLABLE_ROW_HEIGHT; @@ -983,7 +982,7 @@ static void WindowMultiplayerOptionsInvalidate(rct_window* w) WindowMultiplayerAnchorBorderWidgets(w); WindowAlignTabs(w, WIDX_TAB1, WIDX_TAB4); - if (network_get_mode() == NETWORK_MODE_CLIENT) + if (NetworkGetMode() == NETWORK_MODE_CLIENT) { w->widgets[WIDX_KNOWN_KEYS_ONLY_CHECKBOX].type = WindowWidgetType::Empty; } diff --git a/src/openrct2-ui/windows/NetworkStatus.cpp b/src/openrct2-ui/windows/NetworkStatus.cpp index c55e6e8103..8c5dfb0a9c 100644 --- a/src/openrct2-ui/windows/NetworkStatus.cpp +++ b/src/openrct2-ui/windows/NetworkStatus.cpp @@ -84,11 +84,11 @@ public: } if (text.empty()) { - network_shutdown_client(); + NetworkShutdownClient(); } else { - network_send_password(_password); + NetworkSendPassword(_password); } } diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index 301e32cfff..235be64480 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -1693,7 +1693,7 @@ private: gConfigGeneral.AllowEarlyCompletion ^= 1; // Only the server can control this setting and needs to send the // current value of allow_early_completion to all clients - if (network_get_mode() == NETWORK_MODE_SERVER) + if (NetworkGetMode() == NETWORK_MODE_SERVER) { auto setAllowEarlyCompletionAction = ScenarioSetSettingAction( ScenarioSetSetting::AllowEarlyCompletion, gConfigGeneral.AllowEarlyCompletion); @@ -1823,14 +1823,14 @@ private: // The real name setting of clients is fixed to that of the server // and the server cannot change the setting during gameplay to prevent desyncs - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { disabled_widgets |= (1uLL << WIDX_REAL_NAME_CHECKBOX); widgets[WIDX_REAL_NAME_CHECKBOX].tooltip = STR_OPTION_DISABLED_DURING_NETWORK_PLAY; // Disable the use of the allow_early_completion option during network play on clients. // This is to prevent confusion on clients because changing this setting during network play wouldn't change // the way scenarios are completed during this network-session - if (network_get_mode() == NETWORK_MODE_CLIENT) + if (NetworkGetMode() == NETWORK_MODE_CLIENT) { disabled_widgets |= (1uLL << WIDX_ALLOW_EARLY_COMPLETION); widgets[WIDX_ALLOW_EARLY_COMPLETION].tooltip = STR_OPTION_DISABLED_DURING_NETWORK_PLAY; diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp index 8f591efa11..4e9dc4ac2f 100644 --- a/src/openrct2-ui/windows/Player.cpp +++ b/src/openrct2-ui/windows/Player.cpp @@ -173,7 +173,7 @@ static void WindowPlayerOverviewShowGroupDropdown(rct_window* w, Widget* widget) { Widget* dropdownWidget; int32_t numItems, i; - int32_t player = network_get_player_index(static_cast(w->number)); + int32_t player = NetworkGetPlayerIndex(static_cast(w->number)); if (player == -1) { return; @@ -181,19 +181,19 @@ static void WindowPlayerOverviewShowGroupDropdown(rct_window* w, Widget* widget) dropdownWidget = widget - 1; - numItems = network_get_num_groups(); + numItems = NetworkGetNumGroups(); WindowDropdownShowTextCustomWidth( { w->windowPos.x + dropdownWidget->left, w->windowPos.y + dropdownWidget->top }, dropdownWidget->height() + 1, w->colours[1], 0, 0, numItems, widget->right - dropdownWidget->left); - for (i = 0; i < network_get_num_groups(); i++) + for (i = 0; i < NetworkGetNumGroups(); i++) { gDropdownItems[i].Format = STR_OPTIONS_DROPDOWN_ITEM; - gDropdownItems[i].Args = reinterpret_cast(network_get_group_name(i)); + gDropdownItems[i].Args = reinterpret_cast(NetworkGetGroupName(i)); } - Dropdown::SetChecked(network_get_group_index(network_get_player_group(player)), true); + Dropdown::SetChecked(NetworkGetGroupIndex(NetworkGetPlayerGroup(player)), true); } void WindowPlayerOverviewClose(rct_window* w) @@ -216,12 +216,12 @@ void WindowPlayerOverviewMouseUp(rct_window* w, WidgetIndex widgetIndex) rct_window* mainWindow = WindowGetMain(); if (mainWindow != nullptr) { - int32_t player = network_get_player_index(static_cast(w->number)); + int32_t player = NetworkGetPlayerIndex(static_cast(w->number)); if (player == -1) { return; } - auto coord = network_get_player_last_action_coord(player); + auto coord = NetworkGetPlayerLastActionCoord(player); if (coord.x || coord.y || coord.z) { WindowScrollToLocation(*mainWindow, coord); @@ -251,7 +251,7 @@ void WindowPlayerOverviewMouseDown(rct_window* w, WidgetIndex widgetIndex, Widge void WindowPlayerOverviewDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex) { const auto playerId = static_cast(w->number); - const auto playerIdx = network_get_player_index(playerId); + const auto playerIdx = NetworkGetPlayerIndex(playerId); if (playerIdx == -1) { return; @@ -260,7 +260,7 @@ void WindowPlayerOverviewDropdown(rct_window* w, WidgetIndex widgetIndex, int32_ { return; } - const auto groupId = network_get_group_id(dropdownIndex); + const auto groupId = NetworkGetGroupID(dropdownIndex); const auto windowHandle = std::make_pair(w->classification, w->number); auto playerSetGroupAction = PlayerSetGroupAction(playerId, groupId); playerSetGroupAction.SetCallback([windowHandle](const GameAction* ga, const GameActions::Result* result) { @@ -282,7 +282,7 @@ void WindowPlayerOverviewUpdate(rct_window* w) w->frame_no++; WidgetInvalidate(*w, WIDX_TAB_1 + w->page); - if (network_get_player_index(static_cast(w->number)) == -1) + if (NetworkGetPlayerIndex(static_cast(w->number)) == -1) { WindowClose(*w); return; @@ -305,21 +305,21 @@ void WindowPlayerOverviewPaint(rct_window* w, rct_drawpixelinfo* dpi) WindowDrawWidgets(*w, dpi); WindowPlayerDrawTabImages(dpi, w); - int32_t player = network_get_player_index(static_cast(w->number)); + int32_t player = NetworkGetPlayerIndex(static_cast(w->number)); if (player == -1) { return; } // Draw current group - int32_t groupindex = network_get_group_index(network_get_player_group(player)); + int32_t groupindex = NetworkGetGroupIndex(NetworkGetPlayerGroup(player)); if (groupindex != -1) { Widget* widget = &window_player_overview_widgets[WIDX_GROUP]; thread_local std::string _buffer; _buffer.assign("{WINDOW_COLOUR_2}"); - _buffer += network_get_group_name(groupindex); + _buffer += NetworkGetGroupName(groupindex); auto ft = Formatter(); ft.Add(_buffer.c_str()); @@ -335,17 +335,17 @@ void WindowPlayerOverviewPaint(rct_window* w, rct_drawpixelinfo* dpi) ft.Add(STR_PING); DrawTextBasic(dpi, screenCoords, STR_WINDOW_COLOUR_2_STRINGID, ft); char ping[64]; - snprintf(ping, 64, "%d ms", network_get_player_ping(player)); + snprintf(ping, 64, "%d ms", NetworkGetPlayerPing(player)); GfxDrawString(dpi, screenCoords + ScreenCoordsXY(30, 0), ping, { w->colours[2] }); // Draw last action screenCoords = w->windowPos + ScreenCoordsXY{ w->width / 2, w->height - 13 }; int32_t width = w->width - 8; - int32_t lastaction = network_get_player_last_action(player, 0); + int32_t lastaction = NetworkGetPlayerLastAction(player, 0); ft = Formatter(); if (lastaction != -999) { - ft.Add(network_get_action_name_string_id(lastaction)); + ft.Add(NetworkGetActionNameStringID(lastaction)); } else { @@ -361,7 +361,7 @@ void WindowPlayerOverviewPaint(rct_window* w, rct_drawpixelinfo* dpi) void WindowPlayerOverviewInvalidate(rct_window* w) { - int32_t playerIndex = network_get_player_index(static_cast(w->number)); + int32_t playerIndex = NetworkGetPlayerIndex(static_cast(w->number)); if (playerIndex == -1) { return; @@ -408,9 +408,9 @@ void WindowPlayerOverviewInvalidate(rct_window* w) } // Only enable kick button for other players - const bool canKick = network_can_perform_action(network_get_current_player_group_index(), NetworkPermission::KickPlayer); - const bool isServer = network_get_player_flags(playerIndex) & NETWORK_PLAYER_FLAG_ISSERVER; - const bool isOwnWindow = (network_get_current_player_id() == w->number); + const bool canKick = NetworkCanPerformAction(NetworkGetCurrentPlayerGroupIndex(), NetworkPermission::KickPlayer); + const bool isServer = NetworkGetPlayerFlags(playerIndex) & NETWORK_PLAYER_FLAG_ISSERVER; + const bool isOwnWindow = (NetworkGetCurrentPlayerId() == w->number); WidgetSetEnabled(*w, WIDX_KICK, canKick && !isOwnWindow && !isServer); } @@ -446,7 +446,7 @@ void WindowPlayerStatisticsUpdate(rct_window* w) w->frame_no++; WidgetInvalidate(*w, WIDX_TAB_1 + w->page); - if (network_get_player_index(static_cast(w->number)) == -1) + if (NetworkGetPlayerIndex(static_cast(w->number)) == -1) { WindowClose(*w); } @@ -476,7 +476,7 @@ void WindowPlayerStatisticsPaint(rct_window* w, rct_drawpixelinfo* dpi) WindowDrawWidgets(*w, dpi); WindowPlayerDrawTabImages(dpi, w); - int32_t player = network_get_player_index(static_cast(w->number)); + int32_t player = NetworkGetPlayerIndex(static_cast(w->number)); if (player == -1) { return; @@ -487,13 +487,13 @@ void WindowPlayerStatisticsPaint(rct_window* w, rct_drawpixelinfo* dpi) window_player_overview_widgets[WIDX_PAGE_BACKGROUND].top + 4 }; auto ft = Formatter(); - ft.Add(network_get_player_commands_ran(player)); + ft.Add(NetworkGetPlayerCommandsRan(player)); DrawTextBasic(dpi, screenCoords, STR_COMMANDS_RAN, ft); screenCoords.y += LIST_ROW_HEIGHT; ft = Formatter(); - ft.Add(network_get_player_money_spent(player)); + ft.Add(NetworkGetPlayerMoneySpent(player)); DrawTextBasic(dpi, screenCoords, STR_MONEY_SPENT, ft); } @@ -568,7 +568,7 @@ static void WindowPlayerDrawTabImages(rct_drawpixelinfo* dpi, rct_window* w) static void WindowPlayerUpdateViewport(rct_window* w, bool scroll) { - int32_t playerIndex = network_get_player_index(static_cast(w->number)); + int32_t playerIndex = NetworkGetPlayerIndex(static_cast(w->number)); if (playerIndex == -1) { return; @@ -577,7 +577,7 @@ static void WindowPlayerUpdateViewport(rct_window* w, bool scroll) rct_viewport* viewport = w->viewport; if (viewport != nullptr) { - auto coord = network_get_player_last_action_coord(playerIndex); + auto coord = NetworkGetPlayerLastActionCoord(playerIndex); if (coord.x != 0 || coord.y != 0 || coord.z != 0) { auto centreLoc = centre_2d_coordinates(coord, viewport); @@ -616,10 +616,10 @@ static void WindowPlayerUpdateViewport(rct_window* w, bool scroll) static void WindowPlayerUpdateTitle(rct_window* w) { auto ft = Formatter::Common(); - int32_t player = network_get_player_index(static_cast(w->number)); + int32_t player = NetworkGetPlayerIndex(static_cast(w->number)); if (player != -1) { - ft.Add(network_get_player_name(player)); // set title caption to player name + ft.Add(NetworkGetPlayerName(player)); // set title caption to player name } else { diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index d3414d0896..9f76c9dd0a 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -4073,7 +4073,7 @@ static void WindowRideMaintenanceInvalidate(rct_window* w) WindowRideAnchorBorderWidgets(w); WindowAlignTabs(w, WIDX_TAB_1, WIDX_TAB_10); - if (gConfigGeneral.DebuggingTools && network_get_mode() == NETWORK_MODE_NONE) + if (gConfigGeneral.DebuggingTools && NetworkGetMode() == NETWORK_MODE_NONE) { window_ride_maintenance_widgets[WIDX_FORCE_BREAKDOWN].type = WindowWidgetType::FlatBtn; } diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 08b136d078..dc32e5f1b4 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -2267,7 +2267,7 @@ private: } OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::PlaceItem, trackPos); - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { _currentTrackSelectionFlags |= TRACK_SELECTION_FLAG_TRACK_PLACE_ACTION_QUEUED; } @@ -4596,7 +4596,7 @@ static void WindowRideConstructionMouseUpDemolishNextPiece(const CoordsXYZD& pie type = TrackElemType::BeginStation; } } - if (network_get_mode() == NETWORK_MODE_CLIENT) + if (NetworkGetMode() == NETWORK_MODE_CLIENT) { // rideConstructionState needs to be set again to the proper value, this only affects the client _rideConstructionState = RideConstructionState::Selected; diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index 891876d7fd..440c143cfb 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -246,7 +246,7 @@ public: OpenAllRides(); break; case WIDX_QUICK_DEMOLISH: - if (network_get_mode() != NETWORK_MODE_CLIENT) + if (NetworkGetMode() != NETWORK_MODE_CLIENT) { _quickDemolishMode = !_quickDemolishMode; } @@ -402,7 +402,7 @@ public: // Open ride window const auto rideIndex = _rideList[index]; - if (_quickDemolishMode && network_get_mode() != NETWORK_MODE_CLIENT) + if (_quickDemolishMode && NetworkGetMode() != NETWORK_MODE_CLIENT) { auto gameAction = RideDemolishAction(rideIndex, RIDE_MODIFY_DEMOLISH); GameActions::Execute(&gameAction); @@ -499,8 +499,8 @@ public: widgets[WIDX_QUICK_DEMOLISH].top = widgets[WIDX_OPEN_CLOSE_ALL].bottom + 3; } widgets[WIDX_QUICK_DEMOLISH].bottom = widgets[WIDX_QUICK_DEMOLISH].top + 23; - widgets[WIDX_QUICK_DEMOLISH].type = network_get_mode() != NETWORK_MODE_CLIENT ? WindowWidgetType::FlatBtn - : WindowWidgetType::Empty; + widgets[WIDX_QUICK_DEMOLISH].type = NetworkGetMode() != NETWORK_MODE_CLIENT ? WindowWidgetType::FlatBtn + : WindowWidgetType::Empty; } /** diff --git a/src/openrct2-ui/windows/SavePrompt.cpp b/src/openrct2-ui/windows/SavePrompt.cpp index 652cd7d698..f417ec3468 100644 --- a/src/openrct2-ui/windows/SavePrompt.cpp +++ b/src/openrct2-ui/windows/SavePrompt.cpp @@ -100,7 +100,7 @@ public: InitScrollWidgets(); // Pause the game if not network play. - if (network_get_mode() == NETWORK_MODE_NONE) + if (NetworkGetMode() == NETWORK_MODE_NONE) { gGamePaused |= GAME_PAUSED_MODAL; OpenRCT2::Audio::StopAll(); @@ -124,7 +124,7 @@ public: void OnClose() override { // Unpause the game - if (network_get_mode() == NETWORK_MODE_NONE) + if (NetworkGetMode() == NETWORK_MODE_NONE) { gGamePaused &= ~GAME_PAUSED_MODAL; OpenRCT2::Audio::Resume(); @@ -210,7 +210,7 @@ rct_window* WindowSavePromptOpen() * and game_load_or_quit() are not called by the original binary anymore. */ - if (gScreenAge < 3840 && network_get_mode() == NETWORK_MODE_NONE) + if (gScreenAge < 3840 && NetworkGetMode() == NETWORK_MODE_NONE) { GameLoadOrQuitNoSavePrompt(); return nullptr; diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 0841ec5dc1..ec9f5d7c68 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -211,8 +211,8 @@ public: if (gWindowSceneryScatterEnabled) WindowCloseByClass(WindowClass::SceneryScatter); else if ( - network_get_mode() != NETWORK_MODE_CLIENT - || network_can_perform_command(network_get_current_player_group_index(), -2)) + NetworkGetMode() != NETWORK_MODE_CLIENT + || NetworkCanPerformCommand(NetworkGetCurrentPlayerGroupIndex(), -2)) { WindowSceneryScatterOpen(); } diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp index 9df2d13e29..702ef33fd0 100644 --- a/src/openrct2-ui/windows/ServerList.cpp +++ b/src/openrct2-ui/windows/ServerList.cpp @@ -382,7 +382,7 @@ static void WindowServerListPaint(rct_window* w, rct_drawpixelinfo* dpi) dpi, w->windowPos + ScreenCoordsXY{ 6, w->widgets[WIDX_PLAYER_NAME_INPUT].top }, STR_PLAYER_NAME, {}, { COLOUR_WHITE }); // Draw version number - std::string version = network_get_version(); + std::string version = NetworkGetVersion(); auto ft = Formatter(); ft.Add(version.c_str()); DrawTextBasic( @@ -467,7 +467,7 @@ static void WindowServerListScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, i else { // Server online... check version - bool correctVersion = serverDetails.Version == network_get_version(); + bool correctVersion = serverDetails.Version == NetworkGetVersion(); compatibilitySpriteId = correctVersion ? SPR_G2_RCT1_OPEN_BUTTON_2 : SPR_G2_RCT1_CLOSE_BUTTON_2; } GfxDrawSprite(dpi, ImageId(compatibilitySpriteId), { right, screenCoords.y + 1 }); @@ -514,7 +514,7 @@ static void JoinServer(std::string address) address = address.substr(beginBracketIndex + 1, endBracketIndex - beginBracketIndex - 1); } - if (!network_begin_client(address, port)) + if (!NetworkBeginClient(address, port)) { ContextShowError(STR_UNABLE_TO_CONNECT_TO_SERVER, STR_NONE, {}); } diff --git a/src/openrct2-ui/windows/ServerStart.cpp b/src/openrct2-ui/windows/ServerStart.cpp index 25b3c07622..8bafbd0116 100644 --- a/src/openrct2-ui/windows/ServerStart.cpp +++ b/src/openrct2-ui/windows/ServerStart.cpp @@ -133,11 +133,11 @@ public: Invalidate(); break; case WIDX_START_SERVER: - network_set_password(_password); + NetworkSetPassword(_password); WindowScenarioselectOpen(ScenarioSelectCallback, false); break; case WIDX_LOAD_SERVER: - network_set_password(_password); + NetworkSetPassword(_password); auto intent = Intent(WindowClass::Loadsave); intent.PutExtra(INTENT_EXTRA_LOADSAVE_TYPE, LOADSAVETYPE_LOAD | LOADSAVETYPE_GAME); intent.PutExtra(INTENT_EXTRA_CALLBACK, reinterpret_cast(LoadSaveCallback)); @@ -284,7 +284,7 @@ private: GameNotifyMapChange(); if (GetContext()->LoadParkFromFile(path, false, true)) { - network_begin_server(gConfigNetwork.DefaultPort, gConfigNetwork.ListenAddress); + NetworkBeginServer(gConfigNetwork.DefaultPort, gConfigNetwork.ListenAddress); } } @@ -294,7 +294,7 @@ private: { GameNotifyMapChange(); GetContext()->LoadParkFromFile(path); - network_begin_server(gConfigNetwork.DefaultPort, gConfigNetwork.ListenAddress); + NetworkBeginServer(gConfigNetwork.DefaultPort, gConfigNetwork.ListenAddress); } } }; diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index a3c315b832..20671616d9 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -365,7 +365,7 @@ private: CoordsXYZ nullLoc{}; nullLoc.SetNull(); PeepPickupAction pickupAction{ PeepPickupType::Pickup, EntityId::FromUnderlying(number), nullLoc, - network_get_current_player_id() }; + NetworkGetCurrentPlayerId() }; pickupAction.SetCallback([peepnum = number](const GameAction* ga, const GameActions::Result* result) { if (result->Error != GameActions::Status::Ok) return; @@ -692,7 +692,7 @@ private: return; PeepPickupAction pickupAction{ - PeepPickupType::Place, staffEntityId, { destCoords, tileElement->GetBaseZ() }, network_get_current_player_id() + PeepPickupType::Place, staffEntityId, { destCoords, tileElement->GetBaseZ() }, NetworkGetCurrentPlayerId() }; pickupAction.SetCallback([](const GameAction* ga, const GameActions::Result* result) { if (result->Error != GameActions::Status::Ok) @@ -708,10 +708,9 @@ private: if (widgetIndex != WIDX_PICKUP) return; - PeepPickupAction pickupAction{ PeepPickupType::Cancel, - EntityId::FromUnderlying(number), - { picked_peep_old_x, 0, 0 }, - network_get_current_player_id() }; + PeepPickupAction pickupAction{ + PeepPickupType::Cancel, EntityId::FromUnderlying(number), { picked_peep_old_x, 0, 0 }, NetworkGetCurrentPlayerId() + }; GameActions::Execute(&pickupAction); } diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index f8dea9aa05..5195cca66f 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -358,7 +358,7 @@ static void WindowTopToolbarMouseup(rct_window* w, WidgetIndex widgetIndex) switch (widgetIndex) { case WIDX_PAUSE: - if (network_get_mode() != NETWORK_MODE_CLIENT) + if (NetworkGetMode() != NETWORK_MODE_CLIENT) { auto pauseToggleAction = PauseToggleAction(); GameActions::Execute(&pauseToggleAction); @@ -757,7 +757,7 @@ static void WindowTopToolbarInvalidate(rct_window* w) } } - switch (network_get_mode()) + switch (NetworkGetMode()) { case NETWORK_MODE_NONE: window_top_toolbar_widgets[WIDX_NETWORK].type = WindowWidgetType::Empty; @@ -988,12 +988,12 @@ static void WindowTopToolbarPaint(rct_window* w, rct_drawpixelinfo* dpi) screenPos.y++; // Draw (de)sync icon. - imgId = (network_is_desynchronised() ? SPR_G2_MULTIPLAYER_DESYNC : SPR_G2_MULTIPLAYER_SYNC); + imgId = (NetworkIsDesynchronised() ? SPR_G2_MULTIPLAYER_DESYNC : SPR_G2_MULTIPLAYER_SYNC); GfxDrawSprite(dpi, ImageId(imgId), screenPos + ScreenCoordsXY{ 3, 11 }); // Draw number of players. auto ft = Formatter(); - ft.Add(network_get_num_visible_players()); + ft.Add(NetworkGetNumVisiblePlayers()); DrawTextBasic( dpi, screenPos + ScreenCoordsXY{ 23, 1 }, STR_COMMA16, ft, { COLOUR_WHITE | static_cast(COLOUR_FLAG_OUTLINE), TextAlignment::RIGHT }); @@ -1733,8 +1733,8 @@ static void WindowTopToolbarSceneryToolDown(const ScreenCoordsXY& windowPos, rct int32_t quantity = 1; bool isCluster = gWindowSceneryScatterEnabled - && (network_get_mode() != NETWORK_MODE_CLIENT - || network_can_perform_command(network_get_current_player_group_index(), -2)); + && (NetworkGetMode() != NETWORK_MODE_CLIENT + || NetworkCanPerformCommand(NetworkGetCurrentPlayerGroupIndex(), -2)); if (isCluster) { @@ -3472,7 +3472,7 @@ static void TopToolbarInitCheatsMenu(rct_window* w, Widget* widget) TOP_TOOLBAR_CHEATS_COUNT); // Disable items that are not yet available in multiplayer - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { Dropdown::SetDisabled(DDIDX_OBJECT_SELECTION, true); Dropdown::SetDisabled(DDIDX_INVENTIONS_LIST, true); @@ -3562,7 +3562,7 @@ static void TopToolbarInitNetworkMenu(rct_window* w, Widget* widget) { w->windowPos.x + widget->left, w->windowPos.y + widget->top }, widget->height() + 1, w->colours[0] | 0x80, 0, TOP_TOOLBAR_NETWORK_COUNT); - Dropdown::SetDisabled(DDIDX_MULTIPLAYER_RECONNECT, !network_is_desynchronised()); + Dropdown::SetDisabled(DDIDX_MULTIPLAYER_RECONNECT, !NetworkIsDesynchronised()); gDropdownDefaultIndex = DDIDX_MULTIPLAYER; } @@ -3605,7 +3605,7 @@ static void TopToolbarNetworkMenuDropdown(int16_t dropdownIndex) ContextOpenWindow(WindowClass::Multiplayer); break; case DDIDX_MULTIPLAYER_RECONNECT: - network_reconnect(); + NetworkReconnect(); break; } } diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 8d817d8641..3122f39950 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -696,7 +696,7 @@ namespace OpenRCT2 #ifndef DISABLE_NETWORK if (sendMap) { - _network.Server_Send_MAP(); + _network.ServerSendMap(); } #endif diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index 95e411a21d..0278b932bd 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -478,7 +478,7 @@ void GameLoadInit() auto windowManager = GetContext()->GetUiContext()->GetWindowManager(); windowManager->SetMainView(gSavedView, gSavedViewZoom, gSavedViewRotation); - if (network_get_mode() != NETWORK_MODE_CLIENT) + if (NetworkGetMode() != NETWORK_MODE_CLIENT) { GameActions::ClearQueue(); } diff --git a/src/openrct2/GameState.cpp b/src/openrct2/GameState.cpp index 76c3706a69..a3670dc24a 100644 --- a/src/openrct2/GameState.cpp +++ b/src/openrct2/GameState.cpp @@ -123,12 +123,12 @@ void GameState::Tick() } } - network_update(); + NetworkUpdate(); - if (network_get_mode() == NETWORK_MODE_CLIENT && network_get_status() == NETWORK_STATUS_CONNECTED - && network_get_authstatus() == NetworkAuth::Ok) + if (NetworkGetMode() == NETWORK_MODE_CLIENT && NetworkGetStatus() == NETWORK_STATUS_CONNECTED + && NetworkGetAuthstatus() == NetworkAuth::Ok) { - numUpdates = std::clamp(network_get_server_tick() - gCurrentTicks, 0, 10); + numUpdates = std::clamp(NetworkGetServerTick() - gCurrentTicks, 0, 10); } else { @@ -141,10 +141,10 @@ void GameState::Tick() } bool isPaused = GameIsPaused(); - if (network_get_mode() == NETWORK_MODE_SERVER && gConfigNetwork.PauseServerIfNoClients) + if (NetworkGetMode() == NETWORK_MODE_SERVER && gConfigNetwork.PauseServerIfNoClients) { // If we are headless we always have 1 player (host), pause if no one else is around. - if (gOpenRCT2Headless && network_get_num_players() == 1) + if (gOpenRCT2Headless && NetworkGetNumPlayers() == 1) { isPaused |= true; } @@ -153,7 +153,7 @@ void GameState::Tick() bool didRunSingleFrame = false; if (isPaused) { - if (gDoSingleUpdate && network_get_mode() == NETWORK_MODE_NONE) + if (gDoSingleUpdate && NetworkGetMode() == NETWORK_MODE_NONE) { didRunSingleFrame = true; PauseToggle(); @@ -165,10 +165,10 @@ void GameState::Tick() // If the game is paused it will not call UpdateLogic at all. numUpdates = 0; - if (network_get_mode() == NETWORK_MODE_SERVER) + if (NetworkGetMode() == NETWORK_MODE_SERVER) { // Make sure the client always knows about what tick the host is on. - network_send_tick(); + NetworkSendTick(); } // Update the animation list. Note this does not @@ -176,7 +176,7 @@ void GameState::Tick() MapAnimationInvalidateAll(); // Post-tick network update - network_process_pending(); + NetworkProcessPending(); // Post-tick game actions. GameActions::ProcessQueue(); @@ -204,7 +204,7 @@ void GameState::Tick() } } - network_flush(); + NetworkFlush(); if (!gOpenRCT2Headless) { @@ -270,39 +270,39 @@ void GameState::UpdateLogic(LogicTimings* timings) GetContext()->GetReplayManager()->Update(); - network_update(); + NetworkUpdate(); report_time(LogicTimePart::NetworkUpdate); - if (network_get_mode() == NETWORK_MODE_SERVER) + if (NetworkGetMode() == NETWORK_MODE_SERVER) { - if (network_gamestate_snapshots_enabled()) + if (NetworkGamestateSnapshotsEnabled()) { CreateStateSnapshot(); } // Send current tick out. - network_send_tick(); + NetworkSendTick(); } - else if (network_get_mode() == NETWORK_MODE_CLIENT) + else if (NetworkGetMode() == NETWORK_MODE_CLIENT) { // Don't run past the server, this condition can happen during map changes. - if (network_get_server_tick() == gCurrentTicks) + if (NetworkGetServerTick() == gCurrentTicks) { return; } // Check desync. - bool desynced = network_check_desynchronisation(); + bool desynced = NetworkCheckDesynchronisation(); if (desynced) { // If desync debugging is enabled and we are still connected request the specific game state from server. - if (network_gamestate_snapshots_enabled() && network_get_status() == NETWORK_STATUS_CONNECTED) + if (NetworkGamestateSnapshotsEnabled() && NetworkGetStatus() == NETWORK_STATUS_CONNECTED) { // Create snapshot from this tick so we can compare it later // as we won't pause the game on this event. CreateStateSnapshot(); - network_request_gamestate_snapshot(); + NetworkRequestGamestateSnapshot(); } } } @@ -374,8 +374,8 @@ void GameState::UpdateLogic(LogicTimings* timings) GameActions::ProcessQueue(); report_time(LogicTimePart::GameActions); - network_process_pending(); - network_flush(); + NetworkProcessPending(); + NetworkFlush(); report_time(LogicTimePart::NetworkFlush); gCurrentTicks++; diff --git a/src/openrct2/ReplayManager.cpp b/src/openrct2/ReplayManager.cpp index 2be3222e00..eb436da527 100644 --- a/src/openrct2/ReplayManager.cpp +++ b/src/openrct2/ReplayManager.cpp @@ -233,7 +233,7 @@ namespace OpenRCT2 auto replayData = std::make_unique(); replayData->magic = ReplayMagic; replayData->version = ReplayVersion; - replayData->networkId = network_get_version(); + replayData->networkId = NetworkGetVersion(); replayData->name = name; replayData->tickStart = gCurrentTicks; if (maxTicks != k_MaxReplayTicks) @@ -725,11 +725,11 @@ namespace OpenRCT2 serialiser << data.networkId; #ifndef DISABLE_NETWORK // NOTE: This does not mean the replay will not function, only a warning. - if (data.networkId != network_get_version()) + if (data.networkId != NetworkGetVersion()) { LOG_WARNING( "Replay network version mismatch: '%s', expected: '%s'", data.networkId.c_str(), - network_get_version().c_str()); + NetworkGetVersion().c_str()); } #endif diff --git a/src/openrct2/actions/CheatSetAction.cpp b/src/openrct2/actions/CheatSetAction.cpp index 4024a7940c..a8d651e779 100644 --- a/src/openrct2/actions/CheatSetAction.cpp +++ b/src/openrct2/actions/CheatSetAction.cpp @@ -251,7 +251,7 @@ GameActions::Result CheatSetAction::Execute() const break; } - if (network_get_mode() == NETWORK_MODE_NONE) + if (NetworkGetMode() == NETWORK_MODE_NONE) { ConfigSaveDefault(); } diff --git a/src/openrct2/actions/GameAction.cpp b/src/openrct2/actions/GameAction.cpp index c63ca0c983..027478c34b 100644 --- a/src/openrct2/actions/GameAction.cpp +++ b/src/openrct2/actions/GameAction.cpp @@ -84,11 +84,11 @@ namespace GameActions void Enqueue(GameAction::Ptr&& ga, uint32_t tick) { - if (ga->GetPlayer() == -1 && network_get_mode() != NETWORK_MODE_NONE) + if (ga->GetPlayer() == -1 && NetworkGetMode() != NETWORK_MODE_NONE) { // Server can directly invoke actions and will have no player id assigned // as that normally happens when receiving them over network. - ga->SetPlayer(network_get_current_player_id()); + ga->SetPlayer(NetworkGetCurrentPlayerId()); } _actionQueue.emplace(tick, std::move(ga), _nextUniqueId++); } @@ -108,7 +108,7 @@ namespace GameActions // run all the game commands at the current tick const QueuedGameAction& queued = *_actionQueue.begin(); - if (network_get_mode() == NETWORK_MODE_CLIENT) + if (NetworkGetMode() == NETWORK_MODE_CLIENT) { if (queued.tick < currentTick) { @@ -145,10 +145,10 @@ namespace GameActions Guard::Assert(action != nullptr); GameActions::Result result = Execute(action); - if (result.Error == GameActions::Status::Ok && network_get_mode() == NETWORK_MODE_SERVER) + if (result.Error == GameActions::Status::Ok && NetworkGetMode() == NETWORK_MODE_SERVER) { // Relay this action to all other clients. - network_send_game_action(action); + NetworkSendGameAction(action); } _actionQueue.erase(_actionQueue.begin()); @@ -233,9 +233,9 @@ namespace GameActions static const char* GetRealm() { - if (network_get_mode() == NETWORK_MODE_CLIENT) + if (NetworkGetMode() == NETWORK_MODE_CLIENT) return "cl"; - if (network_get_mode() == NETWORK_MODE_SERVER) + if (NetworkGetMode() == NETWORK_MODE_SERVER) return "sv"; return "sp"; } @@ -282,7 +282,7 @@ namespace GameActions const char* text = static_cast(output.GetData()); LOG_VERBOSE("%s", text); - network_append_server_log(text); + NetworkAppendServerLog(text); } static GameActions::Result ExecuteInternal(const GameAction* action, bool topLevel) @@ -311,7 +311,7 @@ namespace GameActions GameActions::Result result = QueryInternal(action, topLevel); #ifdef ENABLE_SCRIPTING if (result.Error == GameActions::Status::Ok - && ((network_get_mode() == NETWORK_MODE_NONE) || (flags & GAME_COMMAND_FLAG_NETWORKED))) + && ((NetworkGetMode() == NETWORK_MODE_NONE) || (flags & GAME_COMMAND_FLAG_NETWORKED))) { auto& scriptEngine = GetContext()->GetScriptEngine(); scriptEngine.RunGameActionHooks(*action, result, false); @@ -323,18 +323,18 @@ namespace GameActions if (topLevel) { // Networked games send actions to the server to be run - if (network_get_mode() == NETWORK_MODE_CLIENT) + if (NetworkGetMode() == NETWORK_MODE_CLIENT) { // As a client we have to wait or send it first. if (!(actionFlags & GameActions::Flags::ClientOnly) && !(flags & GAME_COMMAND_FLAG_NETWORKED)) { LOG_VERBOSE("[%s] GameAction::Execute %s (Out)", GetRealm(), action->GetName()); - network_send_game_action(action); + NetworkSendGameAction(action); return result; } } - else if (network_get_mode() == NETWORK_MODE_SERVER) + else if (NetworkGetMode() == NETWORK_MODE_SERVER) { // If player is the server it would execute right away as where clients execute the commands // at the beginning of the frame, so we have to put them into the queue. @@ -377,23 +377,23 @@ namespace GameActions if (!(actionFlags & GameActions::Flags::ClientOnly) && result.Error == GameActions::Status::Ok) { - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { NetworkPlayerId_t playerId = action->GetPlayer(); - int32_t playerIndex = network_get_player_index(playerId.id); + int32_t playerIndex = NetworkGetPlayerIndex(playerId.id); Guard::Assert( playerIndex != -1, "Unable to find player %u for game action %u", playerId, action->GetType()); - network_set_player_last_action(playerIndex, action->GetType()); + NetworkSetPlayerLastAction(playerIndex, action->GetType()); if (result.Cost != 0) { - network_add_player_money_spent(playerIndex, result.Cost); + NetworkAddPlayerMoneySpent(playerIndex, result.Cost); } if (!result.Position.IsNull()) { - network_set_player_last_action_coord(playerIndex, result.Position); + NetworkSetPlayerLastActionCoord(playerIndex, result.Position); } } else @@ -433,12 +433,12 @@ namespace GameActions bool shouldShowError = !(flags & GAME_COMMAND_FLAG_GHOST) && !(flags & GAME_COMMAND_FLAG_NO_SPEND) && topLevel; // In network mode the error should be only shown to the issuer of the action. - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { // If the action was never networked and query fails locally the player id is not assigned. // So compare only if the action went into the queue otherwise show errors by default. const bool isActionFromNetwork = (action->GetFlags() & GAME_COMMAND_FLAG_NETWORKED) != 0; - if (isActionFromNetwork && action->GetPlayer() != network_get_current_player_id()) + if (isActionFromNetwork && action->GetPlayer() != NetworkGetCurrentPlayerId()) { shouldShowError = false; } diff --git a/src/openrct2/actions/NetworkModifyGroupAction.cpp b/src/openrct2/actions/NetworkModifyGroupAction.cpp index b70eda17da..6a22924c1f 100644 --- a/src/openrct2/actions/NetworkModifyGroupAction.cpp +++ b/src/openrct2/actions/NetworkModifyGroupAction.cpp @@ -45,10 +45,10 @@ void NetworkModifyGroupAction::Serialise(DataSerialiser& stream) GameActions::Result NetworkModifyGroupAction::Query() const { - return network_modify_groups(GetPlayer(), _type, _groupId, _name, _permissionIndex, _permissionState, false); + return NetworkModifyGroups(GetPlayer(), _type, _groupId, _name, _permissionIndex, _permissionState, false); } GameActions::Result NetworkModifyGroupAction::Execute() const { - return network_modify_groups(GetPlayer(), _type, _groupId, _name, _permissionIndex, _permissionState, true); + return NetworkModifyGroups(GetPlayer(), _type, _groupId, _name, _permissionIndex, _permissionState, true); } diff --git a/src/openrct2/actions/PeepPickupAction.cpp b/src/openrct2/actions/PeepPickupAction.cpp index d3aa5b4aa5..b0f0c630aa 100644 --- a/src/openrct2/actions/PeepPickupAction.cpp +++ b/src/openrct2/actions/PeepPickupAction.cpp @@ -74,12 +74,12 @@ GameActions::Result PeepPickupAction::Query() const { return GameActions::Result(GameActions::Status::Disallowed, STR_ERR_CANT_PLACE_PERSON_HERE, STR_NONE); } - Peep* existing = network_get_pickup_peep(_owner); + Peep* existing = NetworkGetPickupPeep(_owner); if (existing != nullptr) { // already picking up a peep PeepPickupAction existingPickupAction{ - PeepPickupType::Cancel, existing->sprite_index, { network_get_pickup_peep_old_x(_owner), 0, 0 }, _owner + PeepPickupType::Cancel, existing->sprite_index, { NetworkGetPickupPeepOldX(_owner), 0, 0 }, _owner }; auto result = GameActions::QueryNested(&existingPickupAction); @@ -95,7 +95,7 @@ GameActions::Result PeepPickupAction::Query() const break; case PeepPickupType::Place: res.Position = _loc; - if (network_get_pickup_peep(_owner) != peep) + if (NetworkGetPickupPeep(_owner) != peep) { return GameActions::Result(GameActions::Status::Unknown, STR_ERR_CANT_PLACE_PERSON_HERE, STR_NONE); } @@ -129,12 +129,12 @@ GameActions::Result PeepPickupAction::Execute() const { res.Position = peep->GetLocation(); - Peep* existing = network_get_pickup_peep(_owner); + Peep* existing = NetworkGetPickupPeep(_owner); if (existing != nullptr) { // already picking up a peep PeepPickupAction existingPickupAction{ - PeepPickupType::Cancel, existing->sprite_index, { network_get_pickup_peep_old_x(_owner), 0, 0 }, _owner + PeepPickupType::Cancel, existing->sprite_index, { NetworkGetPickupPeepOldX(_owner), 0, 0 }, _owner }; auto result = GameActions::ExecuteNested(&existingPickupAction); @@ -142,15 +142,15 @@ GameActions::Result PeepPickupAction::Execute() const { return result; } - if (_owner == network_get_current_player_id()) + if (_owner == NetworkGetCurrentPlayerId()) { // prevent tool_cancel() InputSetFlag(INPUT_FLAG_TOOL_ACTIVE, false); } } - network_set_pickup_peep(_owner, peep); - network_set_pickup_peep_old_x(_owner, peep->x); + NetworkSetPickupPeep(_owner, peep); + NetworkSetPickupPeepOldX(_owner, peep->x); peep->Pickup(); } break; @@ -158,13 +158,13 @@ GameActions::Result PeepPickupAction::Execute() const { res.Position = peep->GetLocation(); - Peep* const pickedUpPeep = network_get_pickup_peep(_owner); + Peep* const pickedUpPeep = NetworkGetPickupPeep(_owner); if (pickedUpPeep != nullptr) { pickedUpPeep->PickupAbort(_loc.x); } - network_set_pickup_peep(_owner, nullptr); + NetworkSetPickupPeep(_owner, nullptr); } break; case PeepPickupType::Place: @@ -185,20 +185,20 @@ GameActions::Result PeepPickupAction::Execute() const void PeepPickupAction::CancelConcurrentPickups(Peep* pickedPeep) const { // This part is only relevant in multiplayer games. - if (network_get_mode() == NETWORK_MODE_NONE) + if (NetworkGetMode() == NETWORK_MODE_NONE) return; // Not relevant for owner, owner gets to place it normally. - NetworkPlayerId_t currentPlayerId = network_get_current_player_id(); + NetworkPlayerId_t currentPlayerId = NetworkGetCurrentPlayerId(); if (currentPlayerId == _owner) return; - Peep* peep = network_get_pickup_peep(network_get_current_player_id()); + Peep* peep = NetworkGetPickupPeep(NetworkGetCurrentPlayerId()); if (peep != pickedPeep) return; // By assigning the peep to null before calling tool_cancel we can avoid // resetting the peep to the initial position. - network_set_pickup_peep(currentPlayerId, nullptr); + NetworkSetPickupPeep(currentPlayerId, nullptr); ToolCancel(); } diff --git a/src/openrct2/actions/PlayerKickAction.cpp b/src/openrct2/actions/PlayerKickAction.cpp index 6445106566..97e79505ad 100644 --- a/src/openrct2/actions/PlayerKickAction.cpp +++ b/src/openrct2/actions/PlayerKickAction.cpp @@ -34,10 +34,10 @@ void PlayerKickAction::Serialise(DataSerialiser& stream) } GameActions::Result PlayerKickAction::Query() const { - return network_kick_player(_playerId, false); + return NetworkKickPlayer(_playerId, false); } GameActions::Result PlayerKickAction::Execute() const { - return network_kick_player(_playerId, true); + return NetworkKickPlayer(_playerId, true); } diff --git a/src/openrct2/actions/PlayerSetGroupAction.cpp b/src/openrct2/actions/PlayerSetGroupAction.cpp index 409f4b4cc0..2262199878 100644 --- a/src/openrct2/actions/PlayerSetGroupAction.cpp +++ b/src/openrct2/actions/PlayerSetGroupAction.cpp @@ -36,10 +36,10 @@ void PlayerSetGroupAction::Serialise(DataSerialiser& stream) } GameActions::Result PlayerSetGroupAction::Query() const { - return network_set_player_group(GetPlayer(), _playerId, _groupId, false); + return NetworkSetPlayerGroup(GetPlayer(), _playerId, _groupId, false); } GameActions::Result PlayerSetGroupAction::Execute() const { - return network_set_player_group(GetPlayer(), _playerId, _groupId, true); + return NetworkSetPlayerGroup(GetPlayer(), _playerId, _groupId, true); } diff --git a/src/openrct2/cmdline/RootCommands.cpp b/src/openrct2/cmdline/RootCommands.cpp index 4a02c359de..ae28980fd6 100644 --- a/src/openrct2/cmdline/RootCommands.cpp +++ b/src/openrct2/cmdline/RootCommands.cpp @@ -446,7 +446,7 @@ static void PrintVersion() Console::WriteLine(buffer); Console::WriteFormat("%s (%s)", OPENRCT2_PLATFORM, OPENRCT2_ARCHITECTURE); Console::WriteLine(); - Console::WriteFormat("Network version: %s", network_get_version().c_str()); + Console::WriteFormat("Network version: %s", NetworkGetVersion().c_str()); Console::WriteLine(); #ifdef ENABLE_SCRIPTING Console::WriteFormat("Plugin API version: %d", OpenRCT2::Scripting::OPENRCT2_PLUGIN_API_VERSION); diff --git a/src/openrct2/core/DataSerialiserTraits.h b/src/openrct2/core/DataSerialiserTraits.h index 915710e659..8ea76fe11d 100644 --- a/src/openrct2/core/DataSerialiserTraits.h +++ b/src/openrct2/core/DataSerialiserTraits.h @@ -202,10 +202,10 @@ template<> struct DataSerializerTraits_t stream->Write(playerId, strlen(playerId)); - int32_t playerIndex = network_get_player_index(val.id); + int32_t playerIndex = NetworkGetPlayerIndex(val.id); if (playerIndex != -1) { - const char* playerName = network_get_player_name(playerIndex); + const char* playerName = NetworkGetPlayerName(playerIndex); if (playerName != nullptr) { stream->Write(" \"", 2); diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index 0c7da8357e..374a8bbf14 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -2302,7 +2302,7 @@ void Guest::SpendMoney(money16& peep_expend_type, money32 amount, ExpenditureTyp { // HACK Currently disabled for multiplayer due to limitation of all sprites // needing to be synchronised - if (network_get_mode() == NETWORK_MODE_NONE && !gOpenRCT2Headless) + if (NetworkGetMode() == NETWORK_MODE_NONE && !gOpenRCT2Headless) { MoneyEffect::CreateAt(amount, GetLocation(), true); } @@ -6187,7 +6187,7 @@ static bool PeepShouldWatchRide(TileElement* tileElement) { // Ghosts are purely this-client-side and should not cause any interaction, // as that may lead to a desync. - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { if (tileElement->IsGhost()) return false; @@ -6300,7 +6300,7 @@ static bool PeepFindRideToLookAt(Peep* peep, uint8_t edge, RideId* rideToView, u { // Ghosts are purely this-client-side and should not cause any interaction, // as that may lead to a desync. - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { if (tileElement->IsGhost()) continue; @@ -6339,7 +6339,7 @@ static bool PeepFindRideToLookAt(Peep* peep, uint8_t edge, RideId* rideToView, u { // Ghosts are purely this-client-side and should not cause any interaction, // as that may lead to a desync. - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { if (tileElement->IsGhost()) continue; @@ -6366,7 +6366,7 @@ static bool PeepFindRideToLookAt(Peep* peep, uint8_t edge, RideId* rideToView, u { // Ghosts are purely this-client-side and should not cause any interaction, // as that may lead to a desync. - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { if (tileElement->IsGhost()) continue; @@ -6411,7 +6411,7 @@ static bool PeepFindRideToLookAt(Peep* peep, uint8_t edge, RideId* rideToView, u { // Ghosts are purely this-client-side and should not cause any interaction, // as that may lead to a desync. - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { if (tileElement->IsGhost()) continue; @@ -6458,7 +6458,7 @@ static bool PeepFindRideToLookAt(Peep* peep, uint8_t edge, RideId* rideToView, u { // Ghosts are purely this-client-side and should not cause any interaction, // as that may lead to a desync. - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { if (tileElement->IsGhost()) continue; @@ -6484,7 +6484,7 @@ static bool PeepFindRideToLookAt(Peep* peep, uint8_t edge, RideId* rideToView, u { // Ghosts are purely this-client-side and should not cause any interaction, // as that may lead to a desync. - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { if (tileElement->IsGhost()) continue; @@ -6528,7 +6528,7 @@ static bool PeepFindRideToLookAt(Peep* peep, uint8_t edge, RideId* rideToView, u { // Ghosts are purely this-client-side and should not cause any interaction, // as that may lead to a desync. - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { if (tileElement->IsGhost()) continue; @@ -6574,7 +6574,7 @@ static bool PeepFindRideToLookAt(Peep* peep, uint8_t edge, RideId* rideToView, u { // Ghosts are purely this-client-side and should not cause any interaction, // as that may lead to a desync. - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { if (tileElement->IsGhost()) continue; @@ -6600,7 +6600,7 @@ static bool PeepFindRideToLookAt(Peep* peep, uint8_t edge, RideId* rideToView, u { // Ghosts are purely this-client-side and should not cause any interaction, // as that may lead to a desync. - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { if (tileElement->IsGhost()) continue; diff --git a/src/openrct2/entity/MoneyEffect.cpp b/src/openrct2/entity/MoneyEffect.cpp index 253dfe34bc..74312b02fc 100644 --- a/src/openrct2/entity/MoneyEffect.cpp +++ b/src/openrct2/entity/MoneyEffect.cpp @@ -78,7 +78,7 @@ void MoneyEffect::Create(money64 value, const CoordsXYZ& loc) { // If game actions return no valid location of the action we can not use the screen // coordinates as every client will have different ones. - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { LOG_WARNING("Attempted to create money effect without a valid location in multiplayer"); return; diff --git a/src/openrct2/interface/Chat.cpp b/src/openrct2/interface/Chat.cpp index 89191f4fca..5ae9add8f6 100644 --- a/src/openrct2/interface/Chat.cpp +++ b/src/openrct2/interface/Chat.cpp @@ -48,8 +48,8 @@ static int32_t ChatHistoryDrawString( bool ChatAvailable() { - return network_get_mode() != NETWORK_MODE_NONE && network_get_status() == NETWORK_STATUS_CONNECTED - && network_get_authstatus() == NetworkAuth::Ok; + return NetworkGetMode() != NETWORK_MODE_NONE && NetworkGetStatus() == NETWORK_STATUS_CONNECTED + && NetworkGetAuthstatus() == NetworkAuth::Ok; } void ChatOpen() @@ -229,7 +229,7 @@ void ChatAddHistory(std::string_view s) _chatHistoryIndex++; // Log to file (src only as logging does its own timestamp) - network_append_chat_log(s); + NetworkAppendChatLog(s); CreateAudioChannel(SoundId::NewsItem, 0, MIXER_VOLUME_MAX, 0.5f, 1.5f, true); } @@ -241,7 +241,7 @@ void ChatInput(enum ChatInput input) case ChatInput::Send: if (_chatCurrentLine[0] != '\0') { - network_send_chat(_chatCurrentLine); + NetworkSendChat(_chatCurrentLine); } ChatClearInput(); ChatClose(); diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index 7f1eaeacf1..5a5f3243f6 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -1322,7 +1322,7 @@ static int32_t ConsoleCommandOpen(InteractiveConsole& console, const arguments_t bool invalidTitle = false; if (argv[0] == "object_selection" && InvalidArguments(&invalidTitle, !title)) { - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { console.WriteLineError("Cannot open this window in multiplayer mode."); } @@ -1335,7 +1335,7 @@ static int32_t ConsoleCommandOpen(InteractiveConsole& console, const arguments_t } else if (argv[0] == "inventions_list" && InvalidArguments(&invalidTitle, !title)) { - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { console.WriteLineError("Cannot open this window in multiplayer mode."); } @@ -1350,7 +1350,7 @@ static int32_t ConsoleCommandOpen(InteractiveConsole& console, const arguments_t } else if (argv[0] == "objective_options" && InvalidArguments(&invalidTitle, !title)) { - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { console.WriteLineError("Cannot open this window in multiplayer mode."); } @@ -1542,8 +1542,8 @@ static int32_t ConsoleCommandSavePark([[maybe_unused]] InteractiveConsole& conso static int32_t ConsoleCommandSay(InteractiveConsole& console, const arguments_t& argv) { - if (network_get_mode() == NETWORK_MODE_NONE || network_get_status() != NETWORK_STATUS_CONNECTED - || network_get_authstatus() != NetworkAuth::Ok) + if (NetworkGetMode() == NETWORK_MODE_NONE || NetworkGetStatus() != NETWORK_STATUS_CONNECTED + || NetworkGetAuthstatus() != NetworkAuth::Ok) { console.WriteFormatLine("This command only works in multiplayer mode."); return 0; @@ -1551,7 +1551,7 @@ static int32_t ConsoleCommandSay(InteractiveConsole& console, const arguments_t& if (!argv.empty()) { - network_send_chat(argv[0].c_str()); + NetworkSendChat(argv[0].c_str()); return 1; } @@ -1561,7 +1561,7 @@ static int32_t ConsoleCommandSay(InteractiveConsole& console, const arguments_t& static int32_t ConsoleCommandReplayStartRecord(InteractiveConsole& console, const arguments_t& argv) { - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { console.WriteFormatLine("This command is currently not supported in multiplayer mode."); return 0; @@ -1608,7 +1608,7 @@ static int32_t ConsoleCommandReplayStartRecord(InteractiveConsole& console, cons static int32_t ConsoleCommandReplayStopRecord(InteractiveConsole& console, const arguments_t& argv) { - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { console.WriteFormatLine("This command is currently not supported in multiplayer mode."); return 0; @@ -1643,7 +1643,7 @@ static int32_t ConsoleCommandReplayStopRecord(InteractiveConsole& console, const static int32_t ConsoleCommandReplayStart(InteractiveConsole& console, const arguments_t& argv) { - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { console.WriteFormatLine("This command is currently not supported in multiplayer mode."); return 0; @@ -1685,7 +1685,7 @@ static int32_t ConsoleCommandReplayStart(InteractiveConsole& console, const argu static int32_t ConsoleCommandReplayStop(InteractiveConsole& console, const arguments_t& argv) { - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { console.WriteFormatLine("This command is currently not supported in multiplayer mode."); return 0; @@ -1703,7 +1703,7 @@ static int32_t ConsoleCommandReplayStop(InteractiveConsole& console, const argum static int32_t ConsoleCommandReplayNormalise(InteractiveConsole& console, const arguments_t& argv) { - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { console.WriteFormatLine("This command is currently not supported in multiplayer mode."); return 0; diff --git a/src/openrct2/network/DiscordService.cpp b/src/openrct2/network/DiscordService.cpp index 572c051f94..dcb19f4d5b 100644 --- a/src/openrct2/network/DiscordService.cpp +++ b/src/openrct2/network/DiscordService.cpp @@ -93,13 +93,13 @@ void DiscordService::RefreshPresence() const { default: details = GetParkName(); - if (network_get_mode() == NETWORK_MODE_NONE) + if (NetworkGetMode() == NETWORK_MODE_NONE) { state = "Playing Solo"; } else { - OpenRCT2::FmtString fmtServerName(network_get_server_name()); + OpenRCT2::FmtString fmtServerName(NetworkGetServerName()); std::string serverName; for (const auto& token : fmtServerName) { @@ -118,8 +118,8 @@ void DiscordService::RefreshPresence() const state = serverName; // NOTE: the party size is displayed next to state - discordPresence.partyId = network_get_server_name().c_str(); - discordPresence.partySize = network_get_num_players(); + discordPresence.partyId = NetworkGetServerName().c_str(); + discordPresence.partySize = NetworkGetNumPlayers(); discordPresence.partyMax = 256; // TODO generate secrets for the server diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index a1e5d3adef..cf9423e913 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -104,11 +104,11 @@ static constexpr uint32_t MaxPacketsPerUpdate = 100; using namespace OpenRCT2; -static void network_chat_show_connected_message(); -static void network_chat_show_server_greeting(); -static u8string network_get_keys_directory(); -static u8string network_get_private_key_path(u8string_view playerName); -static u8string network_get_public_key_path(u8string_view playerName, u8string_view hash); +static void NetworkChatShowConnectedMessage(); +static void NetworkChatShowServerGreeting(); +static u8string NetworkGetKeysDirectory(); +static u8string NetworkGetPrivateKeyPath(u8string_view playerName); +static u8string NetworkGetPublicKeyPath(u8string_view playerName, u8string_view hash); NetworkBase::NetworkBase(OpenRCT2::IContext& context) : OpenRCT2::System(context) @@ -137,15 +137,15 @@ NetworkBase::NetworkBase(OpenRCT2::IContext& context) client_command_handlers[NetworkCommand::Scripts] = &NetworkBase::Client_Handle_SCRIPTS; client_command_handlers[NetworkCommand::GameState] = &NetworkBase::Client_Handle_GAMESTATE; - server_command_handlers[NetworkCommand::Auth] = &NetworkBase::Server_Handle_AUTH; - server_command_handlers[NetworkCommand::Chat] = &NetworkBase::Server_Handle_CHAT; - server_command_handlers[NetworkCommand::GameAction] = &NetworkBase::Server_Handle_GAME_ACTION; - server_command_handlers[NetworkCommand::Ping] = &NetworkBase::Server_Handle_PING; - server_command_handlers[NetworkCommand::GameInfo] = &NetworkBase::Server_Handle_GAMEINFO; - server_command_handlers[NetworkCommand::Token] = &NetworkBase::Server_Handle_TOKEN; - server_command_handlers[NetworkCommand::MapRequest] = &NetworkBase::Server_Handle_MAPREQUEST; - server_command_handlers[NetworkCommand::RequestGameState] = &NetworkBase::Server_Handle_REQUEST_GAMESTATE; - server_command_handlers[NetworkCommand::Heartbeat] = &NetworkBase::Server_Handle_HEARTBEAT; + server_command_handlers[NetworkCommand::Auth] = &NetworkBase::ServerHandleAuth; + server_command_handlers[NetworkCommand::Chat] = &NetworkBase::ServerHandleChat; + server_command_handlers[NetworkCommand::GameAction] = &NetworkBase::ServerHandleGameAction; + server_command_handlers[NetworkCommand::Ping] = &NetworkBase::ServerHandlePing; + server_command_handlers[NetworkCommand::GameInfo] = &NetworkBase::ServerHandleGameInfo; + server_command_handlers[NetworkCommand::Token] = &NetworkBase::ServerHandleToken; + server_command_handlers[NetworkCommand::MapRequest] = &NetworkBase::ServerHandleMapRequest; + server_command_handlers[NetworkCommand::RequestGameState] = &NetworkBase::ServerHandleRequestGamestate; + server_command_handlers[NetworkCommand::Heartbeat] = &NetworkBase::ServerHandleHeartbeat; _chat_log_fs << std::unitbuf; _server_log_fs << std::unitbuf; @@ -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.PlayerName); + auto keyPath = NetworkGetPrivateKeyPath(gConfigNetwork.PlayerName); if (!File::Exists(keyPath)) { Console::WriteLine("Generating key... This may take a while"); @@ -290,7 +290,7 @@ bool NetworkBase::BeginClient(const std::string& host, uint16_t port) _key.Generate(); Console::WriteLine("Key generated, saving private bits as %s", keyPath.c_str()); - const auto keysDirectory = network_get_keys_directory(); + const auto keysDirectory = NetworkGetKeysDirectory(); if (!Platform::EnsureDirectoryExists(keysDirectory.c_str())) { LOG_ERROR("Unable to create directory %s.", keysDirectory.c_str()); @@ -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.PlayerName, publicKeyHash); + keyPath = NetworkGetPublicKeyPath(gConfigNetwork.PlayerName, publicKeyHash); Console::WriteLine("Key generated, saving public bits as %s", keyPath.c_str()); try @@ -391,7 +391,7 @@ bool NetworkBase::BeginServer(uint16_t port, const std::string& address) player->Group = 0; player_id = player->Id; - if (network_get_mode() == NETWORK_MODE_SERVER) + if (NetworkGetMode() == NETWORK_MODE_SERVER) { // Add SERVER to users.json and save. NetworkUser* networkUser = _userManager.GetOrAddUser(player->KeyHash); @@ -402,8 +402,8 @@ bool NetworkBase::BeginServer(uint16_t port, const std::string& address) auto* szAddress = address.empty() ? "*" : address.c_str(); Console::WriteLine("Listening for clients on %s:%hu", szAddress, port); - network_chat_show_connected_message(); - network_chat_show_server_greeting(); + NetworkChatShowConnectedMessage(); + NetworkChatShowServerGreeting(); status = NETWORK_STATUS_CONNECTED; listening_port = port; @@ -529,8 +529,8 @@ void NetworkBase::UpdateServer() uint32_t ticks = Platform::GetTicks(); if (ticks > last_ping_sent_time + 3000) { - Server_Send_PING(); - Server_Send_PINGLIST(); + ServerSendPing(); + ServerSendPingList(); } if (_advertiser != nullptr) @@ -829,7 +829,7 @@ void NetworkBase::KickPlayer(int32_t playerId) client_connection->SetLastDisconnectReason(STR_MULTIPLAYER_KICKED); char str_disconnect_msg[256]; FormatStringLegacy(str_disconnect_msg, 256, STR_MULTIPLAYER_KICKED_REASON, nullptr); - Server_Send_SETDISCONNECTMSG(*client_connection, str_disconnect_msg); + ServerSendSetDisconnectMsg(*client_connection, str_disconnect_msg); client_connection->Disconnect(); break; } @@ -1203,7 +1203,7 @@ void NetworkBase::Client_Send_AUTH( const std::string& name, const std::string& password, const std::string& pubkey, const std::vector& signature) { NetworkPacket packet(NetworkCommand::Auth); - packet.WriteString(network_get_version()); + packet.WriteString(NetworkGetVersion()); packet.WriteString(name); packet.WriteString(password); packet.WriteString(pubkey); @@ -1237,7 +1237,7 @@ void NetworkBase::Client_Send_MAPREQUEST(const std::vectorQueuePacket(std::move(packet)); } -void NetworkBase::Server_Send_TOKEN(NetworkConnection& connection) +void NetworkBase::ServerSendToken(NetworkConnection& connection) { NetworkPacket packet(NetworkCommand::Token); packet << static_cast(connection.Challenge.size()); @@ -1245,7 +1245,7 @@ void NetworkBase::Server_Send_TOKEN(NetworkConnection& connection) connection.QueuePacket(std::move(packet)); } -void NetworkBase::Server_Send_OBJECTS_LIST( +void NetworkBase::ServerSendObjectsList( NetworkConnection& connection, const std::vector& objects) const { LOG_VERBOSE("Server sends objects list with %u items", objects.size()); @@ -1286,7 +1286,7 @@ void NetworkBase::Server_Send_OBJECTS_LIST( } } -void NetworkBase::Server_Send_SCRIPTS(NetworkConnection& connection) +void NetworkBase::ServerSendScripts(NetworkConnection& connection) { NetworkPacket packet(NetworkCommand::Scripts); @@ -1351,7 +1351,7 @@ NetworkStats_t NetworkBase::GetStats() const return stats; } -void NetworkBase::Server_Send_AUTH(NetworkConnection& connection) +void NetworkBase::ServerSendAuth(NetworkConnection& connection) { uint8_t new_playerid = 0; if (connection.Player != nullptr) @@ -1362,7 +1362,7 @@ void NetworkBase::Server_Send_AUTH(NetworkConnection& connection) packet << static_cast(connection.AuthStatus) << new_playerid; if (connection.AuthStatus == NetworkAuth::BadVersion) { - packet.WriteString(network_get_version()); + packet.WriteString(NetworkGetVersion()); } connection.QueuePacket(std::move(packet)); if (connection.AuthStatus != NetworkAuth::Ok && connection.AuthStatus != NetworkAuth::RequirePassword) @@ -1371,7 +1371,7 @@ void NetworkBase::Server_Send_AUTH(NetworkConnection& connection) } } -void NetworkBase::Server_Send_MAP(NetworkConnection* connection) +void NetworkBase::ServerSendMap(NetworkConnection* connection) { std::vector objects; if (connection != nullptr) @@ -1387,7 +1387,7 @@ void NetworkBase::Server_Send_MAP(NetworkConnection* connection) objects = objManager.GetPackableObjects(); } - auto header = save_for_network(objects); + auto header = SaveForNetwork(objects); if (header.empty()) { if (connection != nullptr) @@ -1415,7 +1415,7 @@ void NetworkBase::Server_Send_MAP(NetworkConnection* connection) } } -std::vector NetworkBase::save_for_network(const std::vector& objects) const +std::vector NetworkBase::SaveForNetwork(const std::vector& objects) const { std::vector result; auto ms = OpenRCT2::MemoryStream(); @@ -1438,7 +1438,7 @@ void NetworkBase::Client_Send_CHAT(const char* text) _serverConnection->QueuePacket(std::move(packet)); } -void NetworkBase::Server_Send_CHAT(const char* text, const std::vector& playerIds) +void NetworkBase::ServerSendChat(const char* text, const std::vector& playerIds) { NetworkPacket packet(NetworkCommand::Chat); packet.WriteString(text); @@ -1482,7 +1482,7 @@ void NetworkBase::Client_Send_GAME_ACTION(const GameAction* action) _serverConnection->QueuePacket(std::move(packet)); } -void NetworkBase::Server_Send_GAME_ACTION(const GameAction* action) +void NetworkBase::ServerSendGameAction(const GameAction* action) { NetworkPacket packet(NetworkCommand::GameAction); @@ -1494,7 +1494,7 @@ void NetworkBase::Server_Send_GAME_ACTION(const GameAction* action) SendPacketToClients(packet); } -void NetworkBase::Server_Send_TICK() +void NetworkBase::ServerSendTick() { NetworkPacket packet(NetworkCommand::Tick); packet << gCurrentTicks << ScenarioRandState().s0; @@ -1521,7 +1521,7 @@ void NetworkBase::Server_Send_TICK() SendPacketToClients(packet); } -void NetworkBase::Server_Send_PLAYERINFO(int32_t playerId) +void NetworkBase::ServerSendPlayerInfo(int32_t playerId) { NetworkPacket packet(NetworkCommand::PlayerInfo); packet << gCurrentTicks; @@ -1534,7 +1534,7 @@ void NetworkBase::Server_Send_PLAYERINFO(int32_t playerId) SendPacketToClients(packet); } -void NetworkBase::Server_Send_PLAYERLIST() +void NetworkBase::ServerSendPlayerList() { NetworkPacket packet(NetworkCommand::PlayerList); packet << gCurrentTicks << static_cast(player_list.size()); @@ -1551,7 +1551,7 @@ void NetworkBase::Client_Send_PING() _serverConnection->QueuePacket(std::move(packet)); } -void NetworkBase::Server_Send_PING() +void NetworkBase::ServerSendPing() { last_ping_sent_time = Platform::GetTicks(); NetworkPacket packet(NetworkCommand::Ping); @@ -1562,7 +1562,7 @@ void NetworkBase::Server_Send_PING() SendPacketToClients(packet, true); } -void NetworkBase::Server_Send_PINGLIST() +void NetworkBase::ServerSendPingList() { NetworkPacket packet(NetworkCommand::PingList); packet << static_cast(player_list.size()); @@ -1573,7 +1573,7 @@ void NetworkBase::Server_Send_PINGLIST() SendPacketToClients(packet); } -void NetworkBase::Server_Send_SETDISCONNECTMSG(NetworkConnection& connection, const char* msg) +void NetworkBase::ServerSendSetDisconnectMsg(NetworkConnection& connection, const char* msg) { NetworkPacket packet(NetworkCommand::DisconnectMessage); packet.WriteString(msg); @@ -1583,15 +1583,19 @@ void NetworkBase::Server_Send_SETDISCONNECTMSG(NetworkConnection& connection, co json_t NetworkBase::GetServerInfoAsJson() const { json_t jsonObj = { - { "name", gConfigNetwork.ServerName }, { "requiresPassword", _password.size() > 0 }, - { "version", network_get_version() }, { "players", GetNumVisiblePlayers() }, - { "maxPlayers", gConfigNetwork.Maxplayers }, { "description", gConfigNetwork.ServerDescription }, - { "greeting", gConfigNetwork.ServerGreeting }, { "dedicated", gOpenRCT2Headless }, + { "name", gConfigNetwork.ServerName }, + { "requiresPassword", _password.size() > 0 }, + { "version", NetworkGetVersion() }, + { "players", GetNumVisiblePlayers() }, + { "maxPlayers", gConfigNetwork.Maxplayers }, + { "description", gConfigNetwork.ServerDescription }, + { "greeting", gConfigNetwork.ServerGreeting }, + { "dedicated", gOpenRCT2Headless }, }; return jsonObj; } -void NetworkBase::Server_Send_GAMEINFO(NetworkConnection& connection) +void NetworkBase::ServerSendGameInfo(NetworkConnection& connection) { NetworkPacket packet(NetworkCommand::GameInfo); # ifndef DISABLE_HTTP @@ -1614,14 +1618,14 @@ void NetworkBase::Server_Send_GAMEINFO(NetworkConnection& connection) connection.QueuePacket(std::move(packet)); } -void NetworkBase::Server_Send_SHOWERROR(NetworkConnection& connection, StringId title, StringId message) +void NetworkBase::ServerSendShowError(NetworkConnection& connection, StringId title, StringId message) { NetworkPacket packet(NetworkCommand::ShowError); packet << title << message; connection.QueuePacket(std::move(packet)); } -void NetworkBase::Server_Send_GROUPLIST(NetworkConnection& connection) +void NetworkBase::ServerSendGroupList(NetworkConnection& connection) { NetworkPacket packet(NetworkCommand::GroupList); packet << static_cast(group_list.size()) << default_group; @@ -1632,7 +1636,7 @@ void NetworkBase::Server_Send_GROUPLIST(NetworkConnection& connection) connection.QueuePacket(std::move(packet)); } -void NetworkBase::Server_Send_EVENT_PLAYER_JOINED(const char* playerName) +void NetworkBase::ServerSendEventPlayerJoined(const char* playerName) { NetworkPacket packet(NetworkCommand::Event); packet << static_cast(SERVER_EVENT_PLAYER_JOINED); @@ -1640,7 +1644,7 @@ void NetworkBase::Server_Send_EVENT_PLAYER_JOINED(const char* playerName) SendPacketToClients(packet); } -void NetworkBase::Server_Send_EVENT_PLAYER_DISCONNECTED(const char* playerName, const char* reason) +void NetworkBase::ServerSendEventPlayerDisconnected(const char* playerName, const char* reason) { NetworkPacket packet(NetworkCommand::Event); packet << static_cast(SERVER_EVENT_PLAYER_DISCONNECTED); @@ -1817,7 +1821,7 @@ void NetworkBase::ProcessPlayerList() if (_playerListInvalidated) { _playerListInvalidated = false; - Server_Send_PLAYERLIST(); + ServerSendPlayerList(); } } else @@ -1975,16 +1979,16 @@ void NetworkBase::ServerClientDisconnected(std::unique_ptr& c } ChatAddHistory(text); - Peep* pickup_peep = network_get_pickup_peep(connection_player->Id); + Peep* pickup_peep = NetworkGetPickupPeep(connection_player->Id); if (pickup_peep != nullptr) { PeepPickupAction pickupAction{ PeepPickupType::Cancel, pickup_peep->sprite_index, - { network_get_pickup_peep_old_x(connection_player->Id), 0, 0 }, - network_get_current_player_id() }; + { NetworkGetPickupPeepOldX(connection_player->Id), 0, 0 }, + NetworkGetCurrentPlayerId() }; auto res = GameActions::Execute(&pickupAction); } - Server_Send_EVENT_PLAYER_DISCONNECTED( + ServerSendEventPlayerDisconnected( const_cast(connection_player->Name.c_str()), connection->GetLastDisconnectReason()); // Log player disconnected event @@ -2119,7 +2123,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.PlayerName); + auto keyPath = NetworkGetPrivateKeyPath(gConfigNetwork.PlayerName); if (!File::Exists(keyPath)) { LOG_ERROR("Key file (%s) was not found. Restart client to re-generate it.", keyPath.c_str()); @@ -2165,7 +2169,7 @@ void NetworkBase::Client_Handle_TOKEN(NetworkConnection& connection, NetworkPack Client_Send_AUTH(gConfigNetwork.PlayerName, gCustomPassword, pubkey, signature); } -void NetworkBase::Server_Handle_REQUEST_GAMESTATE(NetworkConnection& connection, NetworkPacket& packet) +void NetworkBase::ServerHandleRequestGamestate(NetworkConnection& connection, NetworkPacket& packet) { uint32_t tick; packet >> tick; @@ -2207,7 +2211,7 @@ void NetworkBase::Server_Handle_REQUEST_GAMESTATE(NetworkConnection& connection, } } -void NetworkBase::Server_Handle_HEARTBEAT(NetworkConnection& connection, NetworkPacket& packet) +void NetworkBase::ServerHandleHeartbeat(NetworkConnection& connection, NetworkPacket& packet) { LOG_VERBOSE("Client %s heartbeat", connection.Socket->GetHostName()); connection.ResetLastPacketTime(); @@ -2261,7 +2265,7 @@ void NetworkBase::Client_Handle_AUTH(NetworkConnection& connection, NetworkPacke } } -void NetworkBase::Server_Client_Joined(std::string_view name, const std::string& keyhash, NetworkConnection& connection) +void NetworkBase::ServerClientJoined(std::string_view name, const std::string& keyhash, NetworkConnection& connection) { auto player = AddPlayer(std::string(name), keyhash); connection.Player = player; @@ -2275,8 +2279,8 @@ void NetworkBase::Server_Client_Joined(std::string_view name, const std::string& auto& context = GetContext(); auto& objManager = context.GetObjectManager(); auto objects = objManager.GetPackableObjects(); - Server_Send_OBJECTS_LIST(connection, objects); - Server_Send_SCRIPTS(connection); + ServerSendObjectsList(connection, objects); + ServerSendScripts(connection); // Log player joining event std::string playerNameHash = player->Name + " (" + keyhash + ")"; @@ -2288,7 +2292,7 @@ void NetworkBase::Server_Client_Joined(std::string_view name, const std::string& } } -void NetworkBase::Server_Handle_TOKEN(NetworkConnection& connection, [[maybe_unused]] NetworkPacket& packet) +void NetworkBase::ServerHandleToken(NetworkConnection& connection, [[maybe_unused]] NetworkPacket& packet) { uint8_t token_size = 10 + (rand() & 0x7f); connection.Challenge.resize(token_size); @@ -2296,7 +2300,7 @@ void NetworkBase::Server_Handle_TOKEN(NetworkConnection& connection, [[maybe_unu { connection.Challenge[i] = static_cast(rand() & 0xff); } - Server_Send_TOKEN(connection); + ServerSendToken(connection); } void NetworkBase::Client_Handle_OBJECTS_LIST(NetworkConnection& connection, NetworkPacket& packet) @@ -2468,7 +2472,7 @@ void NetworkBase::Client_Handle_GAMESTATE(NetworkConnection& connection, Network } } -void NetworkBase::Server_Handle_MAPREQUEST(NetworkConnection& connection, NetworkPacket& packet) +void NetworkBase::ServerHandleMapRequest(NetworkConnection& connection, NetworkPacket& packet) { uint32_t size; packet >> size; @@ -2506,12 +2510,12 @@ void NetworkBase::Server_Handle_MAPREQUEST(NetworkConnection& connection, Networ } auto player_name = connection.Player->Name.c_str(); - Server_Send_MAP(&connection); - Server_Send_EVENT_PLAYER_JOINED(player_name); - Server_Send_GROUPLIST(connection); + ServerSendMap(&connection); + ServerSendEventPlayerJoined(player_name); + ServerSendGroupList(connection); } -void NetworkBase::Server_Handle_AUTH(NetworkConnection& connection, NetworkPacket& packet) +void NetworkBase::ServerHandleAuth(NetworkConnection& connection, NetworkPacket& packet) { if (connection.AuthStatus != NetworkAuth::Ok) { @@ -2590,7 +2594,7 @@ void NetworkBase::Server_Handle_AUTH(NetworkConnection& connection, NetworkPacke const NetworkGroup* group = GetGroupByID(GetGroupIDByHash(connection.Key.PublicKeyHash())); passwordless = group->CanPerformAction(NetworkPermission::PasswordlessLogin); } - if (gameversion != network_get_version()) + if (gameversion != NetworkGetVersion()) { connection.AuthStatus = NetworkAuth::BadVersion; LOG_INFO("Connection %s: Bad version.", hostName); @@ -2625,7 +2629,7 @@ void NetworkBase::Server_Handle_AUTH(NetworkConnection& connection, NetworkPacke if (ProcessPlayerAuthenticatePluginHooks(connection, name, hash)) { connection.AuthStatus = NetworkAuth::Ok; - Server_Client_Joined(name, hash, connection); + ServerClientJoined(name, hash, connection); } else { @@ -2634,7 +2638,7 @@ void NetworkBase::Server_Handle_AUTH(NetworkConnection& connection, NetworkPacke } } - Server_Send_AUTH(connection); + ServerSendAuth(connection); } } @@ -2693,13 +2697,13 @@ void NetworkBase::Client_Handle_MAP([[maybe_unused]] NetworkConnection& connecti GameLoadScripts(); GameNotifyMapChanged(); _serverState.tick = gCurrentTicks; - // window_network_status_open("Loaded new map from network"); + // WindowNetworkStatusOpen("Loaded new map from network"); _serverState.state = NetworkServerState::Ok; _clientMapLoaded = true; gFirstTimeSaving = true; // Notify user he is now online and which shortcut key enables chat - network_chat_show_connected_message(); + NetworkChatShowConnectedMessage(); // Fix invalid vehicle sprite sizes, thus preventing visual corruption of sprites FixInvalidVehicleSpriteSizes(); @@ -2810,7 +2814,7 @@ static bool ProcessChatMessagePluginHooks(uint8_t playerId, std::string& text) return true; } -void NetworkBase::Server_Handle_CHAT(NetworkConnection& connection, NetworkPacket& packet) +void NetworkBase::ServerHandleChat(NetworkConnection& connection, NetworkPacket& packet) { auto szText = packet.ReadString(); if (szText.empty()) @@ -2837,7 +2841,7 @@ void NetworkBase::Server_Handle_CHAT(NetworkConnection& connection, NetworkPacke const char* formatted = FormatChat(connection.Player, text.c_str()); ChatAddHistory(formatted); - Server_Send_CHAT(formatted); + ServerSendChat(formatted); } void NetworkBase::Client_Handle_GAME_ACTION([[maybe_unused]] NetworkConnection& connection, NetworkPacket& packet) @@ -2876,7 +2880,7 @@ void NetworkBase::Client_Handle_GAME_ACTION([[maybe_unused]] NetworkConnection& GameActions::Enqueue(std::move(action), tick); } -void NetworkBase::Server_Handle_GAME_ACTION(NetworkConnection& connection, NetworkPacket& packet) +void NetworkBase::ServerHandleGameAction(NetworkConnection& connection, NetworkPacket& packet) { uint32_t tick; GameCommand actionType; @@ -2901,7 +2905,7 @@ void NetworkBase::Server_Handle_GAME_ACTION(NetworkConnection& connection, Netwo NetworkGroup* group = GetGroupByID(connection.Player->Group); if (group == nullptr || group->CanPerformCommand(actionType) == false) { - Server_Send_SHOWERROR(connection, STR_CANT_DO_THIS, STR_PERMISSION_DENIED); + ServerSendShowError(connection, STR_CANT_DO_THIS, STR_PERMISSION_DENIED); return; } } @@ -2924,7 +2928,7 @@ void NetworkBase::Server_Handle_GAME_ACTION(NetworkConnection& connection, Netwo { if (cooldownIt->second > 0) { - Server_Send_SHOWERROR(connection, STR_CANT_DO_THIS, STR_NETWORK_ACTION_RATE_LIMIT_MESSAGE); + ServerSendShowError(connection, STR_CANT_DO_THIS, STR_NETWORK_ACTION_RATE_LIMIT_MESSAGE); return; } } @@ -3013,7 +3017,7 @@ void NetworkBase::Client_Handle_PING([[maybe_unused]] NetworkConnection& connect Client_Send_PING(); } -void NetworkBase::Server_Handle_PING(NetworkConnection& connection, [[maybe_unused]] NetworkPacket& packet) +void NetworkBase::ServerHandlePing(NetworkConnection& connection, [[maybe_unused]] NetworkPacket& packet) { int32_t ping = Platform::GetTicks() - connection.PingTime; if (ping < 0) @@ -3054,9 +3058,9 @@ void NetworkBase::Client_Handle_SETDISCONNECTMSG(NetworkConnection& connection, } } -void NetworkBase::Server_Handle_GAMEINFO(NetworkConnection& connection, [[maybe_unused]] NetworkPacket& packet) +void NetworkBase::ServerHandleGameInfo(NetworkConnection& connection, [[maybe_unused]] NetworkPacket& packet) { - Server_Send_GAMEINFO(connection); + ServerSendGameInfo(connection); } void NetworkBase::Client_Handle_SHOWERROR([[maybe_unused]] NetworkConnection& connection, NetworkPacket& packet) @@ -3142,100 +3146,100 @@ void NetworkBase::Client_Handle_GAMEINFO([[maybe_unused]] NetworkConnection& con } } - network_chat_show_server_greeting(); + NetworkChatShowServerGreeting(); } -void network_reconnect() +void NetworkReconnect() { OpenRCT2::GetContext()->GetNetwork().Reconnect(); } -void network_shutdown_client() +void NetworkShutdownClient() { OpenRCT2::GetContext()->GetNetwork().ServerClientDisconnected(); } -int32_t network_begin_client(const std::string& host, int32_t port) +int32_t NetworkBeginClient(const std::string& host, int32_t port) { return OpenRCT2::GetContext()->GetNetwork().BeginClient(host, port); } -int32_t network_begin_server(int32_t port, const std::string& address) +int32_t NetworkBeginServer(int32_t port, const std::string& address) { return OpenRCT2::GetContext()->GetNetwork().BeginServer(port, address); } -void network_update() +void NetworkUpdate() { OpenRCT2::GetContext()->GetNetwork().Update(); } -void network_process_pending() +void NetworkProcessPending() { OpenRCT2::GetContext()->GetNetwork().ProcessPending(); } -void network_flush() +void NetworkFlush() { OpenRCT2::GetContext()->GetNetwork().Flush(); } -int32_t network_get_mode() +int32_t NetworkGetMode() { return OpenRCT2::GetContext()->GetNetwork().GetMode(); } -int32_t network_get_status() +int32_t NetworkGetStatus() { return OpenRCT2::GetContext()->GetNetwork().GetStatus(); } -bool network_is_desynchronised() +bool NetworkIsDesynchronised() { return OpenRCT2::GetContext()->GetNetwork().IsDesynchronised(); } -bool network_check_desynchronisation() +bool NetworkCheckDesynchronisation() { return OpenRCT2::GetContext()->GetNetwork().CheckDesynchronizaton(); } -void network_request_gamestate_snapshot() +void NetworkRequestGamestateSnapshot() { return OpenRCT2::GetContext()->GetNetwork().RequestStateSnapshot(); } -void network_send_tick() +void NetworkSendTick() { - OpenRCT2::GetContext()->GetNetwork().Server_Send_TICK(); + OpenRCT2::GetContext()->GetNetwork().ServerSendTick(); } -NetworkAuth network_get_authstatus() +NetworkAuth NetworkGetAuthstatus() { return OpenRCT2::GetContext()->GetNetwork().GetAuthStatus(); } -uint32_t network_get_server_tick() +uint32_t NetworkGetServerTick() { return OpenRCT2::GetContext()->GetNetwork().GetServerTick(); } -uint8_t network_get_current_player_id() +uint8_t NetworkGetCurrentPlayerId() { return OpenRCT2::GetContext()->GetNetwork().GetPlayerID(); } -int32_t network_get_num_players() +int32_t NetworkGetNumPlayers() { return OpenRCT2::GetContext()->GetNetwork().GetTotalNumPlayers(); } -int32_t network_get_num_visible_players() +int32_t NetworkGetNumVisiblePlayers() { return OpenRCT2::GetContext()->GetNetwork().GetNumVisiblePlayers(); } -const char* network_get_player_name(uint32_t index) +const char* NetworkGetPlayerName(uint32_t index) { auto& network = OpenRCT2::GetContext()->GetNetwork(); Guard::IndexInRange(index, network.player_list); @@ -3243,7 +3247,7 @@ const char* network_get_player_name(uint32_t index) return static_cast(network.player_list[index]->Name.c_str()); } -uint32_t network_get_player_flags(uint32_t index) +uint32_t NetworkGetPlayerFlags(uint32_t index) { auto& network = OpenRCT2::GetContext()->GetNetwork(); Guard::IndexInRange(index, network.player_list); @@ -3251,7 +3255,7 @@ uint32_t network_get_player_flags(uint32_t index) return network.player_list[index]->Flags; } -int32_t network_get_player_ping(uint32_t index) +int32_t NetworkGetPlayerPing(uint32_t index) { auto& network = OpenRCT2::GetContext()->GetNetwork(); Guard::IndexInRange(index, network.player_list); @@ -3259,7 +3263,7 @@ int32_t network_get_player_ping(uint32_t index) return network.player_list[index]->Ping; } -int32_t network_get_player_id(uint32_t index) +int32_t NetworkGetPlayerID(uint32_t index) { auto& network = OpenRCT2::GetContext()->GetNetwork(); Guard::IndexInRange(index, network.player_list); @@ -3267,7 +3271,7 @@ int32_t network_get_player_id(uint32_t index) return network.player_list[index]->Id; } -money32 network_get_player_money_spent(uint32_t index) +money32 NetworkGetPlayerMoneySpent(uint32_t index) { auto& network = OpenRCT2::GetContext()->GetNetwork(); Guard::IndexInRange(index, network.player_list); @@ -3275,7 +3279,7 @@ money32 network_get_player_money_spent(uint32_t index) return network.player_list[index]->MoneySpent; } -std::string network_get_player_ip_address(uint32_t id) +std::string NetworkGetPlayerIPAddress(uint32_t id) { auto& network = OpenRCT2::GetContext()->GetNetwork(); auto conn = network.GetPlayerConnection(id); @@ -3286,7 +3290,7 @@ std::string network_get_player_ip_address(uint32_t id) return {}; } -std::string network_get_player_public_key_hash(uint32_t id) +std::string NetworkGetPlayerPublicKeyHash(uint32_t id) { auto& network = OpenRCT2::GetContext()->GetNetwork(); auto player = network.GetPlayerByID(id); @@ -3297,7 +3301,7 @@ std::string network_get_player_public_key_hash(uint32_t id) return {}; } -void network_add_player_money_spent(uint32_t index, money32 cost) +void NetworkAddPlayerMoneySpent(uint32_t index, money32 cost) { auto& network = OpenRCT2::GetContext()->GetNetwork(); Guard::IndexInRange(index, network.player_list); @@ -3305,7 +3309,7 @@ void network_add_player_money_spent(uint32_t index, money32 cost) network.player_list[index]->AddMoneySpent(cost); } -int32_t network_get_player_last_action(uint32_t index, int32_t time) +int32_t NetworkGetPlayerLastAction(uint32_t index, int32_t time) { auto& network = OpenRCT2::GetContext()->GetNetwork(); Guard::IndexInRange(index, network.player_list); @@ -3317,7 +3321,7 @@ int32_t network_get_player_last_action(uint32_t index, int32_t time) return network.player_list[index]->LastAction; } -void network_set_player_last_action(uint32_t index, GameCommand command) +void NetworkSetPlayerLastAction(uint32_t index, GameCommand command) { auto& network = OpenRCT2::GetContext()->GetNetwork(); Guard::IndexInRange(index, network.player_list); @@ -3326,7 +3330,7 @@ void network_set_player_last_action(uint32_t index, GameCommand command) network.player_list[index]->LastActionTime = Platform::GetTicks(); } -CoordsXYZ network_get_player_last_action_coord(uint32_t index) +CoordsXYZ NetworkGetPlayerLastActionCoord(uint32_t index) { auto& network = OpenRCT2::GetContext()->GetNetwork(); Guard::IndexInRange(index, OpenRCT2::GetContext()->GetNetwork().player_list); @@ -3334,7 +3338,7 @@ CoordsXYZ network_get_player_last_action_coord(uint32_t index) return network.player_list[index]->LastActionCoord; } -void network_set_player_last_action_coord(uint32_t index, const CoordsXYZ& coord) +void NetworkSetPlayerLastActionCoord(uint32_t index, const CoordsXYZ& coord) { auto& network = OpenRCT2::GetContext()->GetNetwork(); Guard::IndexInRange(index, network.player_list); @@ -3345,7 +3349,7 @@ void network_set_player_last_action_coord(uint32_t index, const CoordsXYZ& coord } } -uint32_t network_get_player_commands_ran(uint32_t index) +uint32_t NetworkGetPlayerCommandsRan(uint32_t index) { auto& network = OpenRCT2::GetContext()->GetNetwork(); Guard::IndexInRange(index, OpenRCT2::GetContext()->GetNetwork().player_list); @@ -3353,7 +3357,7 @@ uint32_t network_get_player_commands_ran(uint32_t index) return network.player_list[index]->CommandsRan; } -int32_t network_get_player_index(uint32_t id) +int32_t NetworkGetPlayerIndex(uint32_t id) { auto& network = OpenRCT2::GetContext()->GetNetwork(); auto it = network.GetPlayerIteratorByID(id); @@ -3364,7 +3368,7 @@ int32_t network_get_player_index(uint32_t id) return static_cast(network.GetPlayerIteratorByID(id) - network.player_list.begin()); } -uint8_t network_get_player_group(uint32_t index) +uint8_t NetworkGetPlayerGroup(uint32_t index) { auto& network = OpenRCT2::GetContext()->GetNetwork(); Guard::IndexInRange(index, network.player_list); @@ -3372,7 +3376,7 @@ uint8_t network_get_player_group(uint32_t index) return network.player_list[index]->Group; } -void network_set_player_group(uint32_t index, uint32_t groupindex) +void NetworkSetPlayerGroup(uint32_t index, uint32_t groupindex) { auto& network = OpenRCT2::GetContext()->GetNetwork(); Guard::IndexInRange(index, network.player_list); @@ -3381,7 +3385,7 @@ void network_set_player_group(uint32_t index, uint32_t groupindex) network.player_list[index]->Group = network.group_list[groupindex]->Id; } -int32_t network_get_group_index(uint8_t id) +int32_t NetworkGetGroupIndex(uint8_t id) { auto& network = OpenRCT2::GetContext()->GetNetwork(); auto it = network.GetGroupIteratorByID(id); @@ -3392,7 +3396,7 @@ int32_t network_get_group_index(uint8_t id) return static_cast(network.GetGroupIteratorByID(id) - network.group_list.begin()); } -uint8_t network_get_group_id(uint32_t index) +uint8_t NetworkGetGroupID(uint32_t index) { auto& network = OpenRCT2::GetContext()->GetNetwork(); Guard::IndexInRange(index, network.group_list); @@ -3400,19 +3404,19 @@ uint8_t network_get_group_id(uint32_t index) return network.group_list[index]->Id; } -int32_t network_get_num_groups() +int32_t NetworkGetNumGroups() { auto& network = OpenRCT2::GetContext()->GetNetwork(); return static_cast(network.group_list.size()); } -const char* network_get_group_name(uint32_t index) +const char* NetworkGetGroupName(uint32_t index) { auto& network = OpenRCT2::GetContext()->GetNetwork(); return network.group_list[index]->GetName().c_str(); } -void network_chat_show_connected_message() +void NetworkChatShowConnectedMessage() { auto windowManager = GetContext()->GetUiContext()->GetWindowManager(); std::string s = windowManager->GetKeyboardShortcutString("interface.misc.multiplayer_chat"); @@ -3428,9 +3432,9 @@ void network_chat_show_connected_message() } // Display server greeting if one exists -void network_chat_show_server_greeting() +void NetworkChatShowServerGreeting() { - const auto& greeting = network_get_server_greeting(); + const auto& greeting = NetworkGetServerGreeting(); if (!greeting.empty()) { thread_local std::string greeting_formatted; @@ -3440,7 +3444,7 @@ void network_chat_show_server_greeting() } } -GameActions::Result network_set_player_group( +GameActions::Result NetworkSetPlayerGroup( NetworkPlayerId_t actionPlayerId, NetworkPlayerId_t playerId, uint8_t groupId, bool isExecuting) { auto& network = OpenRCT2::GetContext()->GetNetwork(); @@ -3472,7 +3476,7 @@ GameActions::Result network_set_player_group( { player->Group = groupId; - if (network_get_mode() == NETWORK_MODE_SERVER) + if (NetworkGetMode() == NETWORK_MODE_SERVER) { // Add or update saved user NetworkUserManager& userManager = network._userManager; @@ -3494,12 +3498,12 @@ GameActions::Result network_set_player_group( game_command_player->Name.c_str(), }; FormatStringLegacy(log_msg, 256, STR_LOG_SET_PLAYER_GROUP, args); - network_append_server_log(log_msg); + NetworkAppendServerLog(log_msg); } return GameActions::Result(); } -GameActions::Result network_modify_groups( +GameActions::Result NetworkModifyGroups( NetworkPlayerId_t actionPlayerId, ModifyGroupType type, uint8_t groupId, const std::string& name, uint32_t permissionIndex, PermissionState permissionState, bool isExecuting) { @@ -3630,7 +3634,7 @@ GameActions::Result network_modify_groups( return GameActions::Result(); } -GameActions::Result network_kick_player(NetworkPlayerId_t playerId, bool isExecuting) +GameActions::Result NetworkKickPlayer(NetworkPlayerId_t playerId, bool isExecuting) { auto& network = OpenRCT2::GetContext()->GetNetwork(); NetworkPlayer* player = network.GetPlayerByID(playerId); @@ -3661,18 +3665,18 @@ GameActions::Result network_kick_player(NetworkPlayerId_t playerId, bool isExecu return GameActions::Result(); } -uint8_t network_get_default_group() +uint8_t NetworkGetDefaultGroup() { auto& network = OpenRCT2::GetContext()->GetNetwork(); return network.GetDefaultGroup(); } -int32_t network_get_num_actions() +int32_t NetworkGetNumActions() { return static_cast(NetworkActions::Actions.size()); } -StringId network_get_action_name_string_id(uint32_t index) +StringId NetworkGetActionNameStringID(uint32_t index) { if (index < NetworkActions::Actions.size()) { @@ -3682,7 +3686,7 @@ StringId network_get_action_name_string_id(uint32_t index) return STR_NONE; } -int32_t network_can_perform_action(uint32_t groupindex, NetworkPermission index) +int32_t NetworkCanPerformAction(uint32_t groupindex, NetworkPermission index) { auto& network = OpenRCT2::GetContext()->GetNetwork(); Guard::IndexInRange(groupindex, network.group_list); @@ -3690,7 +3694,7 @@ int32_t network_can_perform_action(uint32_t groupindex, NetworkPermission index) return network.group_list[groupindex]->CanPerformAction(index); } -int32_t network_can_perform_command(uint32_t groupindex, int32_t index) +int32_t NetworkCanPerformCommand(uint32_t groupindex, int32_t index) { auto& network = OpenRCT2::GetContext()->GetNetwork(); Guard::IndexInRange(groupindex, network.group_list); @@ -3698,7 +3702,7 @@ int32_t network_can_perform_command(uint32_t groupindex, int32_t index) return network.group_list[groupindex]->CanPerformCommand(static_cast(index)); // TODO } -void network_set_pickup_peep(uint8_t playerid, Peep* peep) +void NetworkSetPickupPeep(uint8_t playerid, Peep* peep) { auto& network = OpenRCT2::GetContext()->GetNetwork(); if (network.GetMode() == NETWORK_MODE_NONE) @@ -3715,7 +3719,7 @@ void network_set_pickup_peep(uint8_t playerid, Peep* peep) } } -Peep* network_get_pickup_peep(uint8_t playerid) +Peep* NetworkGetPickupPeep(uint8_t playerid) { auto& network = OpenRCT2::GetContext()->GetNetwork(); if (network.GetMode() == NETWORK_MODE_NONE) @@ -3731,7 +3735,7 @@ Peep* network_get_pickup_peep(uint8_t playerid) return nullptr; } -void network_set_pickup_peep_old_x(uint8_t playerid, int32_t x) +void NetworkSetPickupPeepOldX(uint8_t playerid, int32_t x) { auto& network = OpenRCT2::GetContext()->GetNetwork(); if (network.GetMode() == NETWORK_MODE_NONE) @@ -3748,7 +3752,7 @@ void network_set_pickup_peep_old_x(uint8_t playerid, int32_t x) } } -int32_t network_get_pickup_peep_old_x(uint8_t playerid) +int32_t NetworkGetPickupPeepOldX(uint8_t playerid) { auto& network = OpenRCT2::GetContext()->GetNetwork(); if (network.GetMode() == NETWORK_MODE_NONE) @@ -3764,23 +3768,23 @@ int32_t network_get_pickup_peep_old_x(uint8_t playerid) return -1; } -bool network_is_server_player_invisible() +bool NetworkIsServerPlayerInvisible() { return OpenRCT2::GetContext()->GetNetwork().IsServerPlayerInvisible; } -int32_t network_get_current_player_group_index() +int32_t NetworkGetCurrentPlayerGroupIndex() { auto& network = OpenRCT2::GetContext()->GetNetwork(); NetworkPlayer* player = network.GetPlayerByID(network.GetPlayerID()); if (player != nullptr) { - return network_get_group_index(player->Group); + return NetworkGetGroupIndex(player->Group); } return -1; } -void network_send_chat(const char* text, const std::vector& playerIds) +void NetworkSendChat(const char* text, const std::vector& playerIds) { auto& network = OpenRCT2::GetContext()->GetNetwork(); if (network.GetMode() == NETWORK_MODE_CLIENT) @@ -3802,19 +3806,19 @@ void network_send_chat(const char* text, const std::vector& playerIds) // Server is one of the recipients ChatAddHistory(formatted); } - network.Server_Send_CHAT(formatted, playerIds); + network.ServerSendChat(formatted, playerIds); } } } } -void network_send_game_action(const GameAction* action) +void NetworkSendGameAction(const GameAction* action) { auto& network = OpenRCT2::GetContext()->GetNetwork(); switch (network.GetMode()) { case NETWORK_MODE_SERVER: - network.Server_Send_GAME_ACTION(action); + network.ServerSendGameAction(action); break; case NETWORK_MODE_CLIENT: network.Client_Send_GAME_ACTION(action); @@ -3822,10 +3826,10 @@ void network_send_game_action(const GameAction* action) } } -void network_send_password(const std::string& password) +void NetworkSendPassword(const std::string& password) { auto& network = OpenRCT2::GetContext()->GetNetwork(); - const auto keyPath = network_get_private_key_path(gConfigNetwork.PlayerName); + const auto keyPath = NetworkGetPrivateKeyPath(gConfigNetwork.PlayerName); if (!File::Exists(keyPath)) { LOG_ERROR("Private key %s missing! Restart the game to generate it.", keyPath.c_str()); @@ -3851,360 +3855,360 @@ void network_send_password(const std::string& password) network.Client_Send_AUTH(gConfigNetwork.PlayerName, password, pubkey, signature); } -void network_set_password(const char* password) +void NetworkSetPassword(const char* password) { auto& network = OpenRCT2::GetContext()->GetNetwork(); network.SetPassword(password); } -void network_append_chat_log(std::string_view text) +void NetworkAppendChatLog(std::string_view text) { auto& network = OpenRCT2::GetContext()->GetNetwork(); network.AppendChatLog(text); } -void network_append_server_log(const utf8* text) +void NetworkAppendServerLog(const utf8* text) { auto& network = OpenRCT2::GetContext()->GetNetwork(); network.AppendServerLog(text); } -static u8string network_get_keys_directory() +static u8string NetworkGetKeysDirectory() { auto env = GetContext()->GetPlatformEnvironment(); return Path::Combine(env->GetDirectoryPath(DIRBASE::USER), u8"keys"); } -static u8string network_get_private_key_path(u8string_view playerName) +static u8string NetworkGetPrivateKeyPath(u8string_view playerName) { - return Path::Combine(network_get_keys_directory(), u8string(playerName) + u8".privkey"); + return Path::Combine(NetworkGetKeysDirectory(), u8string(playerName) + u8".privkey"); } -static u8string network_get_public_key_path(u8string_view playerName, u8string_view hash) +static u8string NetworkGetPublicKeyPath(u8string_view playerName, u8string_view hash) { const auto filename = u8string(playerName) + u8"-" + u8string(hash) + u8".pubkey"; - return Path::Combine(network_get_keys_directory(), filename); + return Path::Combine(NetworkGetKeysDirectory(), filename); } -u8string network_get_server_name() +u8string NetworkGetServerName() { auto& network = OpenRCT2::GetContext()->GetNetwork(); return network.ServerName; } -u8string network_get_server_description() +u8string NetworkGetServerDescription() { auto& network = OpenRCT2::GetContext()->GetNetwork(); return network.ServerDescription; } -u8string network_get_server_greeting() +u8string NetworkGetServerGreeting() { auto& network = OpenRCT2::GetContext()->GetNetwork(); return network.ServerGreeting; } -u8string network_get_server_provider_name() +u8string NetworkGetServerProviderName() { auto& network = OpenRCT2::GetContext()->GetNetwork(); return network.ServerProviderName; } -u8string network_get_server_provider_email() +u8string NetworkGetServerProviderEmail() { auto& network = OpenRCT2::GetContext()->GetNetwork(); return network.ServerProviderEmail; } -u8string network_get_server_provider_website() +u8string NetworkGetServerProviderWebsite() { auto& network = OpenRCT2::GetContext()->GetNetwork(); return network.ServerProviderWebsite; } -std::string network_get_version() +std::string NetworkGetVersion() { return NETWORK_STREAM_ID; } -NetworkStats_t network_get_stats() +NetworkStats_t NetworkGetStats() { auto& network = OpenRCT2::GetContext()->GetNetwork(); return network.GetStats(); } -NetworkServerState_t network_get_server_state() +NetworkServerState_t NetworkGetServerState() { auto& network = OpenRCT2::GetContext()->GetNetwork(); return network.GetServerState(); } -bool network_gamestate_snapshots_enabled() +bool NetworkGamestateSnapshotsEnabled() { - return network_get_server_state().gamestateSnapshotsEnabled; + return NetworkGetServerState().gamestateSnapshotsEnabled; } -json_t network_get_server_info_as_json() +json_t NetworkGetServerInfoAsJson() { auto& network = OpenRCT2::GetContext()->GetNetwork(); return network.GetServerInfoAsJson(); } #else -int32_t network_get_mode() +int32_t NetworkGetMode() { return NETWORK_MODE_NONE; } -int32_t network_get_status() +int32_t NetworkGetStatus() { return NETWORK_STATUS_NONE; } -NetworkAuth network_get_authstatus() +NetworkAuth NetworkGetAuthstatus() { return NetworkAuth::None; } -uint32_t network_get_server_tick() +uint32_t NetworkGetServerTick() { return gCurrentTicks; } -void network_flush() +void NetworkFlush() { } -void network_send_tick() +void NetworkSendTick() { } -bool network_is_desynchronised() +bool NetworkIsDesynchronised() { return false; } -bool network_gamestate_snapshots_enabled() +bool NetworkGamestateSnapshotsEnabled() { return false; } -bool network_check_desynchronisation() +bool NetworkCheckDesynchronisation() { return false; } -void network_request_gamestate_snapshot() +void NetworkRequestGamestateSnapshot() { } -void network_send_game_action(const GameAction* action) +void NetworkSendGameAction(const GameAction* action) { } -void network_update() +void NetworkUpdate() { } -void network_process_pending() +void NetworkProcessPending() { } -int32_t network_begin_client(const std::string& host, int32_t port) +int32_t NetworkBeginClient(const std::string& host, int32_t port) { return 1; } -int32_t network_begin_server(int32_t port, const std::string& address) +int32_t NetworkBeginServer(int32_t port, const std::string& address) { return 1; } -int32_t network_get_num_players() +int32_t NetworkGetNumPlayers() { return 1; } -int32_t network_get_num_visible_players() +int32_t NetworkGetNumVisiblePlayers() { return 1; } -const char* network_get_player_name(uint32_t index) +const char* NetworkGetPlayerName(uint32_t index) { return "local (OpenRCT2 compiled without MP)"; } -uint32_t network_get_player_flags(uint32_t index) +uint32_t NetworkGetPlayerFlags(uint32_t index) { return 0; } -int32_t network_get_player_ping(uint32_t index) +int32_t NetworkGetPlayerPing(uint32_t index) { return 0; } -int32_t network_get_player_id(uint32_t index) +int32_t NetworkGetPlayerID(uint32_t index) { return 0; } -money32 network_get_player_money_spent(uint32_t index) +money32 NetworkGetPlayerMoneySpent(uint32_t index) { return 0.00_GBP; } -std::string network_get_player_ip_address(uint32_t id) +std::string NetworkGetPlayerIPAddress(uint32_t id) { return {}; } -std::string network_get_player_public_key_hash(uint32_t id) +std::string NetworkGetPlayerPublicKeyHash(uint32_t id) { return {}; } -void network_add_player_money_spent(uint32_t index, money32 cost) +void NetworkAddPlayerMoneySpent(uint32_t index, money32 cost) { } -int32_t network_get_player_last_action(uint32_t index, int32_t time) +int32_t NetworkGetPlayerLastAction(uint32_t index, int32_t time) { return -999; } -void network_set_player_last_action(uint32_t index, GameCommand command) +void NetworkSetPlayerLastAction(uint32_t index, GameCommand command) { } -CoordsXYZ network_get_player_last_action_coord(uint32_t index) +CoordsXYZ NetworkGetPlayerLastActionCoord(uint32_t index) { return { 0, 0, 0 }; } -void network_set_player_last_action_coord(uint32_t index, const CoordsXYZ& coord) +void NetworkSetPlayerLastActionCoord(uint32_t index, const CoordsXYZ& coord) { } -uint32_t network_get_player_commands_ran(uint32_t index) +uint32_t NetworkGetPlayerCommandsRan(uint32_t index) { return 0; } -int32_t network_get_player_index(uint32_t id) +int32_t NetworkGetPlayerIndex(uint32_t id) { return -1; } -uint8_t network_get_player_group(uint32_t index) +uint8_t NetworkGetPlayerGroup(uint32_t index) { return 0; } -void network_set_player_group(uint32_t index, uint32_t groupindex) +void NetworkSetPlayerGroup(uint32_t index, uint32_t groupindex) { } -int32_t network_get_group_index(uint8_t id) +int32_t NetworkGetGroupIndex(uint8_t id) { return -1; } -uint8_t network_get_group_id(uint32_t index) +uint8_t NetworkGetGroupID(uint32_t index) { return 0; } -int32_t network_get_num_groups() +int32_t NetworkGetNumGroups() { return 0; } -const char* network_get_group_name(uint32_t index) +const char* NetworkGetGroupName(uint32_t index) { return ""; }; -GameActions::Result network_set_player_group( +GameActions::Result NetworkSetPlayerGroup( NetworkPlayerId_t actionPlayerId, NetworkPlayerId_t playerId, uint8_t groupId, bool isExecuting) { return GameActions::Result(); } -GameActions::Result network_modify_groups( +GameActions::Result NetworkModifyGroups( NetworkPlayerId_t actionPlayerId, ModifyGroupType type, uint8_t groupId, const std::string& name, uint32_t permissionIndex, PermissionState permissionState, bool isExecuting) { return GameActions::Result(); } -GameActions::Result network_kick_player(NetworkPlayerId_t playerId, bool isExecuting) +GameActions::Result NetworkKickPlayer(NetworkPlayerId_t playerId, bool isExecuting) { return GameActions::Result(); } -uint8_t network_get_default_group() +uint8_t NetworkGetDefaultGroup() { return 0; } -int32_t network_get_num_actions() +int32_t NetworkGetNumActions() { return 0; } -StringId network_get_action_name_string_id(uint32_t index) +StringId NetworkGetActionNameStringID(uint32_t index) { return -1; } -int32_t network_can_perform_action(uint32_t groupindex, NetworkPermission index) +int32_t NetworkCanPerformAction(uint32_t groupindex, NetworkPermission index) { return 0; } -int32_t network_can_perform_command(uint32_t groupindex, int32_t index) +int32_t NetworkCanPerformCommand(uint32_t groupindex, int32_t index) { return 0; } -void network_set_pickup_peep(uint8_t playerid, Peep* peep) +void NetworkSetPickupPeep(uint8_t playerid, Peep* peep) { _pickup_peep = peep; } -Peep* network_get_pickup_peep(uint8_t playerid) +Peep* NetworkGetPickupPeep(uint8_t playerid) { return _pickup_peep; } -void network_set_pickup_peep_old_x(uint8_t playerid, int32_t x) +void NetworkSetPickupPeepOldX(uint8_t playerid, int32_t x) { _pickup_peep_old_x = x; } -int32_t network_get_pickup_peep_old_x(uint8_t playerid) +int32_t NetworkGetPickupPeepOldX(uint8_t playerid) { return _pickup_peep_old_x; } -void network_send_chat(const char* text, const std::vector& playerIds) +void NetworkSendChat(const char* text, const std::vector& playerIds) { } -void network_send_password(const std::string& password) +void NetworkSendPassword(const std::string& password) { } -void network_reconnect() +void NetworkReconnect() { } -void network_shutdown_client() +void NetworkShutdownClient() { } -void network_set_password(const char* password) +void NetworkSetPassword(const char* password) { } -uint8_t network_get_current_player_id() +uint8_t NetworkGetCurrentPlayerId() { return 0; } -int32_t network_get_current_player_group_index() +int32_t NetworkGetCurrentPlayerGroupIndex() { return 0; } -bool network_is_server_player_invisible() +bool NetworkIsServerPlayerInvisible() { return false; } -void network_append_chat_log(std::string_view) +void NetworkAppendChatLog(std::string_view) { } -void network_append_server_log(const utf8* text) +void NetworkAppendServerLog(const utf8* text) { } -u8string network_get_server_name() +u8string NetworkGetServerName() { return u8string(); } -u8string network_get_server_description() +u8string NetworkGetServerDescription() { return u8string(); } -u8string network_get_server_greeting() +u8string NetworkGetServerGreeting() { return u8string(); } -u8string network_get_server_provider_name() +u8string NetworkGetServerProviderName() { return u8string(); } -u8string network_get_server_provider_email() +u8string NetworkGetServerProviderEmail() { return u8string(); } -u8string network_get_server_provider_website() +u8string NetworkGetServerProviderWebsite() { return u8string(); } -std::string network_get_version() +std::string NetworkGetVersion() { return "Multiplayer disabled"; } -NetworkStats_t network_get_stats() +NetworkStats_t NetworkGetStats() { return NetworkStats_t{}; } -NetworkServerState_t network_get_server_state() +NetworkServerState_t NetworkGetServerState() { return NetworkServerState_t{}; } -json_t network_get_server_info_as_json() +json_t NetworkGetServerInfoAsJson() { return {}; } diff --git a/src/openrct2/network/NetworkBase.h b/src/openrct2/network/NetworkBase.h index e498158def..4c3aafd112 100644 --- a/src/openrct2/network/NetworkBase.h +++ b/src/openrct2/network/NetworkBase.h @@ -79,40 +79,40 @@ public: // Server void UpdateServer(); void ServerClientDisconnected(std::unique_ptr& connection); bool SaveMap(OpenRCT2::IStream* stream, const std::vector& objects) const; - std::vector save_for_network(const std::vector& objects) const; + std::vector SaveForNetwork(const std::vector& objects) const; std::string MakePlayerNameUnique(const std::string& name); // Packet dispatchers. - void Server_Send_AUTH(NetworkConnection& connection); - void Server_Send_TOKEN(NetworkConnection& connection); - void Server_Send_MAP(NetworkConnection* connection = nullptr); - void Server_Send_CHAT(const char* text, const std::vector& playerIds = {}); - void Server_Send_GAME_ACTION(const GameAction* action); - void Server_Send_TICK(); - void Server_Send_PLAYERINFO(int32_t playerId); - void Server_Send_PLAYERLIST(); - void Server_Send_PING(); - void Server_Send_PINGLIST(); - void Server_Send_SETDISCONNECTMSG(NetworkConnection& connection, const char* msg); - void Server_Send_GAMEINFO(NetworkConnection& connection); - void Server_Send_SHOWERROR(NetworkConnection& connection, StringId title, StringId message); - void Server_Send_GROUPLIST(NetworkConnection& connection); - void Server_Send_EVENT_PLAYER_JOINED(const char* playerName); - void Server_Send_EVENT_PLAYER_DISCONNECTED(const char* playerName, const char* reason); - void Server_Send_OBJECTS_LIST(NetworkConnection& connection, const std::vector& objects) const; - void Server_Send_SCRIPTS(NetworkConnection& connection); + void ServerSendAuth(NetworkConnection& connection); + void ServerSendToken(NetworkConnection& connection); + void ServerSendMap(NetworkConnection* connection = nullptr); + void ServerSendChat(const char* text, const std::vector& playerIds = {}); + void ServerSendGameAction(const GameAction* action); + void ServerSendTick(); + void ServerSendPlayerInfo(int32_t playerId); + void ServerSendPlayerList(); + void ServerSendPing(); + void ServerSendPingList(); + void ServerSendSetDisconnectMsg(NetworkConnection& connection, const char* msg); + void ServerSendGameInfo(NetworkConnection& connection); + void ServerSendShowError(NetworkConnection& connection, StringId title, StringId message); + void ServerSendGroupList(NetworkConnection& connection); + void ServerSendEventPlayerJoined(const char* playerName); + void ServerSendEventPlayerDisconnected(const char* playerName, const char* reason); + void ServerSendObjectsList(NetworkConnection& connection, const std::vector& objects) const; + void ServerSendScripts(NetworkConnection& connection); // Handlers - void Server_Handle_REQUEST_GAMESTATE(NetworkConnection& connection, NetworkPacket& packet); - void Server_Handle_HEARTBEAT(NetworkConnection& connection, NetworkPacket& packet); - void Server_Handle_AUTH(NetworkConnection& connection, NetworkPacket& packet); - void Server_Client_Joined(std::string_view name, const std::string& keyhash, NetworkConnection& connection); - void Server_Handle_CHAT(NetworkConnection& connection, NetworkPacket& packet); - void Server_Handle_GAME_ACTION(NetworkConnection& connection, NetworkPacket& packet); - void Server_Handle_PING(NetworkConnection& connection, NetworkPacket& packet); - void Server_Handle_GAMEINFO(NetworkConnection& connection, NetworkPacket& packet); - void Server_Handle_TOKEN(NetworkConnection& connection, NetworkPacket& packet); - void Server_Handle_MAPREQUEST(NetworkConnection& connection, NetworkPacket& packet); + void ServerHandleRequestGamestate(NetworkConnection& connection, NetworkPacket& packet); + void ServerHandleHeartbeat(NetworkConnection& connection, NetworkPacket& packet); + void ServerHandleAuth(NetworkConnection& connection, NetworkPacket& packet); + void ServerClientJoined(std::string_view name, const std::string& keyhash, NetworkConnection& connection); + void ServerHandleChat(NetworkConnection& connection, NetworkPacket& packet); + void ServerHandleGameAction(NetworkConnection& connection, NetworkPacket& packet); + void ServerHandlePing(NetworkConnection& connection, NetworkPacket& packet); + void ServerHandleGameInfo(NetworkConnection& connection, NetworkPacket& packet); + void ServerHandleToken(NetworkConnection& connection, NetworkPacket& packet); + void ServerHandleMapRequest(NetworkConnection& connection, NetworkPacket& packet); public: // Client void Reconnect(); diff --git a/src/openrct2/network/NetworkServerAdvertiser.cpp b/src/openrct2/network/NetworkServerAdvertiser.cpp index adc89b3096..10d107dc80 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.cpp +++ b/src/openrct2/network/NetworkServerAdvertiser.cpp @@ -132,7 +132,7 @@ private: json_t GetBroadcastJson() { - json_t root = network_get_server_info_as_json(); + json_t root = NetworkGetServerInfoAsJson(); root["port"] = _port; return root; } @@ -290,7 +290,7 @@ private: json_t GetHeartbeatJson() { - uint32_t numPlayers = network_get_num_visible_players(); + uint32_t numPlayers = NetworkGetNumVisiblePlayers(); json_t root = { { "token", _token }, diff --git a/src/openrct2/network/ServerList.cpp b/src/openrct2/network/ServerList.cpp index 284a465596..c50d418d93 100644 --- a/src/openrct2/network/ServerList.cpp +++ b/src/openrct2/network/ServerList.cpp @@ -47,8 +47,8 @@ int32_t ServerListEntry::CompareTo(const ServerListEntry& other) const return a.Local ? -1 : 1; } - bool serverACompatible = a.Version == network_get_version(); - bool serverBCompatible = b.Version == network_get_version(); + bool serverACompatible = a.Version == NetworkGetVersion(); + bool serverBCompatible = b.Version == NetworkGetVersion(); if (serverACompatible != serverBCompatible) { return serverACompatible ? -1 : 1; @@ -69,7 +69,7 @@ int32_t ServerListEntry::CompareTo(const ServerListEntry& other) const bool ServerListEntry::IsVersionValid() const noexcept { - return Version.empty() || Version == network_get_version(); + return Version.empty() || Version == NetworkGetVersion(); } std::optional ServerListEntry::FromJson(json_t& server) diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h index 1e19281d6d..fa85a6dd1a 100644 --- a/src/openrct2/network/network.h +++ b/src/openrct2/network/network.h @@ -36,82 +36,82 @@ enum class ModifyGroupType : uint8_t; enum class PermissionState : uint8_t; enum class NetworkPermission : uint32_t; -void network_reconnect(); -void network_shutdown_client(); -int32_t network_begin_client(const std::string& host, int32_t port); -int32_t network_begin_server(int32_t port, const std::string& address); +void NetworkReconnect(); +void NetworkShutdownClient(); +int32_t NetworkBeginClient(const std::string& host, int32_t port); +int32_t NetworkBeginServer(int32_t port, const std::string& address); -[[nodiscard]] int32_t network_get_mode(); -[[nodiscard]] int32_t network_get_status(); -bool network_is_desynchronised(); -bool network_check_desynchronisation(); -void network_request_gamestate_snapshot(); -void network_send_tick(); -bool network_gamestate_snapshots_enabled(); -void network_update(); -void network_process_pending(); -void network_flush(); +[[nodiscard]] int32_t NetworkGetMode(); +[[nodiscard]] int32_t NetworkGetStatus(); +bool NetworkIsDesynchronised(); +bool NetworkCheckDesynchronisation(); +void NetworkRequestGamestateSnapshot(); +void NetworkSendTick(); +bool NetworkGamestateSnapshotsEnabled(); +void NetworkUpdate(); +void NetworkProcessPending(); +void NetworkFlush(); -[[nodiscard]] NetworkAuth network_get_authstatus(); -[[nodiscard]] uint32_t network_get_server_tick(); -[[nodiscard]] uint8_t network_get_current_player_id(); -[[nodiscard]] int32_t network_get_num_players(); -[[nodiscard]] int32_t network_get_num_visible_players(); -[[nodiscard]] const char* network_get_player_name(uint32_t index); -[[nodiscard]] uint32_t network_get_player_flags(uint32_t index); -[[nodiscard]] int32_t network_get_player_ping(uint32_t index); -[[nodiscard]] int32_t network_get_player_id(uint32_t index); -[[nodiscard]] money32 network_get_player_money_spent(uint32_t index); -[[nodiscard]] std::string network_get_player_ip_address(uint32_t id); -[[nodiscard]] std::string network_get_player_public_key_hash(uint32_t id); -void network_add_player_money_spent(uint32_t index, money32 cost); -[[nodiscard]] int32_t network_get_player_last_action(uint32_t index, int32_t time); -void network_set_player_last_action(uint32_t index, GameCommand command); -[[nodiscard]] CoordsXYZ network_get_player_last_action_coord(uint32_t index); -void network_set_player_last_action_coord(uint32_t index, const CoordsXYZ& coord); -[[nodiscard]] uint32_t network_get_player_commands_ran(uint32_t index); -[[nodiscard]] int32_t network_get_player_index(uint32_t id); -[[nodiscard]] uint8_t network_get_player_group(uint32_t index); -void network_set_player_group(uint32_t index, uint32_t groupindex); -[[nodiscard]] int32_t network_get_group_index(uint8_t id); -[[nodiscard]] int32_t network_get_current_player_group_index(); -[[nodiscard]] uint8_t network_get_group_id(uint32_t index); -[[nodiscard]] int32_t network_get_num_groups(); -[[nodiscard]] const char* network_get_group_name(uint32_t index); -[[nodiscard]] GameActions::Result network_set_player_group( +[[nodiscard]] NetworkAuth NetworkGetAuthstatus(); +[[nodiscard]] uint32_t NetworkGetServerTick(); +[[nodiscard]] uint8_t NetworkGetCurrentPlayerId(); +[[nodiscard]] int32_t NetworkGetNumPlayers(); +[[nodiscard]] int32_t NetworkGetNumVisiblePlayers(); +[[nodiscard]] const char* NetworkGetPlayerName(uint32_t index); +[[nodiscard]] uint32_t NetworkGetPlayerFlags(uint32_t index); +[[nodiscard]] int32_t NetworkGetPlayerPing(uint32_t index); +[[nodiscard]] int32_t NetworkGetPlayerID(uint32_t index); +[[nodiscard]] money32 NetworkGetPlayerMoneySpent(uint32_t index); +[[nodiscard]] std::string NetworkGetPlayerIPAddress(uint32_t id); +[[nodiscard]] std::string NetworkGetPlayerPublicKeyHash(uint32_t id); +void NetworkAddPlayerMoneySpent(uint32_t index, money32 cost); +[[nodiscard]] int32_t NetworkGetPlayerLastAction(uint32_t index, int32_t time); +void NetworkSetPlayerLastAction(uint32_t index, GameCommand command); +[[nodiscard]] CoordsXYZ NetworkGetPlayerLastActionCoord(uint32_t index); +void NetworkSetPlayerLastActionCoord(uint32_t index, const CoordsXYZ& coord); +[[nodiscard]] uint32_t NetworkGetPlayerCommandsRan(uint32_t index); +[[nodiscard]] int32_t NetworkGetPlayerIndex(uint32_t id); +[[nodiscard]] uint8_t NetworkGetPlayerGroup(uint32_t index); +void NetworkSetPlayerGroup(uint32_t index, uint32_t groupindex); +[[nodiscard]] int32_t NetworkGetGroupIndex(uint8_t id); +[[nodiscard]] int32_t NetworkGetCurrentPlayerGroupIndex(); +[[nodiscard]] uint8_t NetworkGetGroupID(uint32_t index); +[[nodiscard]] int32_t NetworkGetNumGroups(); +[[nodiscard]] const char* NetworkGetGroupName(uint32_t index); +[[nodiscard]] GameActions::Result NetworkSetPlayerGroup( NetworkPlayerId_t actionPlayerId, NetworkPlayerId_t playerId, uint8_t groupId, bool isExecuting); -[[nodiscard]] GameActions::Result network_modify_groups( +[[nodiscard]] GameActions::Result NetworkModifyGroups( NetworkPlayerId_t actionPlayerId, ModifyGroupType type, uint8_t groupId, const std::string& name, uint32_t permissionIndex, PermissionState permissionState, bool isExecuting); -[[nodiscard]] GameActions::Result network_kick_player(NetworkPlayerId_t playerId, bool isExecuting); -[[nodiscard]] uint8_t network_get_default_group(); -[[nodiscard]] int32_t network_get_num_actions(); -[[nodiscard]] StringId network_get_action_name_string_id(uint32_t index); -[[nodiscard]] int32_t network_can_perform_action(uint32_t groupindex, NetworkPermission index); -[[nodiscard]] int32_t network_can_perform_command(uint32_t groupindex, int32_t index); -void network_set_pickup_peep(uint8_t playerid, Peep* peep); -[[nodiscard]] Peep* network_get_pickup_peep(uint8_t playerid); -void network_set_pickup_peep_old_x(uint8_t playerid, int32_t x); -[[nodiscard]] int32_t network_get_pickup_peep_old_x(uint8_t playerid); -[[nodiscard]] bool network_is_server_player_invisible(); +[[nodiscard]] GameActions::Result NetworkKickPlayer(NetworkPlayerId_t playerId, bool isExecuting); +[[nodiscard]] uint8_t NetworkGetDefaultGroup(); +[[nodiscard]] int32_t NetworkGetNumActions(); +[[nodiscard]] StringId NetworkGetActionNameStringID(uint32_t index); +[[nodiscard]] int32_t NetworkCanPerformAction(uint32_t groupindex, NetworkPermission index); +[[nodiscard]] int32_t NetworkCanPerformCommand(uint32_t groupindex, int32_t index); +void NetworkSetPickupPeep(uint8_t playerid, Peep* peep); +[[nodiscard]] Peep* NetworkGetPickupPeep(uint8_t playerid); +void NetworkSetPickupPeepOldX(uint8_t playerid, int32_t x); +[[nodiscard]] int32_t NetworkGetPickupPeepOldX(uint8_t playerid); +[[nodiscard]] bool NetworkIsServerPlayerInvisible(); -void network_send_chat(const char* text, const std::vector& playerIds = {}); -void network_send_game_action(const GameAction* action); -void network_send_password(const std::string& password); +void NetworkSendChat(const char* text, const std::vector& playerIds = {}); +void NetworkSendGameAction(const GameAction* action); +void NetworkSendPassword(const std::string& password); -void network_set_password(const char* password); +void NetworkSetPassword(const char* password); -void network_append_chat_log(std::string_view text); -void network_append_server_log(const utf8* text); -[[nodiscard]] u8string network_get_server_name(); -[[nodiscard]] u8string network_get_server_description(); -[[nodiscard]] u8string network_get_server_greeting(); -[[nodiscard]] u8string network_get_server_provider_name(); -[[nodiscard]] u8string network_get_server_provider_email(); -[[nodiscard]] u8string network_get_server_provider_website(); +void NetworkAppendChatLog(std::string_view text); +void NetworkAppendServerLog(const utf8* text); +[[nodiscard]] u8string NetworkGetServerName(); +[[nodiscard]] u8string NetworkGetServerDescription(); +[[nodiscard]] u8string NetworkGetServerGreeting(); +[[nodiscard]] u8string NetworkGetServerProviderName(); +[[nodiscard]] u8string NetworkGetServerProviderEmail(); +[[nodiscard]] u8string NetworkGetServerProviderWebsite(); -[[nodiscard]] std::string network_get_version(); +[[nodiscard]] std::string NetworkGetVersion(); -[[nodiscard]] NetworkStats_t network_get_stats(); -[[nodiscard]] NetworkServerState_t network_get_server_state(); -[[nodiscard]] json_t network_get_server_info_as_json(); +[[nodiscard]] NetworkStats_t NetworkGetStats(); +[[nodiscard]] NetworkServerState_t NetworkGetServerState(); +[[nodiscard]] json_t NetworkGetServerInfoAsJson(); diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index e03330eae4..2d19e3a30c 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -445,7 +445,7 @@ namespace OpenRCT2 if (cs.GetMode() == OrcaStream::Mode::READING) { auto earlyCompletion = cs.Read(); - if (network_get_mode() == NETWORK_MODE_CLIENT) + if (NetworkGetMode() == NETWORK_MODE_CLIENT) { gAllowEarlyCompletionInNetworkPlay = earlyCompletion; } diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp index df3f21867c..f682a36e48 100644 --- a/src/openrct2/ride/RideConstruction.cpp +++ b/src/openrct2/ride/RideConstruction.cpp @@ -229,7 +229,7 @@ void RideClearForConstruction(Ride& ride) // Open circuit rides will go directly into building mode (creating ghosts) where it would normally clear the stats, // however this causes desyncs since it's directly run from the window and other clients would not get it. // To prevent these problems, unconditionally invalidate the test results on all clients in multiplayer games. - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { InvalidateTestResults(ride); } diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index 2a20892a5b..e8e8a6e802 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -854,7 +854,7 @@ ObjectiveStatus Objective::CheckMonthlyFoodIncome() const */ bool AllowEarlyCompletion() { - switch (network_get_mode()) + switch (NetworkGetMode()) { case NETWORK_MODE_CLIENT: return gAllowEarlyCompletionInNetworkPlay; diff --git a/src/openrct2/scripting/ScriptEngine.cpp b/src/openrct2/scripting/ScriptEngine.cpp index 59bf98ebf9..3aaa6b82ce 100644 --- a/src/openrct2/scripting/ScriptEngine.cpp +++ b/src/openrct2/scripting/ScriptEngine.cpp @@ -556,7 +556,7 @@ void ScriptEngine::RefreshPlugins() } // Turn on hot reload if not already enabled - if (!_hotReloadingInitialised && gConfigPlugin.EnableHotReloading && network_get_mode() == NETWORK_MODE_NONE) + if (!_hotReloadingInitialised && gConfigPlugin.EnableHotReloading && NetworkGetMode() == NETWORK_MODE_NONE) { SetupHotReloading(); } @@ -876,7 +876,7 @@ void ScriptEngine::StartTransientPlugins() bool ScriptEngine::ShouldStartPlugin(const std::shared_ptr& plugin) { - auto networkMode = network_get_mode(); + auto networkMode = NetworkGetMode(); if (networkMode == NETWORK_MODE_CLIENT) { // Only client plugins and plugins downloaded from server should be started @@ -1494,9 +1494,9 @@ std::unique_ptr ScriptEngine::CreateGameAction(const std::string& ac duk_pop(ctx); auto customAction = std::make_unique(actionid, json); - if (customAction->GetPlayer() == -1 && network_get_mode() != NETWORK_MODE_NONE) + if (customAction->GetPlayer() == -1 && NetworkGetMode() != NETWORK_MODE_NONE) { - customAction->SetPlayer(network_get_current_player_id()); + customAction->SetPlayer(NetworkGetCurrentPlayerId()); } return customAction; } @@ -1723,7 +1723,7 @@ std::string OpenRCT2::Scripting::ProcessString(const DukValue& value) bool OpenRCT2::Scripting::IsGameStateMutable() { // Allow single player to alter game state anywhere - if (network_get_mode() == NETWORK_MODE_NONE) + if (NetworkGetMode() == NETWORK_MODE_NONE) { return true; } @@ -1736,7 +1736,7 @@ bool OpenRCT2::Scripting::IsGameStateMutable() void OpenRCT2::Scripting::ThrowIfGameStateNotMutable() { // Allow single player to alter game state anywhere - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { auto& scriptEngine = GetContext()->GetScriptEngine(); auto& execInfo = scriptEngine.GetExecInfo(); diff --git a/src/openrct2/scripting/bindings/network/ScNetwork.cpp b/src/openrct2/scripting/bindings/network/ScNetwork.cpp index a8b02054f7..9a2ce39ff7 100644 --- a/src/openrct2/scripting/bindings/network/ScNetwork.cpp +++ b/src/openrct2/scripting/bindings/network/ScNetwork.cpp @@ -27,7 +27,7 @@ namespace OpenRCT2::Scripting std::string ScNetwork::mode_get() const { # ifndef DISABLE_NETWORK - switch (network_get_mode()) + switch (NetworkGetMode()) { case NETWORK_MODE_SERVER: return "server"; @@ -41,7 +41,7 @@ namespace OpenRCT2::Scripting int32_t ScNetwork::numPlayers_get() const { # ifndef DISABLE_NETWORK - return network_get_num_players(); + return NetworkGetNumPlayers(); # else return 0; # endif @@ -50,7 +50,7 @@ namespace OpenRCT2::Scripting int32_t ScNetwork::numGroups_get() const { # ifndef DISABLE_NETWORK - return network_get_num_groups(); + return NetworkGetNumGroups(); # else return 0; # endif @@ -59,7 +59,7 @@ namespace OpenRCT2::Scripting int32_t ScNetwork::defaultGroup_get() const { # ifndef DISABLE_NETWORK - return network_get_default_group(); + return NetworkGetDefaultGroup(); # else return 0; # endif @@ -77,10 +77,10 @@ namespace OpenRCT2::Scripting { std::vector> groups; # ifndef DISABLE_NETWORK - auto numGroups = network_get_num_groups(); + auto numGroups = NetworkGetNumGroups(); for (int32_t i = 0; i < numGroups; i++) { - auto groupId = network_get_group_id(i); + auto groupId = NetworkGetGroupID(i); groups.push_back(std::make_shared(groupId)); } # endif @@ -91,10 +91,10 @@ namespace OpenRCT2::Scripting { std::vector> players; # ifndef DISABLE_NETWORK - auto numPlayers = network_get_num_players(); + auto numPlayers = NetworkGetNumPlayers(); for (int32_t i = 0; i < numPlayers; i++) { - auto playerId = network_get_player_id(i); + auto playerId = NetworkGetPlayerID(i); players.push_back(std::make_shared(playerId)); } # endif @@ -105,7 +105,7 @@ namespace OpenRCT2::Scripting { std::shared_ptr player; # ifndef DISABLE_NETWORK - auto playerId = network_get_current_player_id(); + auto playerId = NetworkGetCurrentPlayerId(); player = std::make_shared(playerId); # endif return player; @@ -114,10 +114,10 @@ namespace OpenRCT2::Scripting std::shared_ptr ScNetwork::getPlayer(int32_t index) const { # ifndef DISABLE_NETWORK - auto numPlayers = network_get_num_players(); + auto numPlayers = NetworkGetNumPlayers(); if (index < numPlayers) { - auto playerId = network_get_player_id(index); + auto playerId = NetworkGetPlayerID(index); return std::make_shared(playerId); } # endif @@ -128,7 +128,7 @@ namespace OpenRCT2::Scripting { # ifndef DISABLE_NETWORK auto obj = OpenRCT2::Scripting::DukObject(_context); - auto networkStats = network_get_stats(); + auto networkStats = NetworkGetStats(); { duk_push_array(_context); duk_uarridx_t index = 0; @@ -160,10 +160,10 @@ namespace OpenRCT2::Scripting std::shared_ptr ScNetwork::getGroup(int32_t index) const { # ifndef DISABLE_NETWORK - auto numGroups = network_get_num_groups(); + auto numGroups = NetworkGetNumGroups(); if (index < numGroups) { - auto groupId = network_get_group_id(index); + auto groupId = NetworkGetGroupID(index); return std::make_shared(groupId); } # endif @@ -181,10 +181,10 @@ namespace OpenRCT2::Scripting void ScNetwork::removeGroup(int32_t index) { # ifndef DISABLE_NETWORK - auto numGroups = network_get_num_groups(); + auto numGroups = NetworkGetNumGroups(); if (index < numGroups) { - auto groupId = network_get_group_id(index); + auto groupId = NetworkGetGroupID(index); auto networkAction = NetworkModifyGroupAction(ModifyGroupType::RemoveGroup, groupId); GameActions::Execute(&networkAction); } @@ -194,10 +194,10 @@ namespace OpenRCT2::Scripting void ScNetwork::kickPlayer(int32_t index) { # ifndef DISABLE_NETWORK - auto numPlayers = network_get_num_players(); + auto numPlayers = NetworkGetNumPlayers(); if (index < numPlayers) { - auto playerId = network_get_player_id(index); + auto playerId = NetworkGetPlayerID(index); auto kickPlayerAction = PlayerKickAction(playerId); GameActions::Execute(&kickPlayerAction); } @@ -209,7 +209,7 @@ namespace OpenRCT2::Scripting # ifndef DISABLE_NETWORK if (players.is_array()) { - if (network_get_mode() == NETWORK_MODE_SERVER) + if (NetworkGetMode() == NETWORK_MODE_SERVER) { std::vector playerIds; auto playerArray = players.as_array(); @@ -222,7 +222,7 @@ namespace OpenRCT2::Scripting } if (!playerArray.empty()) { - network_send_chat(message.c_str(), playerIds); + NetworkSendChat(message.c_str(), playerIds); } } else @@ -232,7 +232,7 @@ namespace OpenRCT2::Scripting } else { - network_send_chat(message.c_str()); + NetworkSendChat(message.c_str()); } # endif } diff --git a/src/openrct2/scripting/bindings/network/ScPlayer.cpp b/src/openrct2/scripting/bindings/network/ScPlayer.cpp index 3cc834802e..8c6e6db131 100644 --- a/src/openrct2/scripting/bindings/network/ScPlayer.cpp +++ b/src/openrct2/scripting/bindings/network/ScPlayer.cpp @@ -31,10 +31,10 @@ namespace OpenRCT2::Scripting std::string ScPlayer::name_get() const { # ifndef DISABLE_NETWORK - auto index = network_get_player_index(_id); + auto index = NetworkGetPlayerIndex(_id); if (index == -1) return {}; - return network_get_player_name(index); + return NetworkGetPlayerName(index); # else return {}; # endif @@ -43,10 +43,10 @@ namespace OpenRCT2::Scripting int32_t ScPlayer::group_get() const { # ifndef DISABLE_NETWORK - auto index = network_get_player_index(_id); + auto index = NetworkGetPlayerIndex(_id); if (index == -1) return {}; - return network_get_player_group(index); + return NetworkGetPlayerGroup(index); # else return 0; # endif @@ -62,10 +62,10 @@ namespace OpenRCT2::Scripting int32_t ScPlayer::ping_get() const { # ifndef DISABLE_NETWORK - auto index = network_get_player_index(_id); + auto index = NetworkGetPlayerIndex(_id); if (index == -1) return {}; - return network_get_player_ping(index); + return NetworkGetPlayerPing(index); # else return 0; # endif @@ -74,10 +74,10 @@ namespace OpenRCT2::Scripting int32_t ScPlayer::commandsRan_get() const { # ifndef DISABLE_NETWORK - auto index = network_get_player_index(_id); + auto index = NetworkGetPlayerIndex(_id); if (index == -1) return {}; - return network_get_player_commands_ran(index); + return NetworkGetPlayerCommandsRan(index); # else return 0; # endif @@ -86,10 +86,10 @@ namespace OpenRCT2::Scripting int32_t ScPlayer::moneySpent_get() const { # ifndef DISABLE_NETWORK - auto index = network_get_player_index(_id); + auto index = NetworkGetPlayerIndex(_id); if (index == -1) return {}; - return network_get_player_money_spent(index); + return NetworkGetPlayerMoneySpent(index); # else return 0; # endif @@ -97,12 +97,12 @@ namespace OpenRCT2::Scripting std::string ScPlayer::ipAddress_get() const { - return network_get_player_ip_address(_id); + return NetworkGetPlayerIPAddress(_id); } std::string ScPlayer::publicKeyHash_get() const { - return network_get_player_public_key_hash(_id); + return NetworkGetPlayerPublicKeyHash(_id); } void ScPlayer::Register(duk_context* ctx) diff --git a/src/openrct2/scripting/bindings/network/ScPlayerGroup.cpp b/src/openrct2/scripting/bindings/network/ScPlayerGroup.cpp index 3f147e0cc5..64db500a65 100644 --- a/src/openrct2/scripting/bindings/network/ScPlayerGroup.cpp +++ b/src/openrct2/scripting/bindings/network/ScPlayerGroup.cpp @@ -34,10 +34,10 @@ namespace OpenRCT2::Scripting std::string ScPlayerGroup::name_get() const { # ifndef DISABLE_NETWORK - auto index = network_get_group_index(_id); + auto index = NetworkGetGroupIndex(_id); if (index == -1) return {}; - return network_get_group_name(index); + return NetworkGetGroupName(index); # else return {}; # endif @@ -71,7 +71,7 @@ namespace OpenRCT2::Scripting std::vector ScPlayerGroup::permissions_get() const { # ifndef DISABLE_NETWORK - auto index = network_get_group_index(_id); + auto index = NetworkGetGroupIndex(_id); if (index == -1) return {}; @@ -80,7 +80,7 @@ namespace OpenRCT2::Scripting auto permissionIndex = 0; for (const auto& action : NetworkActions::Actions) { - if (network_can_perform_action(index, static_cast(permissionIndex))) + if (NetworkCanPerformAction(index, static_cast(permissionIndex))) { result.push_back(TransformPermissionKeyToJS(action.PermissionName)); } @@ -95,7 +95,7 @@ namespace OpenRCT2::Scripting void ScPlayerGroup::permissions_set(std::vector value) { # ifndef DISABLE_NETWORK - auto groupIndex = network_get_group_index(_id); + auto groupIndex = NetworkGetGroupIndex(_id); if (groupIndex == -1) return; @@ -123,7 +123,7 @@ namespace OpenRCT2::Scripting for (size_t i = 0; i < enabledPermissions.size(); i++) { auto toggle - = (enabledPermissions[i] != (network_can_perform_action(groupIndex, static_cast(i)) != 0)); + = (enabledPermissions[i] != (NetworkCanPerformAction(groupIndex, static_cast(i)) != 0)); if (toggle) { auto networkAction2 = NetworkModifyGroupAction( diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index 33d2af1ed2..693b068794 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -1360,7 +1360,7 @@ void MapRemoveProvisionalElements() } // This is in non performant so only make network games suffer for it // non networked games do not need this as its to prevent desyncs. - if ((network_get_mode() != NETWORK_MODE_NONE) && WindowFindByClass(WindowClass::TrackDesignPlace) != nullptr) + if ((NetworkGetMode() != NETWORK_MODE_NONE) && WindowFindByClass(WindowClass::TrackDesignPlace) != nullptr) { auto intent = Intent(INTENT_ACTION_TRACK_DESIGN_REMOVE_PROVISIONAL); ContextBroadcastIntent(&intent); @@ -1385,7 +1385,7 @@ void MapRestoreProvisionalElements() } // This is in non performant so only make network games suffer for it // non networked games do not need this as its to prevent desyncs. - if ((network_get_mode() != NETWORK_MODE_NONE) && WindowFindByClass(WindowClass::TrackDesignPlace) != nullptr) + if ((NetworkGetMode() != NETWORK_MODE_NONE) && WindowFindByClass(WindowClass::TrackDesignPlace) != nullptr) { auto intent = Intent(INTENT_ACTION_TRACK_DESIGN_RESTORE_PROVISIONAL); ContextBroadcastIntent(&intent); diff --git a/src/openrct2/world/Scenery.cpp b/src/openrct2/world/Scenery.cpp index 02ce6d8dd3..42350c4a7b 100644 --- a/src/openrct2/world/Scenery.cpp +++ b/src/openrct2/world/Scenery.cpp @@ -131,7 +131,7 @@ void SceneryUpdateTile(const CoordsXY& sceneryPos) { // Ghosts are purely this-client-side and should not cause any interaction, // as that may lead to a desync. - if (network_get_mode() != NETWORK_MODE_NONE) + if (NetworkGetMode() != NETWORK_MODE_NONE) { if (tileElement->IsGhost()) continue;