From 966129dd7cd2f1dcd952b714974d4e0e32419398 Mon Sep 17 00:00:00 2001 From: Ted John Date: Sat, 6 Mar 2021 13:47:06 +0000 Subject: [PATCH] Remove network traffic window Now available in the DevTools plugin. --- OpenRCT2.xcodeproj/project.pbxproj | 4 - data/language/en-GB.txt | 9 - distribution/changelog.txt | 1 + src/openrct2-ui/WindowManager.cpp | 2 - src/openrct2-ui/libopenrct2ui.vcxproj | 3 +- src/openrct2-ui/windows/Network.cpp | 470 ------------------------- src/openrct2-ui/windows/TopToolbar.cpp | 7 +- src/openrct2-ui/windows/Window.h | 1 - src/openrct2/interface/Window.h | 1 - src/openrct2/localisation/StringIds.h | 13 - 10 files changed, 3 insertions(+), 508 deletions(-) delete mode 100644 src/openrct2-ui/windows/Network.cpp diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index 78666ebe03..343dfc1f93 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -29,7 +29,6 @@ 20DE495F25DA8C6B00F2DF6D /* TileElementBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20DE495E25DA8C6B00F2DF6D /* TileElementBase.cpp */; }; 2A1F4FE1221FF4B0003CA045 /* Audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83571EC4E7CC00FA49E2 /* Audio.cpp */; }; 2A1F4FE2221FF4B0003CA045 /* macos.mm in Sources */ = {isa = PBXBuildFile; fileRef = F76C845D1EC4E7CC00FA49E2 /* macos.mm */; }; - 2A5354E922099C4F00A5440F /* Network.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A5354E822099C4F00A5440F /* Network.cpp */; }; 2ADE2F27224418B2002598AF /* Random.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 2ADE2F21224418B1002598AF /* Random.hpp */; }; 2ADE2F28224418B2002598AF /* DataSerialiserTag.h in Headers */ = {isa = PBXBuildFile; fileRef = 2ADE2F22224418B1002598AF /* DataSerialiserTag.h */; }; 2ADE2F29224418B2002598AF /* Numerics.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 2ADE2F23224418B1002598AF /* Numerics.hpp */; }; @@ -840,7 +839,6 @@ 01C6F0C722FD51FC0057E2F7 /* T6Exporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = T6Exporter.h; sourceTree = ""; }; 01DDFE6422FD608500221318 /* Window_internal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Window_internal.cpp; sourceTree = ""; }; 20DE495E25DA8C6B00F2DF6D /* TileElementBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TileElementBase.cpp; sourceTree = ""; }; - 2A5354E822099C4F00A5440F /* Network.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Network.cpp; sourceTree = ""; }; 2A5354EA22099C7200A5440F /* CircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircularBuffer.h; sourceTree = ""; }; 2ADE2F21224418B1002598AF /* Random.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Random.hpp; sourceTree = ""; }; 2ADE2F22224418B1002598AF /* DataSerialiserTag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataSerialiserTag.h; sourceTree = ""; }; @@ -3971,7 +3969,6 @@ C6D2BEE51F9BAACD008B557C /* MazeConstruction.cpp */, C666EE5C1F37ACB10061AA04 /* Multiplayer.cpp */, C666EE5D1F37ACB10061AA04 /* MusicCredits.cpp */, - 2A5354E822099C4F00A5440F /* Network.cpp */, C6D2BEE91F9BB83B008B557C /* NetworkStatus.cpp */, C654DF231F69C0430040F43D /* NewCampaign.cpp */, C685E5141F8907840090598F /* NewRide.cpp */, @@ -4619,7 +4616,6 @@ 01C6F0C222FD519E0057E2F7 /* TrackImporter.cpp in Sources */, 4C8BB68125533D65005C8830 /* StringBuilder.cpp in Sources */, C666EE761F37ACB10061AA04 /* Options.cpp in Sources */, - 2A5354E922099C4F00A5440F /* Network.cpp in Sources */, 4CB991CC25CEE54500C692B4 /* Shortcuts.cpp in Sources */, C666EE6E1F37ACB10061AA04 /* CustomCurrency.cpp in Sources */, C654DF2D1F69C0430040F43D /* Banner.cpp in Sources */, diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index b776b0a1e3..d871161682 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -3537,15 +3537,6 @@ STR_6280 :Chat STR_6281 :Show a separate button for the Chat window in the toolbar STR_6282 :Chat STR_6283 :Chat not available at this time. Are you connected to a server? -STR_6284 :Network -STR_6285 :Network Information -STR_6286 :Receive -STR_6287 :Send -STR_6288 :Total received -STR_6289 :Total sent -STR_6290 :Base protocol -STR_6291 :Commands -STR_6292 :Map STR_6293 :B STR_6294 :KiB STR_6295 :MiB diff --git a/distribution/changelog.txt b/distribution/changelog.txt index c63ad504b0..67886b54f4 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -61,6 +61,7 @@ - Improved: [#12917] Changed peep movement so that they stay more spread out over the full width of single tile paths. - Improved: [#13386] A GUI error message is now displayed if the language files are missing. - Removed: [#13423] Built-in explode guests cheat (replaced by plug-in). +- Removed: [#14186] Network traffic window (replaced by plug-in). 0.3.2 (2020-11-01) ------------------------------------------------------------------------ diff --git a/src/openrct2-ui/WindowManager.cpp b/src/openrct2-ui/WindowManager.cpp index c7fa4563f5..aa82b7f493 100644 --- a/src/openrct2-ui/WindowManager.cpp +++ b/src/openrct2-ui/WindowManager.cpp @@ -132,8 +132,6 @@ public: return window_viewport_open(); case WC_WATER: return window_water_open(); - case WC_NETWORK: - return window_network_open(); default: Console::Error::WriteLine("Unhandled window class (%d)", wc); return nullptr; diff --git a/src/openrct2-ui/libopenrct2ui.vcxproj b/src/openrct2-ui/libopenrct2ui.vcxproj index 736db9ad95..ed4b381cce 100644 --- a/src/openrct2-ui/libopenrct2ui.vcxproj +++ b/src/openrct2-ui/libopenrct2ui.vcxproj @@ -148,7 +148,6 @@ - @@ -216,4 +215,4 @@ - \ No newline at end of file + diff --git a/src/openrct2-ui/windows/Network.cpp b/src/openrct2-ui/windows/Network.cpp deleted file mode 100644 index 9bdc01b42f..0000000000 --- a/src/openrct2-ui/windows/Network.cpp +++ /dev/null @@ -1,470 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2014-2020 OpenRCT2 developers - * - * For a complete list of all authors, please refer to contributors.md - * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2 - * - * OpenRCT2 is licensed under the GNU General Public License version 3. - *****************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// clang-format off -enum { - WINDOW_NETWORK_PAGE_INFORMATION, -}; - -static constexpr const int32_t WW = 450; -static constexpr const int32_t WH = 210; - -enum WINDOW_NETWORK_WIDGET_IDX { - WIDX_BACKGROUND, - WIDX_TITLE, - WIDX_CLOSE, - WIDX_RESIZE, - WIDX_TAB1, -}; - -static rct_widget window_network_information_widgets[] = { - WINDOW_SHIM(STR_NONE, WW, WH), - MakeWidget({ 0, 43}, {450, 167}, WindowWidgetType::Resize, WindowColour::Secondary), // content panel - MakeTab ({ 3, 17}, STR_SHOW_SERVER_INFO_TIP ), // tab - { WIDGETS_END } -}; - -static rct_widget *window_network_page_widgets[] = { - window_network_information_widgets, -}; - -static constexpr const uint64_t window_network_page_enabled_widgets[] = { - (1 << WIDX_CLOSE) | (1 << WIDX_TAB1), -}; - -static constexpr rct_string_id WindowNetworkPageTitles[] = { - STR_NETWORK_INFORMATION_TITLE, -}; - -static void window_network_information_mouseup(rct_window *w, rct_widgetindex widgetIndex); -static void window_network_information_resize(rct_window *w); -static void window_network_information_update(rct_window *w); -static void window_network_information_invalidate(rct_window *w); -static void window_network_information_paint(rct_window *w, rct_drawpixelinfo *dpi); - -struct NetworkHistory_t -{ - std::array deltaBytesReceived; - std::array deltaBytesSent; -}; - -static NetworkStats_t _networkStats; -static NetworkHistory_t _networkLastDeltaStats; -static NetworkHistory_t _networkAccumulatedStats; - -static float _graphMaxIn; -static float _graphMaxOut; - -static float _bytesInSec; -static float _bytesOutSec; -static uint32_t _bytesIn; -static uint32_t _bytesOut; - -static uint32_t _lastGraphUpdateTime; -static uint32_t _lastStatsUpdateTime; - -static CircularBuffer _networkHistory; - -static constexpr int32_t NetworkTrafficGroupColors[EnumValue(NetworkStatisticsGroup::Max)] = { - PALETTE_INDEX_21, - PALETTE_INDEX_102, - PALETTE_INDEX_138, - PALETTE_INDEX_171, -}; - -static constexpr int32_t NetworkTrafficGroupNames[EnumValue(NetworkStatisticsGroup::Max)] = { - STR_NETWORK, - STR_NETWORK_LEGEND_BASE, - STR_NETWORK_LEGEND_COMMANDS, - STR_NETWORK_LEGEND_MAPDATA, -}; - -static rct_window_event_list window_network_information_events([](auto& events) -{ - events.mouse_up = &window_network_information_mouseup; - events.resize = &window_network_information_resize; - events.update = &window_network_information_update; - events.invalidate = &window_network_information_invalidate; - events.paint = &window_network_information_paint; -}); - -static rct_window_event_list *window_network_page_events[] = { - &window_network_information_events, -}; -// clang-format on - -static constexpr const int32_t window_network_animation_divisor[] = { 4, 4, 2, 2 }; -static constexpr const int32_t window_network_animation_frames[] = { 8, 8, 7, 4 }; - -static void window_network_draw_tab_images(rct_window* w, rct_drawpixelinfo* dpi); -static void window_network_set_page(rct_window* w, int32_t page); - -rct_window* window_network_open() -{ - // Check if window is already open - rct_window* window = window_bring_to_front_by_class(WC_NETWORK); - if (window == nullptr) - { - window = WindowCreateAutoPos(320, 144, &window_network_information_events, WC_NETWORK, WF_10 | WF_RESIZABLE); - window_network_set_page(window, WINDOW_NETWORK_PAGE_INFORMATION); - - // Fill the buffer so it will start scrolling in. - _networkHistory.clear(); - for (size_t i = 0; i < _networkHistory.capacity(); i++) - { - _networkHistory.push_back(NetworkHistory_t{}); - } - } - - _networkStats = network_get_stats(); - _networkAccumulatedStats = {}; - - return window; -} - -static void window_network_set_page(rct_window* w, int32_t page) -{ - w->page = page; - w->frame_no = 0; - w->no_list_items = 0; - w->selected_list_item = -1; - - w->enabled_widgets = window_network_page_enabled_widgets[page]; - w->hold_down_widgets = 0; - w->event_handlers = window_network_page_events[page]; - w->pressed_widgets = 0; - w->widgets = window_network_page_widgets[page]; - w->widgets[WIDX_TITLE].text = WindowNetworkPageTitles[page]; - - window_event_resize_call(w); - window_event_invalidate_call(w); - WindowInitScrollWidgets(w); - w->Invalidate(); -} - -static void window_network_anchor_border_widgets(rct_window* w) -{ - w->widgets[WIDX_BACKGROUND].right = w->width - 1; - w->widgets[WIDX_BACKGROUND].bottom = w->height - 1; - w->widgets[WIDX_TITLE].right = w->width - 2; - w->widgets[WIDX_RESIZE].right = w->width - 1; - w->widgets[WIDX_RESIZE].bottom = w->height - 1; - w->widgets[WIDX_CLOSE].left = w->width - 13; - w->widgets[WIDX_CLOSE].right = w->width - 3; -} - -static void window_network_set_pressed_tab(rct_window* w) -{ - for (int32_t i = 0; i < 2; i++) - { - w->pressed_widgets &= ~(1 << (WIDX_TAB1 + i)); - } - w->pressed_widgets |= 1LL << (WIDX_TAB1 + w->page); -} - -#pragma region Information page - -static void window_network_information_mouseup(rct_window* w, rct_widgetindex widgetIndex) -{ - switch (widgetIndex) - { - case WIDX_CLOSE: - window_close(w); - break; - case WIDX_TAB1: - if (w->page != widgetIndex - WIDX_TAB1) - { - window_network_set_page(w, widgetIndex - WIDX_TAB1); - } - break; - } -} - -static void window_network_information_resize(rct_window* w) -{ - window_set_resize(w, WW, WH, WW * 4, WH * 4); - window_network_anchor_border_widgets(w); -} - -static void window_network_information_update(rct_window* w) -{ - w->frame_no++; - widget_invalidate(w, WIDX_TAB1 + w->page); - w->Invalidate(); - - NetworkStats_t curStats = network_get_stats(); - - uint32_t currentTicks = platform_get_ticks(); - - float graphTimeElapsed = (currentTicks - _lastGraphUpdateTime) / 1000.0f; - _lastGraphUpdateTime = currentTicks; - - for (size_t i = 0; i < EnumValue(NetworkStatisticsGroup::Max); i++) - { - uint32_t deltaBytesReceived = curStats.bytesReceived[i] - _networkStats.bytesReceived[i]; - uint32_t deltaBytesSent = curStats.bytesSent[i] - _networkStats.bytesSent[i]; - - _networkLastDeltaStats.deltaBytesReceived[i] = deltaBytesReceived; - _networkLastDeltaStats.deltaBytesSent[i] = deltaBytesSent; - - _networkAccumulatedStats.deltaBytesReceived[i] += deltaBytesReceived; - _networkAccumulatedStats.deltaBytesSent[i] += deltaBytesSent; - } - - float graphMaxIn = 0.0f; - float graphMaxOut = 0.0f; - - for (size_t i = 0; i < _networkHistory.size(); i++) - { - const NetworkHistory_t& history = _networkHistory[i]; - for (size_t n = 1; n < EnumValue(NetworkStatisticsGroup::Max); n++) - { - graphMaxIn = static_cast(std::max(history.deltaBytesReceived[n], graphMaxIn)); - graphMaxOut = static_cast(std::max(history.deltaBytesSent[n], graphMaxOut)); - } - } - - _graphMaxIn = flerp(_graphMaxIn, graphMaxIn, graphTimeElapsed * 4.0f); - _graphMaxOut = flerp(_graphMaxOut, graphMaxOut, graphTimeElapsed * 4.0f); - - // Compute readable statistics. - if (currentTicks - _lastStatsUpdateTime >= 1000) - { - float statsTimeElapsed = (currentTicks - _lastStatsUpdateTime) / 1000.0f; - _lastStatsUpdateTime = currentTicks; - - _bytesIn = _networkAccumulatedStats.deltaBytesReceived[EnumValue(NetworkStatisticsGroup::Total)]; - _bytesOut = _networkAccumulatedStats.deltaBytesSent[EnumValue(NetworkStatisticsGroup::Total)]; - _bytesInSec = static_cast(_bytesIn) / statsTimeElapsed; - _bytesOutSec = static_cast(_bytesOut) / statsTimeElapsed; - - _networkAccumulatedStats = {}; - } - - _networkStats = curStats; - _networkHistory.push_back(_networkLastDeltaStats); -} - -static void window_network_information_invalidate(rct_window* w) -{ - window_network_set_pressed_tab(w); - window_network_anchor_border_widgets(w); - window_align_tabs(w, WIDX_TAB1, WIDX_TAB1); -} - -static void graph_draw_bar(rct_drawpixelinfo* dpi, int32_t x, int32_t y, int32_t height, int32_t width, int32_t colour) -{ - auto coords = ScreenCoordsXY{ x, y }; - gfx_fill_rect(dpi, { coords, coords + ScreenCoordsXY{ width, height } }, colour); -} - -static void window_network_draw_graph( - rct_window* w, rct_drawpixelinfo* dpi, int32_t x, int32_t y, int32_t height, int32_t width, int32_t barWidth, bool received) -{ - float dataMax = received ? _graphMaxIn : _graphMaxOut; - - // Draw box. - auto right1 = ScreenCoordsXY{ x, y }; - auto right2 = ScreenCoordsXY{ x, y + height }; - gfx_draw_line(dpi, { right1, right2 }, COLOUR_BLACK); - - auto left1 = ScreenCoordsXY{ x, y + height }; - auto left2 = ScreenCoordsXY{ x + width, y + height }; - gfx_draw_line(dpi, { left1, left2 }, COLOUR_BLACK); - - auto bottom1 = ScreenCoordsXY{ x, y }; - auto bottom2 = ScreenCoordsXY{ x + width, y }; - gfx_draw_line(dpi, { bottom1, bottom2 }, COLOUR_BLACK); - - auto top1 = ScreenCoordsXY{ x + width, y }; - auto top2 = ScreenCoordsXY{ x + width, y + height }; - gfx_draw_line(dpi, { top1, top2 }, COLOUR_BLACK); - - // Draw graph inside box - x = x + 1; - y = y + 1; - width = width - 2; - height = height - 2; - - rct_drawpixelinfo clippedDPI; - if (!clip_drawpixelinfo(&clippedDPI, dpi, { x, y }, width, height)) - return; - - dpi = &clippedDPI; - - for (size_t i = 0; i < _networkHistory.size(); i++) - { - NetworkHistory_t history = _networkHistory[i]; - // std::sort(history.deltaBytesReceived.begin(), history.deltaBytesReceived.end(), std::greater()); - - // NOTE: Capacity is not a mistake, we always want the full length. - uint32_t curX = std::round((static_cast(i) / static_cast(_networkHistory.capacity())) * barWidth * width); - - float totalSum = 0.0f; - for (size_t n = 1; n < EnumValue(NetworkStatisticsGroup::Max); n++) - { - if (received) - totalSum += static_cast(history.deltaBytesReceived[n]); - else - totalSum += static_cast(history.deltaBytesSent[n]); - } - - int32_t yOffset = height; - for (size_t n = 1; n < EnumValue(NetworkStatisticsGroup::Max); n++) - { - float totalHeight; - float singleHeight; - - if (received) - { - totalHeight = (static_cast(history.deltaBytesReceived[n]) / dataMax) * height; - singleHeight = (static_cast(history.deltaBytesReceived[n]) / totalSum) * totalHeight; - } - else - { - totalHeight = (static_cast(history.deltaBytesSent[n]) / dataMax) * height; - singleHeight = (static_cast(history.deltaBytesSent[n]) / totalSum) * totalHeight; - } - - uint32_t lineHeight = std::ceil(singleHeight); - lineHeight = std::min(lineHeight, height); - - if (lineHeight > 0) - { - graph_draw_bar(dpi, curX, yOffset - lineHeight, lineHeight, barWidth, NetworkTrafficGroupColors[n]); - } - - yOffset -= lineHeight; - } - } -} - -static void window_network_information_paint(rct_window* w, rct_drawpixelinfo* dpi) -{ - char textBuffer[200] = {}; - - WindowDrawWidgets(w, dpi); - window_network_draw_tab_images(w, dpi); - - constexpr int32_t padding = 5; - constexpr int32_t heightTab = 43; - constexpr int32_t textHeight = 12; - const int32_t graphBarWidth = std::min(1, w->width / WH); - const int32_t totalHeight = w->height; - const int32_t totalHeightText = (textHeight + (padding * 2)) * 3; - const int32_t graphHeight = (totalHeight - totalHeightText - heightTab) / 2; - - rct_drawpixelinfo clippedDPI; - if (clip_drawpixelinfo(&clippedDPI, dpi, w->windowPos, w->width, w->height)) - { - dpi = &clippedDPI; - - auto screenCoords = ScreenCoordsXY{ padding, heightTab + padding }; - - // Received stats. - { - DrawTextBasic(dpi, screenCoords, STR_NETWORK_RECEIVE, {}, { PALETTE_INDEX_10 }); - - format_readable_speed(textBuffer, sizeof(textBuffer), _bytesInSec); - gfx_draw_string(dpi, screenCoords + ScreenCoordsXY(70, 0), textBuffer, { PALETTE_INDEX_10 }); - - DrawTextBasic(dpi, screenCoords + ScreenCoordsXY{ 200, 0 }, STR_NETWORK_TOTAL_RECEIVED, {}, { PALETTE_INDEX_10 }); - - format_readable_size( - textBuffer, sizeof(textBuffer), _networkStats.bytesReceived[EnumValue(NetworkStatisticsGroup::Total)]); - gfx_draw_string(dpi, screenCoords + ScreenCoordsXY(300, 0), textBuffer, { PALETTE_INDEX_10 }); - screenCoords.y += textHeight + padding; - - window_network_draw_graph( - w, dpi, screenCoords.x, screenCoords.y, graphHeight, w->width - (padding * 2), graphBarWidth, true); - screenCoords.y += graphHeight + padding; - } - - // Sent stats. - { - DrawTextBasic(dpi, screenCoords, STR_NETWORK_SEND, {}, { PALETTE_INDEX_10 }); - - format_readable_speed(textBuffer, sizeof(textBuffer), _bytesOutSec); - gfx_draw_string(dpi, screenCoords + ScreenCoordsXY(70, 0), textBuffer, { PALETTE_INDEX_10 }); - - DrawTextBasic(dpi, screenCoords + ScreenCoordsXY{ 200, 0 }, STR_NETWORK_TOTAL_SENT, {}, { PALETTE_INDEX_10 }); - - format_readable_size( - textBuffer, sizeof(textBuffer), _networkStats.bytesSent[EnumValue(NetworkStatisticsGroup::Total)]); - gfx_draw_string(dpi, screenCoords + ScreenCoordsXY(300, 0), textBuffer, { PALETTE_INDEX_10 }); - screenCoords.y += textHeight + padding; - - window_network_draw_graph( - w, dpi, screenCoords.x, screenCoords.y, graphHeight, w->width - (padding * 2), graphBarWidth, false); - screenCoords.y += graphHeight + padding; - } - - // Draw legend - { - for (size_t i = 1; i < EnumValue(NetworkStatisticsGroup::Max); i++) - { - format_string(textBuffer, sizeof(textBuffer), NetworkTrafficGroupNames[i], nullptr); - - // Draw color stripe. - gfx_fill_rect( - dpi, { screenCoords + ScreenCoordsXY{ 0, 4 }, screenCoords + ScreenCoordsXY{ 4, 6 } }, - NetworkTrafficGroupColors[i]); - - // Draw text. - gfx_draw_string(dpi, screenCoords + ScreenCoordsXY(10, 0), textBuffer, { PALETTE_INDEX_10 }); - - gfx_get_string_width(textBuffer, FontSpriteBase::MEDIUM); - - screenCoords.x += gfx_get_string_width(textBuffer, FontSpriteBase::MEDIUM) + 20; - } - } - } -} - -#pragma endregion - -static void window_network_draw_tab_image(rct_window* w, rct_drawpixelinfo* dpi, int32_t page, int32_t spriteIndex) -{ - rct_widgetindex widgetIndex = WIDX_TAB1 + page; - - if (!WidgetIsDisabled(w, widgetIndex)) - { - if (w->page == page) - { - int32_t numFrames = window_network_animation_frames[w->page]; - if (numFrames > 1) - { - int32_t frame = w->frame_no / window_network_animation_divisor[w->page]; - spriteIndex += (frame % numFrames); - } - } - - gfx_draw_sprite( - dpi, spriteIndex, w->windowPos + ScreenCoordsXY{ w->widgets[widgetIndex].left, w->widgets[widgetIndex].top }, 0); - } -} - -static void window_network_draw_tab_images(rct_window* w, rct_drawpixelinfo* dpi) -{ - window_network_draw_tab_image(w, dpi, WINDOW_NETWORK_PAGE_INFORMATION, SPR_TAB_KIOSKS_AND_FACILITIES_0); -} diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index ac478ad968..1431fff7f7 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -153,8 +153,7 @@ enum TOP_TOOLBAR_DEBUG_DDIDX { enum TOP_TOOLBAR_NETWORK_DDIDX { DDIDX_MULTIPLAYER = 0, - DDIDX_NETWORK = 1, - DDIDX_MULTIPLAYER_RECONNECT = 2, + DDIDX_MULTIPLAYER_RECONNECT = 1, TOP_TOOLBAR_NETWORK_COUNT }; @@ -3554,7 +3553,6 @@ static void top_toolbar_init_debug_menu(rct_window* w, rct_widget* widget) static void top_toolbar_init_network_menu(rct_window* w, rct_widget* widget) { gDropdownItemsFormat[DDIDX_MULTIPLAYER] = STR_MULTIPLAYER; - gDropdownItemsFormat[DDIDX_NETWORK] = STR_NETWORK; gDropdownItemsFormat[DDIDX_MULTIPLAYER_RECONNECT] = STR_MULTIPLAYER_RECONNECT; WindowDropdownShowText( @@ -3603,9 +3601,6 @@ static void top_toolbar_network_menu_dropdown(int16_t dropdownIndex) case DDIDX_MULTIPLAYER: context_open_window(WC_MULTIPLAYER); break; - case DDIDX_NETWORK: - context_open_window(WC_NETWORK); - break; case DDIDX_MULTIPLAYER_RECONNECT: network_reconnect(); break; diff --git a/src/openrct2-ui/windows/Window.h b/src/openrct2-ui/windows/Window.h index 5fc33a68c1..2b727b62cd 100644 --- a/src/openrct2-ui/windows/Window.h +++ b/src/openrct2-ui/windows/Window.h @@ -53,7 +53,6 @@ rct_window* window_land_rights_open(); rct_window* window_main_open(); rct_window* window_mapgen_open(); rct_window* window_multiplayer_open(); -rct_window* window_network_open(); rct_window* window_music_credits_open(); rct_window* window_news_open(); rct_window* window_news_options_open(); diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h index 22007500e6..3d2492d6c7 100644 --- a/src/openrct2/interface/Window.h +++ b/src/openrct2/interface/Window.h @@ -485,7 +485,6 @@ enum WC_DEBUG_PAINT = 130, WC_VIEW_CLIPPING = 131, WC_OBJECT_LOAD_ERROR = 132, - WC_NETWORK = 133, // Only used for colour schemes WC_STAFF = 220, diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h index 9098d866d9..381637c278 100644 --- a/src/openrct2/localisation/StringIds.h +++ b/src/openrct2/localisation/StringIds.h @@ -3746,19 +3746,6 @@ enum STR_CHAT_BUTTON_ON_TOOLBAR = 6282, STR_CHAT_UNAVAILABLE = 6283, - STR_NETWORK = 6284, - STR_NETWORK_INFORMATION_TITLE = 6285, - - STR_NETWORK_RECEIVE = 6286, - STR_NETWORK_SEND = 6287, - - STR_NETWORK_TOTAL_RECEIVED = 6288, - STR_NETWORK_TOTAL_SENT = 6289, - - STR_NETWORK_LEGEND_BASE = 6290, - STR_NETWORK_LEGEND_COMMANDS = 6291, - STR_NETWORK_LEGEND_MAPDATA = 6292, - STR_SIZE_BYTE = 6293, STR_SIZE_KILOBYTE = 6294, STR_SIZE_MEGABYTE = 6295,