diff --git a/src/openrct2-ui/windows/Network.cpp b/src/openrct2-ui/windows/Network.cpp index 31e0e7ccff..8dd4f7a557 100644 --- a/src/openrct2-ui/windows/Network.cpp +++ b/src/openrct2-ui/windows/Network.cpp @@ -334,7 +334,7 @@ static void window_network_draw_graph( // 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)); + uint32_t curX = std::round((static_cast(i) / static_cast(_networkHistory.capacity())) * barWidth * width); float totalSum = 0.0f; for (int n = 1; n < NETWORK_STATISTICS_GROUP_MAX; n++) diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index 7f301ceccf..86447dd8cc 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -2001,7 +2001,7 @@ static void window_options_invalidate(rct_window* w) static uint8_t get_scroll_percentage(rct_widget* widget, rct_scroll* scroll) { uint8_t width = widget->right - widget->left - 1; - return static_cast(scroll->h_left / (scroll->h_right - width) * 100); + return static_cast(scroll->h_left) / (scroll->h_right - width) * 100; } static void window_options_update(rct_window* w) diff --git a/src/openrct2-ui/windows/TitleEditor.cpp b/src/openrct2-ui/windows/TitleEditor.cpp index 72cb8ba77b..88c21014af 100644 --- a/src/openrct2-ui/windows/TitleEditor.cpp +++ b/src/openrct2-ui/windows/TitleEditor.cpp @@ -416,7 +416,7 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd if (w->selected_list_item != -1 && w->selected_list_item < static_cast(_editingTitleSequence->NumCommands)) { - for (int32_t i = w->selected_list_item; i < static_cast(_editingTitleSequence->NumCommands - 1); + for (int32_t i = w->selected_list_item; i < static_cast(_editingTitleSequence->NumCommands) - 1; i++) { _editingTitleSequence->Commands[i] = _editingTitleSequence->Commands[i + 1]; @@ -446,7 +446,7 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd if (window_title_editor_check_can_edit()) { if (w->selected_list_item != -1 - && w->selected_list_item < static_cast(_editingTitleSequence->NumCommands - 1)) + && w->selected_list_item < static_cast(_editingTitleSequence->NumCommands) - 1) { TitleCommand* a = &_editingTitleSequence->Commands[w->selected_list_item]; TitleCommand* b = &_editingTitleSequence->Commands[w->selected_list_item + 1];