mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenRCT2/src/openrct2-ui/windows/Ride.cpp

6974 lines
247 KiB
C++
Raw Normal View History

add and start implementing ride window
2014-08-25 16:04:28 +02:00
/*****************************************************************************
Add built_date to ScRide and add GetAge()
2020-05-12 20:11:29 +02:00
* Copyright (c) 2014-2020 OpenRCT2 developers
add and start implementing ride window
2014-08-25 16:04:28 +02:00
*
Ready copyright notice for clang-format Clang-format sees the text behind `#pragma region` as code and formats it. Instead of stating the copyright and date there, it's now in the comment block right below it. The text "Copyright" is left in the `#pragma region` line, as clang-format sees it as a single identifier. I took the opportunity to normalize the dates, and add the copyright notice to the source files where it was missing them (except for third-party and the generated resources.h file).
2018-06-15 14:07:34 +02:00
* For a complete list of all authors, please refer to contributors.md
* Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2
add and start implementing ride window
2014-08-25 16:04:28 +02:00
*
Ready copyright notice for clang-format Clang-format sees the text behind `#pragma region` as code and formats it. Instead of stating the copyright and date there, it's now in the comment block right below it. The text "Copyright" is left in the `#pragma region` line, as clang-format sees it as a single identifier. I took the opportunity to normalize the dates, and add the copyright notice to the source files where it was missing them (except for third-party and the generated resources.h file).
2018-06-15 14:07:34 +02:00
* OpenRCT2 is licensed under the GNU General Public License version 3.
add and start implementing ride window
2014-08-25 16:04:28 +02:00
*****************************************************************************/
clang-format UI windows
2018-06-22 23:21:44 +02:00
#include "../interface/Theme.h"
Remove Math::Clamp in favour of std::clamp
2018-08-12 13:50:40 +02:00
#include <algorithm>
Move cmath out of common.h
2018-03-14 15:25:34 +01:00
#include <cmath>
Use std::size instead of Util::CountOf
2018-11-21 23:16:04 +01:00
#include <iterator>
Fix building
2017-11-26 21:24:57 +01:00
#include <limits>
clang-format UI windows
2018-06-22 23:21:44 +02:00
#include <openrct2-ui/interface/Dropdown.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
Move Ride window to UI module
2017-10-21 16:03:33 +02:00
#include <openrct2-ui/windows/Window.h>
Compile util and cheats as C++
2017-12-13 13:02:24 +01:00
#include <openrct2/Cheats.h>
Move Ride window to UI module
2017-10-21 16:03:33 +02:00
#include <openrct2/Context.h>
Compile game.c and game.h as C++
2017-11-30 18:17:06 +01:00
#include <openrct2/Game.h>
Compile files in base dir as C++
2017-12-12 14:52:57 +01:00
#include <openrct2/Input.h>
clang-format UI windows
2018-06-22 23:21:44 +02:00
#include <openrct2/OpenRCT2.h>
Fix #3832: Track piece colour scheme paint not network-safe
2018-12-11 22:17:52 +01:00
#include <openrct2/actions/GameAction.h>
Split actions hpp files into separate h and cpp files (#13548) * Split up SmallSceneryPlace/Remove Added undo function for Remove Scenery * Refactor: Balloon and Banner actions hpp=>h/cpp * Refactor: rename all action *.hpp files to *.cpp This is preparation for separation in later commits. Note that without the complete set of commits in this branch, the code will not build. * Refactor Clear, Climate, Custom, and Footpath actions hpp=>h/cpp * VSCode: add src subdirectories to includePath * Refactor Guest actions hpp=>h/cpp * Refactor Land actions hpp=>h/cpp * Refactor LargeScenery actions hpp=>h/cpp * Refactor Load, Maze, Network actions hpp=>h/cpp * Refactor Park actions hpp=>h/cpp * Refactor/style: move private function declarations in actions *.h Previous action .h files included private function declarations with private member variables, before public function declarations. This commit re-orders the header files to the following order: - public member variables - private member variables - public functions - private functions * Refactor Pause action hpp=>h/cpp * Refactor Peep, Place, Player actions hpp=>h/cpp * Refactor Ride actions hpp=>h/cpp * Refactor Scenario, Set*, Sign* actions hpp=>h/cpp * Refactor SmallScenerySetColourAction hpp=>h/cpp * Refactor Staff actions hpp=>h/cpp * Refactor Surface, Tile, Track* actions hpp=>h/cpp * Refactor Wall and Water actions hpp=>h/cpp * Fix various includes and other compile errors Update includes for tests. Move static function declarations to .h files Add explicit includes to various files that were previously implicit (the required header was a nested include in an action hpp file, and the action .h file does not include that header) Move RideSetStatus string enum to the cpp file to avoid unused imports * Xcode: modify project file for actions refactor * Cleanup whitespace and end-of-file newlines Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2020-12-10 07:39:10 +01:00
#include <openrct2/actions/ParkSetParameterAction.h>
#include <openrct2/actions/RideSetAppearanceAction.h>
#include <openrct2/actions/RideSetColourSchemeAction.h>
#include <openrct2/actions/RideSetPriceAction.h>
#include <openrct2/actions/RideSetSettingAction.h>
clang-format UI windows
2018-06-22 23:21:44 +02:00
#include <openrct2/audio/audio.h>
#include <openrct2/config/Config.h>
Use case-insensitive compare for soring ride and vehicle types (#9229)
2019-05-11 13:06:29 +02:00
#include <openrct2/core/String.hpp>
Compile localisation folder as C++
2018-01-06 18:32:25 +01:00
#include <openrct2/localisation/Date.h>
#include <openrct2/localisation/Localisation.h>
Order ride type dropdown orthographically.
2018-05-29 19:09:29 +02:00
#include <openrct2/localisation/LocalisationService.h>
Compile localisation folder as C++
2018-01-06 18:32:25 +01:00
#include <openrct2/localisation/StringIds.h>
Move Ride window to UI module
2017-10-21 16:03:33 +02:00
#include <openrct2/network/network.h>
Implement ride music objects and refactor
2021-01-09 21:54:02 +01:00
#include <openrct2/object/MusicObject.h>
Move Ride window to UI module
2017-10-21 16:03:33 +02:00
#include <openrct2/object/ObjectManager.h>
#include <openrct2/object/ObjectRepository.h>
Implement surfaces, edges and stations as objects
2018-12-05 21:33:45 +01:00
#include <openrct2/object/StationObject.h>
Move Ride window to UI module
2017-10-21 16:03:33 +02:00
#include <openrct2/peep/Staff.h>
Move and rename RCT{1,2,12}.h
2018-01-09 10:40:42 +01:00
#include <openrct2/rct1/RCT1.h>
Creating t6 exporter
2019-04-16 20:36:00 +02:00
#include <openrct2/rct2/T6Exporter.h>
Change casing of header files
2018-01-10 00:00:09 +01:00
#include <openrct2/ride/RideData.h>
Spin off shop item stuff to separate files
2018-05-14 19:21:43 +02:00
#include <openrct2/ride/ShopItem.h>
clang-format UI windows
2018-06-22 23:21:44 +02:00
#include <openrct2/ride/Station.h>
Move Ride window to UI module
2017-10-21 16:03:33 +02:00
#include <openrct2/ride/Track.h>
#include <openrct2/ride/TrackData.h>
clang-format UI windows
2018-06-22 23:21:44 +02:00
#include <openrct2/ride/TrackDesign.h>
Link everything together
2019-06-30 12:23:06 +02:00
#include <openrct2/ride/TrackDesignRepository.h>
Move Ride window to UI module
2017-10-21 16:03:33 +02:00
#include <openrct2/sprites.h>
#include <openrct2/windows/Intent.h>
Reduce inclusion of EntityList.h
2021-02-23 10:49:41 +01:00
#include <openrct2/world/EntityList.h>
Reduce includes in common header
2018-03-19 23:28:40 +01:00
#include <openrct2/world/Park.h>
Reduce inclusion of Sprite.h
2021-02-23 09:30:16 +01:00
#include <openrct2/world/Sprite.h>
Implement ride music objects and refactor
2021-01-09 21:54:02 +01:00
#include <vector>
Implement surfaces, edges and stations as objects
2018-12-05 21:33:45 +01:00
using namespace OpenRCT2;
Replace defines with constexpr
2020-05-05 22:26:14 +02:00
static constexpr const rct_string_id WINDOW_TITLE = STR_RIDE_WINDOW_TITLE;
static constexpr const int32_t WH = 207;
static constexpr const int32_t WW = 316;
Add compile option to move close box to the left
2019-10-19 04:02:31 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
enum
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
WINDOW_RIDE_PAGE_MAIN,
WINDOW_RIDE_PAGE_VEHICLE,
WINDOW_RIDE_PAGE_OPERATING,
WINDOW_RIDE_PAGE_MAINTENANCE,
WINDOW_RIDE_PAGE_COLOUR,
WINDOW_RIDE_PAGE_MUSIC,
WINDOW_RIDE_PAGE_MEASUREMENTS,
WINDOW_RIDE_PAGE_GRAPHS,
WINDOW_RIDE_PAGE_INCOME,
WINDOW_RIDE_PAGE_CUSTOMER,
WINDOW_RIDE_PAGE_COUNT
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
};
add and start implementing ride window
2014-08-25 16:04:28 +02:00
#pragma region Widgets
Exclude pre-formatted blocks from clang-format (#7520) [ci skip]
2018-05-16 20:41:29 +02:00
// clang-format off
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
enum {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
WIDX_BACKGROUND,
WIDX_TITLE,
WIDX_CLOSE,
WIDX_PAGE_BACKGROUND,
WIDX_TAB_1,
WIDX_TAB_2,
WIDX_TAB_3,
WIDX_TAB_4,
WIDX_TAB_5,
WIDX_TAB_6,
WIDX_TAB_7,
WIDX_TAB_8,
WIDX_TAB_9,
WIDX_TAB_10,
WIDX_VIEWPORT = 14,
WIDX_VIEW,
WIDX_VIEW_DROPDOWN,
WIDX_STATUS,
WIDX_OPEN,
WIDX_CONSTRUCTION,
WIDX_RENAME,
WIDX_LOCATE,
WIDX_DEMOLISH,
WIDX_CLOSE_LIGHT,
Add and implement simulation mode for rides
2019-05-07 21:14:21 +02:00
WIDX_SIMULATE_LIGHT,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
WIDX_TEST_LIGHT,
WIDX_OPEN_LIGHT,
WIDX_RIDE_TYPE,
Turn ride type selection into a normal dropdown. This removes the spinner aspect that previously worked around dropdown item limits.
2018-05-29 11:04:17 +02:00
WIDX_RIDE_TYPE_DROPDOWN,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
WIDX_VEHICLE_TYPE = 14,
WIDX_VEHICLE_TYPE_DROPDOWN,
WIDX_VEHICLE_TRAINS_PREVIEW,
WIDX_VEHICLE_TRAINS,
WIDX_VEHICLE_TRAINS_INCREASE,
WIDX_VEHICLE_TRAINS_DECREASE,
WIDX_VEHICLE_CARS_PER_TRAIN,
WIDX_VEHICLE_CARS_PER_TRAIN_INCREASE,
WIDX_VEHICLE_CARS_PER_TRAIN_DECREASE,
WIDX_MODE_TWEAK = 14,
WIDX_MODE_TWEAK_INCREASE,
WIDX_MODE_TWEAK_DECREASE,
WIDX_LIFT_HILL_SPEED,
WIDX_LIFT_HILL_SPEED_INCREASE,
WIDX_LIFT_HILL_SPEED_DECREASE,
WIDX_LOAD_CHECKBOX,
WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX,
WIDX_MINIMUM_LENGTH_CHECKBOX,
WIDX_MINIMUM_LENGTH,
WIDX_MINIMUM_LENGTH_INCREASE,
WIDX_MINIMUM_LENGTH_DECREASE,
WIDX_MAXIMUM_LENGTH_CHECKBOX,
WIDX_MAXIMUM_LENGTH,
WIDX_MAXIMUM_LENGTH_INCREASE,
WIDX_MAXIMUM_LENGTH_DECREASE,
WIDX_SYNCHRONISE_WITH_ADJACENT_STATIONS_CHECKBOX,
WIDX_MODE_TWEAK_LABEL,
WIDX_LIFT_HILL_SPEED_LABEL,
WIDX_MODE,
WIDX_MODE_DROPDOWN,
WIDX_LOAD,
WIDX_LOAD_DROPDOWN,
WIDX_OPERATE_NUMBER_OF_CIRCUITS_LABEL,
WIDX_OPERATE_NUMBER_OF_CIRCUITS,
WIDX_OPERATE_NUMBER_OF_CIRCUITS_INCREASE,
WIDX_OPERATE_NUMBER_OF_CIRCUITS_DECREASE,
WIDX_INSPECTION_INTERVAL = 14,
WIDX_INSPECTION_INTERVAL_DROPDOWN,
WIDX_LOCATE_MECHANIC,
Add button to refurbish ride Add a button to refurbish the selected ride. The cost for this is 35% of the build price and may only be done if the ride is closed and empty.
2018-03-29 11:17:54 +02:00
WIDX_REFURBISH_RIDE,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
WIDX_FORCE_BREAKDOWN,
WIDX_TRACK_PREVIEW = 14,
WIDX_TRACK_COLOUR_SCHEME,
WIDX_TRACK_COLOUR_SCHEME_DROPDOWN,
WIDX_TRACK_MAIN_COLOUR,
WIDX_TRACK_ADDITIONAL_COLOUR,
WIDX_TRACK_SUPPORT_COLOUR,
WIDX_MAZE_STYLE,
WIDX_MAZE_STYLE_DROPDOWN,
WIDX_PAINT_INDIVIDUAL_AREA,
WIDX_ENTRANCE_PREVIEW,
WIDX_ENTRANCE_STYLE,
WIDX_ENTRANCE_STYLE_DROPDOWN,
WIDX_VEHICLE_PREVIEW,
WIDX_VEHICLE_COLOUR_SCHEME,
WIDX_VEHICLE_COLOUR_SCHEME_DROPDOWN,
WIDX_VEHICLE_COLOUR_INDEX,
WIDX_VEHICLE_COLOUR_INDEX_DROPDOWN,
WIDX_VEHICLE_MAIN_COLOUR,
WIDX_VEHICLE_ADDITIONAL_COLOUR_1,
WIDX_VEHICLE_ADDITIONAL_COLOUR_2,
WIDX_PLAY_MUSIC = 14,
WIDX_MUSIC,
WIDX_MUSIC_DROPDOWN,
WIDX_SAVE_TRACK_DESIGN = 14,
WIDX_SELECT_NEARBY_SCENERY,
WIDX_RESET_SELECTION,
WIDX_SAVE_DESIGN,
WIDX_CANCEL_DESIGN,
WIDX_GRAPH = 14,
WIDX_GRAPH_VELOCITY,
WIDX_GRAPH_ALTITUDE,
WIDX_GRAPH_VERTICAL,
WIDX_GRAPH_LATERAL,
WIDX_PRIMARY_PRICE_LABEL = 14,
WIDX_PRIMARY_PRICE,
WIDX_PRIMARY_PRICE_INCREASE,
WIDX_PRIMARY_PRICE_DECREASE,
WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK,
WIDX_SECONDARY_PRICE_LABEL,
WIDX_SECONDARY_PRICE,
WIDX_SECONDARY_PRICE_INCREASE,
WIDX_SECONDARY_PRICE_DECREASE,
WIDX_SECONDARY_PRICE_SAME_THROUGHOUT_PARK,
WIDX_SHOW_GUESTS_THOUGHTS = 14,
WIDX_SHOW_GUESTS_ON_RIDE,
WIDX_SHOW_GUESTS_QUEUING
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
};
Use constexpr on openrct2-ui/*
2019-10-24 05:38:13 +02:00
constexpr int32_t RCT1_LIGHT_OFFSET = 4;
Rewrote Themes Added rct1 styles and lights. Themes are now easier to expand Added features tab to themes window
2015-06-08 02:31:54 +02:00
Replace magic values for enabled widgets in Ride window (#5278)
2017-03-11 22:29:39 +01:00
#define MAIN_RIDE_WIDGETS \
Apply review requests
2020-05-09 16:44:21 +02:00
WINDOW_SHIM(WINDOW_TITLE, WW, WH), \
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
MakeWidget({ 0, 43}, {316, 137}, WindowWidgetType::Resize, WindowColour::Secondary), \
Create WindowColour enum for widget definition calls (#12722) * Make MakeWidget* functions take enum colour * Make windows A-D use WindowColour enum * Make windows E-G use WindowColour enum * Make windows I-M use WindowColour enum * Make windows N-P use WindowColour enum * Make windows R-S use WindowColour enum * Make windows T use WindowColour enum * Make windows V-W use WindowColour enum
2020-08-29 04:31:31 +02:00
MakeTab ({ 3, 17}, STR_VIEW_OF_RIDE_ATTRACTION_TIP ), \
MakeTab ({ 34, 17}, STR_VEHICLE_DETAILS_AND_OPTIONS_TIP ), \
MakeTab ({ 65, 17}, STR_OPERATING_OPTIONS_TIP ), \
MakeTab ({ 96, 17}, STR_MAINTENANCE_OPTIONS_TIP ), \
MakeTab ({127, 17}, STR_COLOUR_SCHEME_OPTIONS_TIP ), \
MakeTab ({158, 17}, STR_SOUND_AND_MUSIC_OPTIONS_TIP ), \
MakeTab ({189, 17}, STR_MEASUREMENTS_AND_TEST_DATA_TIP ), \
MakeTab ({220, 17}, STR_GRAPHS_TIP ), \
MakeTab ({251, 17}, STR_INCOME_AND_COSTS_TIP ), \
MakeTab ({282, 17}, STR_CUSTOMER_INFORMATION_TIP )
Replace magic values for enabled widgets in Ride window (#5278)
2017-03-11 22:29:39 +01:00
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
// 0x009ADC34
static rct_widget window_ride_main_widgets[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
MAIN_RIDE_WIDGETS,
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
MakeWidget({ 3, 60}, {288, 107}, WindowWidgetType::Viewport, WindowColour::Secondary, STR_VIEWPORT ),
MakeWidget({ 35, 46}, {222, 12}, WindowWidgetType::DropdownMenu, WindowColour::Secondary, 0xFFFFFFFF, STR_VIEW_SELECTION ),
MakeWidget({245, 47}, { 11, 10}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_VIEW_SELECTION ),
MakeWidget({ 3, 167}, {288, 11}, WindowWidgetType::LabelCentred, WindowColour::Secondary ),
MakeWidget({291, 46}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_OPEN_CLOSE_OR_TEST_RIDE),
MakeWidget({291, 70}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_CONSTRUCTION, STR_CONSTRUCTION ),
MakeWidget({291, 94}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_RENAME, STR_NAME_RIDE_TIP ),
MakeWidget({291, 118}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP ),
MakeWidget({291, 142}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_DEMOLISH, STR_DEMOLISH_RIDE_TIP ),
MakeWidget({296, 48}, { 14, 14}, WindowWidgetType::ImgBtn, WindowColour::Secondary, SPR_G2_RCT1_CLOSE_BUTTON_0, STR_CLOSE_RIDE_TIP ),
MakeWidget({296, 62}, { 14, 14}, WindowWidgetType::ImgBtn, WindowColour::Secondary, SPR_G2_RCT1_TEST_BUTTON_0, STR_SIMULATE_RIDE_TIP ),
MakeWidget({296, 62}, { 14, 14}, WindowWidgetType::ImgBtn, WindowColour::Secondary, SPR_G2_RCT1_TEST_BUTTON_0, STR_TEST_RIDE_TIP ),
MakeWidget({296, 76}, { 14, 14}, WindowWidgetType::ImgBtn, WindowColour::Secondary, SPR_G2_RCT1_OPEN_BUTTON_0, STR_OPEN_RIDE_TIP ),
MakeWidget({ 3, 180}, {305, 12}, WindowWidgetType::DropdownMenu, WindowColour::Secondary, STR_ARG_6_STRINGID ),
MakeWidget({297, 180}, { 11, 12}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH ),
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{ WIDGETS_END },
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
};
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
// 0x009ADDA8
static rct_widget window_ride_vehicle_widgets[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
MAIN_RIDE_WIDGETS,
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
MakeWidget ({ 7, 50}, {302, 12}, WindowWidgetType::DropdownMenu, WindowColour::Secondary ),
MakeWidget ({297, 51}, { 11, 10}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH ),
MakeWidget ({ 7, 147}, {302, 43}, WindowWidgetType::Scroll, WindowColour::Secondary, STR_EMPTY ),
MakeSpinnerWidgets({ 7, 196}, {145, 12}, WindowWidgetType::Spinner, WindowColour::Secondary, STR_RIDE_VEHICLE_COUNT, STR_MAX_VEHICLES_TIP ),
MakeSpinnerWidgets({164, 196}, {145, 12}, WindowWidgetType::Spinner, WindowColour::Secondary, STR_1_CAR_PER_TRAIN, STR_MAX_CARS_PER_TRAIN_TIP),
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{ WIDGETS_END },
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
};
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
// 0x009ADEFC
static rct_widget window_ride_operating_widgets[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
MAIN_RIDE_WIDGETS,
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
MakeSpinnerWidgets({157, 61}, {152, 12}, WindowWidgetType::Spinner, WindowColour::Secondary, STR_ARG_18_STRINGID ), // NB: 3 widgets
MakeSpinnerWidgets({157, 75}, {152, 12}, WindowWidgetType::Spinner, WindowColour::Secondary, STR_LIFT_HILL_CHAIN_SPEED_VALUE ), // NB: 3 widgets
MakeWidget ({ 7, 109}, { 80, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_WAIT_FOR, STR_WAIT_FOR_PASSENGERS_BEFORE_DEPARTING_TIP),
MakeWidget ({ 7, 124}, {302, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary ),
MakeWidget ({ 7, 139}, {150, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_MINIMUM_WAITING_TIME, STR_MINIMUM_LENGTH_BEFORE_DEPARTING_TIP ),
MakeSpinnerWidgets({157, 139}, {152, 12}, WindowWidgetType::Spinner, WindowColour::Secondary, STR_ARG_10_STRINGID ), // NB: 3 widgets
MakeWidget ({ 7, 154}, {150, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_MAXIMUM_WAITING_TIME, STR_MAXIMUM_LENGTH_BEFORE_DEPARTING_TIP ),
MakeSpinnerWidgets({157, 154}, {152, 12}, WindowWidgetType::Spinner, WindowColour::Secondary, STR_ARG_14_STRINGID ), // NB: 3 widgets
MakeWidget ({ 7, 169}, {302, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_SYNCHRONISE_WITH_ADJACENT_STATIONS, STR_SYNCHRONISE_WITH_ADJACENT_STATIONS_TIP ),
MakeWidget ({ 21, 61}, {129, 12}, WindowWidgetType::Label, WindowColour::Secondary ),
MakeWidget ({ 21, 75}, {129, 12}, WindowWidgetType::Label, WindowColour::Secondary, STR_LIFT_HILL_CHAIN_SPEED ),
MakeWidget ({ 7, 47}, {302, 12}, WindowWidgetType::DropdownMenu, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_OPERATING_MODE ),
MakeWidget ({297, 48}, { 11, 10}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SELECT_OPERATING_MODE ),
MakeWidget ({ 87, 109}, {222, 12}, WindowWidgetType::DropdownMenu, WindowColour::Secondary ),
MakeWidget ({297, 110}, { 11, 10}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH ),
MakeWidget ({ 21, 89}, {129, 12}, WindowWidgetType::Label, WindowColour::Secondary, STR_NUMBER_OF_CIRCUITS, STR_NUMBER_OF_CIRCUITS_TIP ),
MakeSpinnerWidgets({157, 89}, {152, 12}, WindowWidgetType::Spinner, WindowColour::Secondary, STR_NUMBER_OF_CIRCUITS_VALUE ), // NB: 3 widgets
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{ WIDGETS_END },
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
};
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
// 0x009AE190
static rct_widget window_ride_maintenance_widgets[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
MAIN_RIDE_WIDGETS,
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
MakeWidget({107, 71}, {202, 12}, WindowWidgetType::DropdownMenu, WindowColour::Secondary, STR_EMPTY, STR_SELECT_HOW_OFTEN_A_MECHANIC_SHOULD_CHECK_THIS_RIDE),
MakeWidget({297, 72}, { 11, 10}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SELECT_HOW_OFTEN_A_MECHANIC_SHOULD_CHECK_THIS_RIDE),
MakeWidget({289, 108}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_LOCATE_NEAREST_AVAILABLE_MECHANIC_TIP ),
MakeWidget({265, 108}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_CONSTRUCTION, STR_REFURBISH_RIDE_TIP ),
MakeWidget({241, 108}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_NO_ENTRY, STR_DEBUG_FORCE_BREAKDOWN_TIP ),
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{ WIDGETS_END },
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
};
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
// 0x009AE2A4
static rct_widget window_ride_colour_widgets[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
MAIN_RIDE_WIDGETS,
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
MakeWidget({ 3, 47}, { 68, 47}, WindowWidgetType::Spinner, WindowColour::Secondary ),
MakeWidget({ 74, 49}, {239, 12}, WindowWidgetType::DropdownMenu, WindowColour::Secondary, STR_ARG_14_STRINGID ),
MakeWidget({301, 50}, { 11, 10}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_COLOUR_SCHEME_TO_CHANGE_TIP ),
MakeWidget({ 79, 74}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_MAIN_COLOUR_TIP ),
MakeWidget({ 99, 74}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_1_TIP ),
MakeWidget({119, 74}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_SUPPORT_STRUCTURE_COLOUR_TIP ),
MakeWidget({ 74, 49}, {239, 12}, WindowWidgetType::DropdownMenu, WindowColour::Secondary ),
MakeWidget({301, 50}, { 11, 10}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH ),
MakeWidget({289, 68}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_PAINTBRUSH, STR_PAINT_INDIVIDUAL_AREA_TIP ),
MakeWidget({245, 101}, { 68, 47}, WindowWidgetType::Spinner, WindowColour::Secondary ),
MakeWidget({103, 103}, {139, 12}, WindowWidgetType::DropdownMenu, WindowColour::Secondary, STR_EMPTY ),
MakeWidget({230, 104}, { 11, 10}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SELECT_STYLE_OF_ENTRANCE_EXIT_STATION_TIP),
MakeWidget({ 3, 157}, { 68, 47}, WindowWidgetType::Scroll, WindowColour::Secondary, STR_EMPTY ),
MakeWidget({ 74, 157}, {239, 12}, WindowWidgetType::DropdownMenu, WindowColour::Secondary, STR_ARG_6_STRINGID ),
MakeWidget({301, 158}, { 11, 10}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SELECT_VEHICLE_COLOUR_SCHEME_TIP ),
MakeWidget({ 74, 173}, {239, 12}, WindowWidgetType::DropdownMenu, WindowColour::Secondary ),
MakeWidget({301, 174}, { 11, 10}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SELECT_VEHICLE_TO_MODIFY_TIP ),
MakeWidget({ 79, 190}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_MAIN_COLOUR_TIP ),
MakeWidget({ 99, 190}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_1_TIP ),
MakeWidget({119, 190}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_2_TIP ),
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{ WIDGETS_END },
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
};
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
// 0x009AE4C8
static rct_widget window_ride_music_widgets[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
MAIN_RIDE_WIDGETS,
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
MakeWidget({ 7, 47}, {302, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_PLAY_MUSIC, STR_SELECT_MUSIC_TIP ),
MakeWidget({ 7, 62}, {302, 12}, WindowWidgetType::DropdownMenu, WindowColour::Secondary, STR_EMPTY ),
MakeWidget({297, 63}, { 11, 10}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SELECT_MUSIC_STYLE_TIP),
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{ WIDGETS_END },
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
};
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
// 0x009AE5DC
static rct_widget window_ride_measurements_widgets[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
MAIN_RIDE_WIDGETS,
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
MakeWidget({288, 194}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_FLOPPY, STR_SAVE_TRACK_DESIGN),
MakeWidget({ 4, 127}, {154, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_SELECT_NEARBY_SCENERY ),
MakeWidget({158, 127}, {154, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_RESET_SELECTION ),
MakeWidget({ 4, 177}, {154, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_DESIGN_SAVE ),
MakeWidget({158, 177}, {154, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_DESIGN_CANCEL ),
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{ WIDGETS_END },
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
};
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
// 0x009AE710
static rct_widget window_ride_graphs_widgets[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
MAIN_RIDE_WIDGETS,
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
MakeWidget({ 3, 46}, {306, 112}, WindowWidgetType::Scroll, WindowColour::Secondary, SCROLL_HORIZONTAL, STR_LOGGING_DATA_FROM_TIP ),
MakeWidget({ 3, 163}, { 73, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_RIDE_STATS_VELOCITY, STR_SHOW_GRAPH_OF_VELOCITY_AGAINST_TIME_TIP ),
MakeWidget({ 76, 163}, { 73, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_RIDE_STATS_ALTITUDE, STR_SHOW_GRAPH_OF_ALTITUDE_AGAINST_TIME_TIP ),
MakeWidget({149, 163}, { 73, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_RIDE_STATS_VERT_G, STR_SHOW_GRAPH_OF_VERTICAL_ACCELERATION_AGAINST_TIME_TIP),
MakeWidget({222, 163}, { 73, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_RIDE_STATS_LAT_G, STR_SHOW_GRAPH_OF_LATERAL_ACCELERATION_AGAINST_TIME_TIP ),
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{ WIDGETS_END },
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
};
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
// 0x009AE844
static rct_widget window_ride_income_widgets[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
MAIN_RIDE_WIDGETS,
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
MakeWidget ({ 19, 50}, {126, 14}, WindowWidgetType::Label, WindowColour::Secondary ),
MakeSpinnerWidgets({147, 50}, {162, 14}, WindowWidgetType::Spinner, WindowColour::Secondary, STR_ARG_6_CURRENCY2DP ), // NB: 3 widgets
MakeWidget ({ 5, 62}, {306, 13}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_SAME_PRICE_THROUGHOUT_PARK, STR_SAME_PRICE_THROUGHOUT_PARK_TIP),
MakeWidget ({ 19, 94}, {126, 14}, WindowWidgetType::Label, WindowColour::Secondary ),
MakeSpinnerWidgets({147, 94}, {162, 14}, WindowWidgetType::Spinner, WindowColour::Secondary, STR_RIDE_SECONDARY_PRICE_VALUE ), // NB: 3 widgets
MakeWidget ({ 5, 106}, {306, 13}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_SAME_PRICE_THROUGHOUT_PARK, STR_SAME_PRICE_THROUGHOUT_PARK_TIP),
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{ WIDGETS_END },
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
};
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
// 0x009AE9C8
static rct_widget window_ride_customer_widgets[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
MAIN_RIDE_WIDGETS,
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
MakeWidget({289, 54}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_SHOW_GUESTS_THOUGHTS_ABOUT_THIS_RIDE_ATTRACTION, STR_SHOW_GUESTS_THOUGHTS_ABOUT_THIS_RIDE_ATTRACTION_TIP),
MakeWidget({289, 78}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_SHOW_GUESTS_ON_THIS_RIDE_ATTRACTION, STR_SHOW_GUESTS_ON_THIS_RIDE_ATTRACTION_TIP ),
MakeWidget({289, 102}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_SHOW_GUESTS_QUEUING_FOR_THIS_RIDE_ATTRACTION, STR_SHOW_GUESTS_QUEUING_FOR_THIS_RIDE_ATTRACTION_TIP ),
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{ WIDGETS_END },
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
};
add and start implementing ride window
2014-08-25 16:04:28 +02:00
static rct_widget *window_ride_page_widgets[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_main_widgets,
window_ride_vehicle_widgets,
window_ride_operating_widgets,
window_ride_maintenance_widgets,
window_ride_colour_widgets,
window_ride_music_widgets,
window_ride_measurements_widgets,
window_ride_graphs_widgets,
window_ride_income_widgets,
window_ride_customer_widgets
add and start implementing ride window
2014-08-25 16:04:28 +02:00
};
Replace hardcode value and better readibility in ride.c
2017-03-11 17:49:15 +01:00
#define MAIN_RIDE_ENABLED_WIDGETS \
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
(1ULL << WIDX_CLOSE) | \
(1ULL << WIDX_TAB_1) | \
(1ULL << WIDX_TAB_2) | \
(1ULL << WIDX_TAB_3) | \
(1ULL << WIDX_TAB_4) | \
(1ULL << WIDX_TAB_5) | \
(1ULL << WIDX_TAB_6) | \
(1ULL << WIDX_TAB_7) | \
(1ULL << WIDX_TAB_8) | \
(1ULL << WIDX_TAB_9) | \
(1ULL << WIDX_TAB_10)
Replace magic values for enabled widgets in Ride window (#5278)
2017-03-11 22:29:39 +01:00
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static constexpr const uint64_t window_ride_page_enabled_widgets[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
MAIN_RIDE_ENABLED_WIDGETS |
(1ULL << WIDX_VIEW) |
(1ULL << WIDX_VIEW_DROPDOWN) |
(1ULL << WIDX_OPEN) |
(1ULL << WIDX_CONSTRUCTION) |
(1ULL << WIDX_RENAME) |
(1ULL << WIDX_LOCATE) |
(1ULL << WIDX_DEMOLISH) |
(1ULL << WIDX_CLOSE_LIGHT) |
Add and implement simulation mode for rides
2019-05-07 21:14:21 +02:00
(1ULL << WIDX_SIMULATE_LIGHT) |
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
(1ULL << WIDX_TEST_LIGHT) |
(1ULL << WIDX_OPEN_LIGHT) |
(1ULL << WIDX_RIDE_TYPE) |
Turn ride type selection into a normal dropdown. This removes the spinner aspect that previously worked around dropdown item limits.
2018-05-29 11:04:17 +02:00
(1ULL << WIDX_RIDE_TYPE_DROPDOWN),
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
MAIN_RIDE_ENABLED_WIDGETS |
(1ULL << WIDX_VEHICLE_TYPE) |
(1ULL << WIDX_VEHICLE_TYPE_DROPDOWN) |
(1ULL << WIDX_VEHICLE_TRAINS) |
(1ULL << WIDX_VEHICLE_TRAINS_INCREASE) |
(1ULL << WIDX_VEHICLE_TRAINS_DECREASE) |
(1ULL << WIDX_VEHICLE_CARS_PER_TRAIN) |
(1ULL << WIDX_VEHICLE_CARS_PER_TRAIN_INCREASE) |
(1ULL << WIDX_VEHICLE_CARS_PER_TRAIN_DECREASE),
MAIN_RIDE_ENABLED_WIDGETS |
(1ULL << WIDX_MODE_TWEAK_INCREASE) |
(1ULL << WIDX_MODE_TWEAK_DECREASE) |
(1ULL << WIDX_LIFT_HILL_SPEED_INCREASE) |
(1ULL << WIDX_LIFT_HILL_SPEED_DECREASE) |
(1ULL << WIDX_LOAD_CHECKBOX) |
(1ULL << WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX) |
(1ULL << WIDX_MINIMUM_LENGTH_CHECKBOX) |
(1ULL << WIDX_MINIMUM_LENGTH_INCREASE) |
(1ULL << WIDX_MINIMUM_LENGTH_DECREASE) |
(1ULL << WIDX_MAXIMUM_LENGTH_CHECKBOX) |
(1ULL << WIDX_MAXIMUM_LENGTH_INCREASE) |
(1ULL << WIDX_MAXIMUM_LENGTH_DECREASE) |
(1ULL << WIDX_SYNCHRONISE_WITH_ADJACENT_STATIONS_CHECKBOX) |
(1ULL << WIDX_MODE) |
(1ULL << WIDX_MODE_DROPDOWN) |
(1ULL << WIDX_LOAD) |
(1ULL << WIDX_LOAD_DROPDOWN) |
(1ULL << WIDX_OPERATE_NUMBER_OF_CIRCUITS_INCREASE) |
(1ULL << WIDX_OPERATE_NUMBER_OF_CIRCUITS_DECREASE),
MAIN_RIDE_ENABLED_WIDGETS |
(1ULL << WIDX_INSPECTION_INTERVAL) |
(1ULL << WIDX_INSPECTION_INTERVAL_DROPDOWN) |
(1ULL << WIDX_LOCATE_MECHANIC) |
Add button to refurbish ride Add a button to refurbish the selected ride. The cost for this is 35% of the build price and may only be done if the ride is closed and empty.
2018-03-29 11:17:54 +02:00
(1ULL << WIDX_REFURBISH_RIDE) |
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
(1ULL << WIDX_FORCE_BREAKDOWN),
MAIN_RIDE_ENABLED_WIDGETS |
(1ULL << WIDX_TRACK_COLOUR_SCHEME_DROPDOWN) |
(1ULL << WIDX_TRACK_MAIN_COLOUR) |
(1ULL << WIDX_TRACK_ADDITIONAL_COLOUR) |
(1ULL << WIDX_TRACK_SUPPORT_COLOUR) |
(1ULL << WIDX_MAZE_STYLE) |
(1ULL << WIDX_MAZE_STYLE_DROPDOWN) |
(1ULL << WIDX_PAINT_INDIVIDUAL_AREA) |
(1ULL << WIDX_ENTRANCE_STYLE) |
(1ULL << WIDX_ENTRANCE_STYLE_DROPDOWN) |
(1ULL << WIDX_VEHICLE_COLOUR_SCHEME_DROPDOWN) |
(1ULL << WIDX_VEHICLE_COLOUR_INDEX) |
(1ULL << WIDX_VEHICLE_COLOUR_INDEX_DROPDOWN) |
(1ULL << WIDX_VEHICLE_MAIN_COLOUR) |
(1ULL << WIDX_VEHICLE_ADDITIONAL_COLOUR_1) |
(1ULL << WIDX_VEHICLE_ADDITIONAL_COLOUR_2),
MAIN_RIDE_ENABLED_WIDGETS |
(1ULL << WIDX_PLAY_MUSIC) |
(1ULL << WIDX_MUSIC) |
(1ULL << WIDX_MUSIC_DROPDOWN),
MAIN_RIDE_ENABLED_WIDGETS |
(1ULL << WIDX_SAVE_TRACK_DESIGN) |
(1ULL << WIDX_SELECT_NEARBY_SCENERY) |
(1ULL << WIDX_RESET_SELECTION) |
(1ULL << WIDX_SAVE_DESIGN) |
(1ULL << WIDX_CANCEL_DESIGN),
MAIN_RIDE_ENABLED_WIDGETS |
(1ULL << WIDX_GRAPH_VELOCITY) |
(1ULL << WIDX_GRAPH_ALTITUDE) |
(1ULL << WIDX_GRAPH_VERTICAL) |
(1ULL << WIDX_GRAPH_LATERAL),
MAIN_RIDE_ENABLED_WIDGETS |
Make ride window prices allow text input
2017-07-24 10:56:08 +02:00
(1ULL << WIDX_PRIMARY_PRICE) |
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
(1ULL << WIDX_PRIMARY_PRICE_INCREASE) |
(1ULL << WIDX_PRIMARY_PRICE_DECREASE) |
(1ULL << WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK) |
Make ride window prices allow text input
2017-07-24 10:56:08 +02:00
(1ULL << WIDX_SECONDARY_PRICE) |
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
(1ULL << WIDX_SECONDARY_PRICE_INCREASE) |
(1ULL << WIDX_SECONDARY_PRICE_DECREASE) |
(1ULL << WIDX_SECONDARY_PRICE_SAME_THROUGHOUT_PARK),
MAIN_RIDE_ENABLED_WIDGETS |
(1ULL << WIDX_SHOW_GUESTS_THOUGHTS) |
(1ULL << WIDX_SHOW_GUESTS_ON_RIDE) |
(1ULL << WIDX_SHOW_GUESTS_QUEUING),
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
};
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static constexpr const uint64_t window_ride_page_hold_down_widgets[] = {
Fix #7589: Error in ride window's hold_down_widgets
2018-05-31 00:24:48 +02:00
0,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
(1ULL << WIDX_VEHICLE_TRAINS_INCREASE) |
(1ULL << WIDX_VEHICLE_TRAINS_DECREASE) |
(1ULL << WIDX_VEHICLE_CARS_PER_TRAIN_INCREASE) |
(1ULL << WIDX_VEHICLE_CARS_PER_TRAIN_DECREASE),
(1ULL << WIDX_MODE_TWEAK_INCREASE) |
(1ULL << WIDX_MODE_TWEAK_DECREASE) |
(1ULL << WIDX_LIFT_HILL_SPEED_INCREASE) |
(1ULL << WIDX_LIFT_HILL_SPEED_DECREASE) |
(1ULL << WIDX_MINIMUM_LENGTH_INCREASE) |
(1ULL << WIDX_MINIMUM_LENGTH_DECREASE) |
(1ULL << WIDX_MAXIMUM_LENGTH_INCREASE) |
Fix #14095: Holding down [-][+] buttons does not change number of circuits
2021-02-17 08:51:07 +01:00
(1ULL << WIDX_MAXIMUM_LENGTH_DECREASE) |
(1ULL << WIDX_OPERATE_NUMBER_OF_CIRCUITS_INCREASE) |
(1ULL << WIDX_OPERATE_NUMBER_OF_CIRCUITS_DECREASE),
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
0,
0,
0,
0,
0,
(1ULL << WIDX_PRIMARY_PRICE_INCREASE) |
(1ULL << WIDX_PRIMARY_PRICE_DECREASE) |
(1ULL << WIDX_SECONDARY_PRICE_INCREASE) |
(1ULL << WIDX_SECONDARY_PRICE_DECREASE),
0
refactor window hold down widgets (var_020)
2015-02-10 21:40:33 +01:00
};
add and start implementing ride window
2014-08-25 16:04:28 +02:00
#pragma endregion
#pragma region Events
Fix compile error
2014-09-21 18:43:53 +02:00
static void window_ride_init_viewport(rct_window *w);
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
Use rct_widgetindex type
2017-05-01 15:41:45 +02:00
static void window_ride_main_mouseup(rct_window *w, rct_widgetindex widgetIndex);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_ride_main_resize(rct_window *w);
Apply new mousedown event parameters to windows
2017-07-03 23:09:46 +02:00
static void window_ride_main_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void window_ride_main_dropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
static void window_ride_main_update(rct_window *w);
Use rct_widgetindex type
2017-05-01 15:41:45 +02:00
static void window_ride_main_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
rename event unknown_14 to viewport_rotate
2017-06-26 09:56:41 +02:00
static void window_ride_main_viewport_rotate(rct_window *w);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_ride_main_invalidate(rct_window *w);
static void window_ride_main_paint(rct_window *w, rct_drawpixelinfo *dpi);
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
Use rct_widgetindex type
2017-05-01 15:41:45 +02:00
static void window_ride_vehicle_mouseup(rct_window *w, rct_widgetindex widgetIndex);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_ride_vehicle_resize(rct_window *w);
Apply new mousedown event parameters to windows
2017-07-03 23:09:46 +02:00
static void window_ride_vehicle_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void window_ride_vehicle_dropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
static void window_ride_vehicle_update(rct_window *w);
Tooltip 2 (#13159) * Use ScreenCoords for tooltip * Remove temporary variables * Small refactor * Fix #13151. Not passing tooltip arguments correctly for ride window * Fix Server List window version tooltip * Fix cheats tooltip event * Add static to function decl * Remove unreachable break statements in Ride.cpp * Apply review suggestions Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-10-17 10:10:08 +02:00
static OpenRCT2String window_ride_vehicle_tooltip(rct_window* const w, const rct_widgetindex widgetIndex, rct_string_id fallback);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_ride_vehicle_invalidate(rct_window *w);
static void window_ride_vehicle_paint(rct_window *w, rct_drawpixelinfo *dpi);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void window_ride_vehicle_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
Use rct_widgetindex type
2017-05-01 15:41:45 +02:00
static void window_ride_operating_mouseup(rct_window *w, rct_widgetindex widgetIndex);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_ride_operating_resize(rct_window *w);
Apply new mousedown event parameters to windows
2017-07-03 23:09:46 +02:00
static void window_ride_operating_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void window_ride_operating_dropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
static void window_ride_operating_update(rct_window *w);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_ride_operating_invalidate(rct_window *w);
static void window_ride_operating_paint(rct_window *w, rct_drawpixelinfo *dpi);
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
Use rct_widgetindex type
2017-05-01 15:41:45 +02:00
static void window_ride_maintenance_mouseup(rct_window *w, rct_widgetindex widgetIndex);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_ride_maintenance_resize(rct_window *w);
Apply new mousedown event parameters to windows
2017-07-03 23:09:46 +02:00
static void window_ride_maintenance_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void window_ride_maintenance_dropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
static void window_ride_maintenance_update(rct_window *w);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_ride_maintenance_invalidate(rct_window *w);
static void window_ride_maintenance_paint(rct_window *w, rct_drawpixelinfo *dpi);
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_ride_colour_close(rct_window *w);
Use rct_widgetindex type
2017-05-01 15:41:45 +02:00
static void window_ride_colour_mouseup(rct_window *w, rct_widgetindex widgetIndex);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_ride_colour_resize(rct_window *w);
Apply new mousedown event parameters to windows
2017-07-03 23:09:46 +02:00
static void window_ride_colour_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void window_ride_colour_dropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
static void window_ride_colour_update(rct_window *w);
Prefer const ref to send ScreenCoordsXY over
2020-02-29 03:43:29 +01:00
static void window_ride_colour_tooldown(rct_window *w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_ride_colour_tooldrag(rct_window *w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_ride_colour_invalidate(rct_window *w);
static void window_ride_colour_paint(rct_window *w, rct_drawpixelinfo *dpi);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void window_ride_colour_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
Use rct_widgetindex type
2017-05-01 15:41:45 +02:00
static void window_ride_music_mouseup(rct_window *w, rct_widgetindex widgetIndex);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_ride_music_resize(rct_window *w);
Apply new mousedown event parameters to windows
2017-07-03 23:09:46 +02:00
static void window_ride_music_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void window_ride_music_dropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
static void window_ride_music_update(rct_window *w);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_ride_music_invalidate(rct_window *w);
static void window_ride_music_paint(rct_window *w, rct_drawpixelinfo *dpi);
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_ride_measurements_close(rct_window *w);
Use rct_widgetindex type
2017-05-01 15:41:45 +02:00
static void window_ride_measurements_mouseup(rct_window *w, rct_widgetindex widgetIndex);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_ride_measurements_resize(rct_window *w);
Apply new mousedown event parameters to windows
2017-07-03 23:09:46 +02:00
static void window_ride_measurements_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void window_ride_measurements_dropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
static void window_ride_measurements_update(rct_window *w);
Prefer const ref to send ScreenCoordsXY over
2020-02-29 03:43:29 +01:00
static void window_ride_measurements_tooldown(rct_window *w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_ride_measurements_tooldrag(rct_window *w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
Use rct_widgetindex type
2017-05-01 15:41:45 +02:00
static void window_ride_measurements_toolabort(rct_window *w, rct_widgetindex widgetIndex);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_ride_measurements_invalidate(rct_window *w);
static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi);
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
Use rct_widgetindex type
2017-05-01 15:41:45 +02:00
static void window_ride_graphs_mouseup(rct_window *w, rct_widgetindex widgetIndex);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_ride_graphs_resize(rct_window *w);
Apply new mousedown event parameters to windows
2017-07-03 23:09:46 +02:00
static void window_ride_graphs_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
static void window_ride_graphs_update(rct_window *w);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void window_ride_graphs_scrollgetheight(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void window_ride_graphs_15(rct_window *w, int32_t scrollIndex, int32_t scrollAreaType);
Rework tooltip to be more logical (#13137)
2020-10-10 15:49:56 +02:00
static OpenRCT2String window_ride_graphs_tooltip(rct_window* w, const rct_widgetindex widgetIndex, const rct_string_id fallback);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_ride_graphs_invalidate(rct_window *w);
static void window_ride_graphs_paint(rct_window *w, rct_drawpixelinfo *dpi);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void window_ride_graphs_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
Use rct_widgetindex type
2017-05-01 15:41:45 +02:00
static void window_ride_income_mouseup(rct_window *w, rct_widgetindex widgetIndex);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_ride_income_resize(rct_window *w);
Apply new mousedown event parameters to windows
2017-07-03 23:09:46 +02:00
static void window_ride_income_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
static void window_ride_income_update(rct_window *w);
Make ride window prices allow text input
2017-07-24 10:56:08 +02:00
static void window_ride_income_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_ride_income_invalidate(rct_window *w);
static void window_ride_income_paint(rct_window *w, rct_drawpixelinfo *dpi);
Small cleanup to ride window price box
2018-06-01 14:23:46 +02:00
static bool window_ride_income_can_modify_primary_price(rct_window* w);
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
Use rct_widgetindex type
2017-05-01 15:41:45 +02:00
static void window_ride_customer_mouseup(rct_window *w, rct_widgetindex widgetIndex);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_ride_customer_resize(rct_window *w);
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
static void window_ride_customer_update(rct_window *w);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_ride_customer_invalidate(rct_window *w);
static void window_ride_customer_paint(rct_window *w, rct_drawpixelinfo *dpi);
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void window_ride_set_page(rct_window *w, int32_t page);
Add GUI option for switching to the RCT1 colour scheme, along with proper invalidation of the affected windows
2015-05-21 12:28:51 +02:00
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
// 0x0098DFD4
Compact, statically initialized syntax for event lists (#12973)
2020-09-28 20:36:15 +02:00
static rct_window_event_list window_ride_main_events([](auto& events)
{
events.mouse_up = &window_ride_main_mouseup;
events.resize = &window_ride_main_resize;
events.mouse_down = &window_ride_main_mousedown;
events.dropdown = &window_ride_main_dropdown;
events.update = &window_ride_main_update;
events.text_input = &window_ride_main_textinput;
events.viewport_rotate = &window_ride_main_viewport_rotate;
events.invalidate = &window_ride_main_invalidate;
events.paint = &window_ride_main_paint;
});
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
// 0x0098E204
Compact, statically initialized syntax for event lists (#12973)
2020-09-28 20:36:15 +02:00
static rct_window_event_list window_ride_vehicle_events([](auto& events)
{
events.mouse_up = &window_ride_vehicle_mouseup;
events.resize = &window_ride_vehicle_resize;
events.mouse_down = &window_ride_vehicle_mousedown;
events.dropdown = &window_ride_vehicle_dropdown;
events.update = &window_ride_vehicle_update;
Tooltip 2 (#13159) * Use ScreenCoords for tooltip * Remove temporary variables * Small refactor * Fix #13151. Not passing tooltip arguments correctly for ride window * Fix Server List window version tooltip * Fix cheats tooltip event * Add static to function decl * Remove unreachable break statements in Ride.cpp * Apply review suggestions Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-10-17 10:10:08 +02:00
events.tooltip = &window_ride_vehicle_tooltip;
Compact, statically initialized syntax for event lists (#12973)
2020-09-28 20:36:15 +02:00
events.invalidate = &window_ride_vehicle_invalidate;
events.paint = &window_ride_vehicle_paint;
events.scroll_paint = &window_ride_vehicle_scrollpaint;
});
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
// 0x0098E0B4
Compact, statically initialized syntax for event lists (#12973)
2020-09-28 20:36:15 +02:00
static rct_window_event_list window_ride_operating_events([](auto& events)
{
events.mouse_up = &window_ride_operating_mouseup;
events.resize = &window_ride_operating_resize;
events.mouse_down = &window_ride_operating_mousedown;
events.dropdown = &window_ride_operating_dropdown;
events.update = &window_ride_operating_update;
events.invalidate = &window_ride_operating_invalidate;
events.paint = &window_ride_operating_paint;
});
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
// 0x0098E124
Compact, statically initialized syntax for event lists (#12973)
2020-09-28 20:36:15 +02:00
static rct_window_event_list window_ride_maintenance_events([](auto& events)
{
events.mouse_up = &window_ride_maintenance_mouseup;
events.resize = &window_ride_maintenance_resize;
events.mouse_down = &window_ride_maintenance_mousedown;
events.dropdown = &window_ride_maintenance_dropdown;
events.update = &window_ride_maintenance_update;
events.invalidate = &window_ride_maintenance_invalidate;
events.paint = &window_ride_maintenance_paint;
});
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
// 0x0098E044
Compact, statically initialized syntax for event lists (#12973)
2020-09-28 20:36:15 +02:00
static rct_window_event_list window_ride_colour_events([](auto& events)
{
events.close = &window_ride_colour_close;
events.mouse_up = &window_ride_colour_mouseup;
events.resize = &window_ride_colour_resize;
events.mouse_down = &window_ride_colour_mousedown;
events.dropdown = &window_ride_colour_dropdown;
events.update = &window_ride_colour_update;
events.tool_down = &window_ride_colour_tooldown;
events.tool_drag = &window_ride_colour_tooldrag;
events.invalidate = &window_ride_colour_invalidate;
events.paint = &window_ride_colour_paint;
events.scroll_paint = &window_ride_colour_scrollpaint;
});
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
// 0x0098E194
Compact, statically initialized syntax for event lists (#12973)
2020-09-28 20:36:15 +02:00
static rct_window_event_list window_ride_music_events([](auto& events)
{
events.mouse_up = &window_ride_music_mouseup;
events.resize = &window_ride_music_resize;
events.mouse_down = &window_ride_music_mousedown;
events.dropdown = &window_ride_music_dropdown;
events.update = &window_ride_music_update;
events.invalidate = &window_ride_music_invalidate;
events.paint = &window_ride_music_paint;
});
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
// 0x0098DE14
Compact, statically initialized syntax for event lists (#12973)
2020-09-28 20:36:15 +02:00
static rct_window_event_list window_ride_measurements_events([](auto& events)
{
events.close = &window_ride_measurements_close;
events.mouse_up = &window_ride_measurements_mouseup;
events.resize = &window_ride_measurements_resize;
events.mouse_down = &window_ride_measurements_mousedown;
events.dropdown = &window_ride_measurements_dropdown;
events.update = &window_ride_measurements_update;
events.tool_down = &window_ride_measurements_tooldown;
events.tool_drag = &window_ride_measurements_tooldrag;
events.tool_abort = &window_ride_measurements_toolabort;
events.invalidate = &window_ride_measurements_invalidate;
events.paint = &window_ride_measurements_paint;
});
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
// 0x0098DF64
Compact, statically initialized syntax for event lists (#12973)
2020-09-28 20:36:15 +02:00
static rct_window_event_list window_ride_graphs_events([](auto& events)
{
events.mouse_up = &window_ride_graphs_mouseup;
events.resize = &window_ride_graphs_resize;
events.mouse_down = &window_ride_graphs_mousedown;
events.update = &window_ride_graphs_update;
events.get_scroll_size = &window_ride_graphs_scrollgetheight;
events.unknown_15 = &window_ride_graphs_15;
events.tooltip = &window_ride_graphs_tooltip;
events.invalidate = &window_ride_graphs_invalidate;
events.paint = &window_ride_graphs_paint;
events.scroll_paint = &window_ride_graphs_scrollpaint;
});
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
// 0x0098DEF4
Compact, statically initialized syntax for event lists (#12973)
2020-09-28 20:36:15 +02:00
static rct_window_event_list window_ride_income_events([](auto& events)
{
events.mouse_up = &window_ride_income_mouseup;
events.resize = &window_ride_income_resize;
events.mouse_down = &window_ride_income_mousedown;
events.update = &window_ride_income_update;
events.text_input = &window_ride_income_textinput;
events.invalidate = &window_ride_income_invalidate;
events.paint = &window_ride_income_paint;
});
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
// 0x0098DE84
Compact, statically initialized syntax for event lists (#12973)
2020-09-28 20:36:15 +02:00
static rct_window_event_list window_ride_customer_events([](auto& events)
{
events.mouse_up = &window_ride_customer_mouseup;
events.resize = &window_ride_customer_resize;
events.update = &window_ride_customer_update;
events.invalidate = &window_ride_customer_invalidate;
events.paint = &window_ride_customer_paint;
});
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static rct_window_event_list *window_ride_page_events[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
&window_ride_main_events,
&window_ride_vehicle_events,
&window_ride_operating_events,
&window_ride_maintenance_events,
&window_ride_colour_events,
&window_ride_music_events,
&window_ride_measurements_events,
&window_ride_graphs_events,
&window_ride_income_events,
&window_ride_customer_events
add and start implementing ride window
2014-08-25 16:04:28 +02:00
};
#pragma endregion
Support mouse dragging when selecting ride design scenery Define nearby scenery distance, support mouse dragging when selecting/deselecting ride design scenery
2017-05-29 22:34:33 +02:00
static bool _collectTrackDesignScenery = false;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static int32_t _lastSceneryX = 0;
static int32_t _lastSceneryY = 0;
Link everything together
2019-06-30 12:23:06 +02:00
static std::unique_ptr<TrackDesign> _trackDesign;
Fix #4172: Expose ride-type changing capability in UI This also allows changing ride type in multiplayer games. Very crashy.
2016-07-26 00:52:50 +02:00
Fix ride overall views being recalculated constantly
2016-02-18 21:38:05 +01:00
// Cached overall view for each ride
// (Re)calculated when the ride window is opened
Remove and replace C typedefs `typedef struct/union/enum name { ... } name_again;` is not needed whe compiling C++, moving the name at the back to be in front of the object and removing `typedef` makes it usable the very same way. This also replaces typedefs with the using keyword. They have better readability, especially for function pointer types, and would allow more flexibility when used with templates.
2018-02-14 09:42:26 +01:00
struct ride_overall_view {
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int16_t x, y, z;
uint8_t zoom;
Remove and replace C typedefs `typedef struct/union/enum name { ... } name_again;` is not needed whe compiling C++, moving the name at the back to be in front of the object and removing `typedef` makes it usable the very same way. This also replaces typedefs with the using keyword. They have better readability, especially for function pointer types, and would allow more flexibility when used with templates.
2018-02-14 09:42:26 +01:00
};
Fix ride overall views being recalculated constantly
2016-02-18 21:38:05 +01:00
Refactor ride list to a manager with iterator
2019-08-03 18:27:50 +02:00
static std::vector<ride_overall_view> ride_overall_views = {};
Fix ride overall views being recalculated constantly
2016-02-18 21:38:05 +01:00
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static constexpr const int32_t window_ride_tab_animation_divisor[] = { 0, 0, 2, 2, 4, 2, 8, 8, 2, 0 };
static constexpr const int32_t window_ride_tab_animation_frames[] = { 0, 0, 4, 16, 8, 16, 8, 8, 8, 0 };
implement tab images
2014-09-04 00:19:13 +02:00
Use const and constexpr whenever possible.
2018-01-11 14:50:31 +01:00
static constexpr const rct_string_id RatingNames[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
STR_RATING_LOW,
STR_RATING_MEDIUM,
STR_RATING_HIGH,
STR_RATING_VERY_HIGH,
STR_RATING_EXTREME,
STR_RATING_ULTRA_EXTREME,
Clean up string and sprite ID's (#3977)
2016-07-14 14:07:49 +02:00
};
Use const and constexpr whenever possible.
2018-01-11 14:50:31 +01:00
static constexpr const rct_string_id RideBreakdownReasonNames[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
STR_RIDE_BREAKDOWN_SAFETY_CUT_OUT ,
STR_RIDE_BREAKDOWN_RESTRAINTS_STUCK_CLOSED,
STR_RIDE_BREAKDOWN_RESTRAINTS_STUCK_OPEN,
STR_RIDE_BREAKDOWN_DOORS_STUCK_CLOSED,
STR_RIDE_BREAKDOWN_DOORS_STUCK_OPEN,
STR_RIDE_BREAKDOWN_VEHICLE_MALFUNCTION,
STR_RIDE_BREAKDOWN_BRAKES_FAILURE,
STR_RIDE_BREAKDOWN_CONTROL_FAILURE
Clean up string and sprite ID's (#3977)
2016-07-14 14:07:49 +02:00
};
Expose colour scheme in the tile inspector (#6116)
2019-04-22 15:49:09 +02:00
const rct_string_id ColourSchemeNames[4] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
STR_MAIN_COLOUR_SCHEME,
STR_ALTERNATIVE_COLOUR_SCHEME_1,
STR_ALTERNATIVE_COLOUR_SCHEME_2,
STR_ALTERNATIVE_COLOUR_SCHEME_3,
Clean up string and sprite ID's (#3977)
2016-07-14 14:07:49 +02:00
};
Use const and constexpr whenever possible.
2018-01-11 14:50:31 +01:00
static constexpr const rct_string_id VehicleLoadNames[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
STR_QUARTER_LOAD,
STR_HALF_LOAD,
STR_THREE_QUARTER_LOAD,
STR_FULL_LOAD,
STR_ANY_LOAD,
Clean up string and sprite ID's (#3977)
2016-07-14 14:07:49 +02:00
};
Use const and constexpr whenever possible.
2018-01-11 14:50:31 +01:00
static constexpr const rct_string_id VehicleColourSchemeNames[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
STR_ALL_VEHICLES_IN_SAME_COLOURS ,
STR_DIFFERENT_COLOURS_PER ,
STR_DIFFERENT_COLOURS_PER_VEHICLE ,
Clean up string and sprite ID's (#3977)
2016-07-14 14:07:49 +02:00
};
Use const and constexpr whenever possible.
2018-01-11 14:50:31 +01:00
static constexpr const rct_string_id VehicleStatusNames[] = {
Close #12440: Refactor VEHICLE_STATUS to use strong enum (#12606) * Close #12440: Refactor VEHICLE_STATUS to use strong enum * Fix code formatting for VEHICLE_STATUS refactoring * Refactor VehicleStatus enum to be inside Vehicle This commit moves VehicleStatus inside Vehicle, renamed as Status.
2020-08-09 07:24:25 +02:00
STR_MOVING_TO_END_OF, // Vehicle::Status::MovingToEndOfStation
STR_WAITING_FOR_PASSENGERS_AT, // Vehicle::Status::WaitingForPassengers
STR_WAITING_TO_DEPART, // Vehicle::Status::WaitingToDepart
STR_DEPARTING, // Vehicle::Status::Departing
STR_TRAVELLING_AT_0, // Vehicle::Status::Travelling
STR_ARRIVING_AT, // Vehicle::Status::Arriving
STR_UNLOADING_PASSENGERS_AT, // Vehicle::Status::UnloadingPassengers
STR_TRAVELLING_AT_1, // Vehicle::Status::TravellingBoat
STR_CRASHING, // Vehicle::Status::Crashing
STR_CRASHED_0, // Vehicle::Status::Crashed
STR_TRAVELLING_AT_2, // Vehicle::Status::TravellingDodgems
STR_SWINGING, // Vehicle::Status::Swinging
STR_ROTATING_0, // Vehicle::Status::Rotating
STR_ROTATING_1, // Vehicle::Status::FerrisWheelRotating
STR_OPERATING_0, // Vehicle::Status::SimulatorOperating
STR_SHOWING_FILM, // Vehicle::Status::ShowingFilm
STR_ROTATING_2, // Vehicle::Status::SpaceRingsOperating
STR_OPERATING_1, // Vehicle::Status::TopSpinOperating
STR_OPERATING_2, // Vehicle::Status::HauntedHouseOperating
STR_DOING_CIRCUS_SHOW, // Vehicle::Status::DoingCircusShow
STR_OPERATING_3, // Vehicle::Status::CrookedHouseOperating
STR_WAITING_FOR_CABLE_LIFT, // Vehicle::Status::WaitingForCableLift
STR_TRAVELLING_AT_3, // Vehicle::Status::TravellingCableLift
STR_STOPPING_0, // Vehicle::Status::Stopping
STR_WAITING_FOR_PASSENGERS, // Vehicle::Status::WaitingForPassengers17
STR_WAITING_TO_START, // Vehicle::Status::WaitingToStart
STR_STARTING, // Vehicle::Status::Starting
STR_OPERATING, // Vehicle::Status::Operating1A
STR_STOPPING_1, // Vehicle::Status::Stopping1B
STR_UNLOADING_PASSENGERS, // Vehicle::Status::UnloadingPassengers1C
STR_STOPPED_BY_BLOCK_BRAKES, // Vehicle::Status::StoppedByBlockBrakes
Clean up string and sprite ID's (#3977)
2016-07-14 14:07:49 +02:00
};
Use const and constexpr whenever possible.
2018-01-11 14:50:31 +01:00
static constexpr const rct_string_id SingleSessionVehicleStatusNames[] = {
Close #12440: Refactor VEHICLE_STATUS to use strong enum (#12606) * Close #12440: Refactor VEHICLE_STATUS to use strong enum * Fix code formatting for VEHICLE_STATUS refactoring * Refactor VehicleStatus enum to be inside Vehicle This commit moves VehicleStatus inside Vehicle, renamed as Status.
2020-08-09 07:24:25 +02:00
STR_STOPPING_0, // Vehicle::Status::MovingToEndOfStation
STR_WAITING_FOR_PASSENGERS, // Vehicle::Status::WaitingForPassengers
STR_WAITING_TO_START, // Vehicle::Status::WaitingToDepart
STR_STARTING, // Vehicle::Status::Departing
STR_OPERATING, // Vehicle::Status::Travelling
STR_STOPPING_1, // Vehicle::Status::Arriving
STR_UNLOADING_PASSENGERS, // Vehicle::Status::UnloadingPassengers
Clean up string and sprite ID's (#3977)
2016-07-14 14:07:49 +02:00
};
Use const and constexpr whenever possible.
2018-01-11 14:50:31 +01:00
static constexpr const rct_string_id MusicStyleNames[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
STR_MUSIC_STYLE_DODGEMS_BEAT,
STR_MUSIC_STYLE_FAIRGROUND_ORGAN,
STR_MUSIC_STYLE_ROMAN_FANFARE,
STR_MUSIC_STYLE_ORIENTAL,
STR_MUSIC_STYLE_MARTIAN,
STR_MUSIC_STYLE_JUNGLE_DRUMS,
STR_MUSIC_STYLE_EGYPTIAN,
STR_MUSIC_STYLE_TOYLAND,
STR_MUSIC_STYLE_CIRCUS_SHOW,
STR_MUSIC_STYLE_SPACE,
STR_MUSIC_STYLE_HORROR,
STR_MUSIC_STYLE_TECHNO,
STR_MUSIC_STYLE_GENTLE,
STR_MUSIC_STYLE_SUMMER,
STR_MUSIC_STYLE_WATER,
STR_MUSIC_STYLE_WILD_WEST,
STR_MUSIC_STYLE_JURASSIC,
STR_MUSIC_STYLE_ROCK,
STR_MUSIC_STYLE_RAGTIME,
STR_MUSIC_STYLE_FANTASY,
STR_MUSIC_STYLE_ROCK_STYLE_2,
STR_MUSIC_STYLE_ICE,
STR_MUSIC_STYLE_SNOW,
STR_MUSIC_STYLE_CUSTOM_MUSIC_1,
STR_MUSIC_STYLE_CUSTOM_MUSIC_2,
STR_MUSIC_STYLE_MEDIEVAL,
STR_MUSIC_STYLE_URBAN,
STR_MUSIC_STYLE_ORGAN,
STR_MUSIC_STYLE_MECHANICAL,
STR_MUSIC_STYLE_MODERN,
STR_MUSIC_STYLE_PIRATES,
STR_MUSIC_STYLE_ROCK_STYLE_3,
STR_MUSIC_STYLE_CANDY_STYLE,
Clean up string and sprite ID's (#3977)
2016-07-14 14:07:49 +02:00
};
Remove and replace C typedefs `typedef struct/union/enum name { ... } name_again;` is not needed whe compiling C++, moving the name at the back to be in front of the object and removing `typedef` makes it usable the very same way. This also replaces typedefs with the using keyword. They have better readability, especially for function pointer types, and would allow more flexibility when used with templates.
2018-02-14 09:42:26 +01:00
struct window_ride_maze_design_option {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_string_id text;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint32_t sprite;
Remove and replace C typedefs `typedef struct/union/enum name { ... } name_again;` is not needed whe compiling C++, moving the name at the back to be in front of the object and removing `typedef` makes it usable the very same way. This also replaces typedefs with the using keyword. They have better readability, especially for function pointer types, and would allow more flexibility when used with templates.
2018-02-14 09:42:26 +01:00
};
Clean up string and sprite ID's (#3977)
2016-07-14 14:07:49 +02:00
Use const and constexpr whenever possible.
2018-01-11 14:50:31 +01:00
static constexpr const window_ride_maze_design_option MazeOptions[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{ STR_RIDE_DESIGN_MAZE_BRICK_WALLS, SPR_RIDE_DESIGN_PREVIEW_MAZE_BRICK_WALLS },
{ STR_RIDE_DESIGN_MAZE_HEDGES, SPR_RIDE_DESIGN_PREVIEW_MAZE_HEDGES },
{ STR_RIDE_DESIGN_MAZE_ICE_BLOCKS, SPR_RIDE_DESIGN_PREVIEW_MAZE_ICE_BLOCKS },
{ STR_RIDE_DESIGN_MAZE_WOODEN_FENCES, SPR_RIDE_DESIGN_PREVIEW_MAZE_WOODEN_FENCES },
Clean up string and sprite ID's (#3977)
2016-07-14 14:07:49 +02:00
};
Exclude pre-formatted blocks from clang-format (#7520) [ci skip]
2018-05-16 20:41:29 +02:00
// clang-format on
Use constants for colour preview images
2016-07-28 23:17:28 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
struct rct_window_graphs_y_axis
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint8_t interval;
int8_t unit;
int8_t unit_interval;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_string_id label;
Remove and replace C typedefs `typedef struct/union/enum name { ... } name_again;` is not needed whe compiling C++, moving the name at the back to be in front of the object and removing `typedef` makes it usable the very same way. This also replaces typedefs with the using keyword. They have better readability, especially for function pointer types, and would allow more flexibility when used with templates.
2018-02-14 09:42:26 +01:00
};
Include ride stats labels
2016-08-02 18:49:04 +02:00
/** rct2: 0x0098DD98 */
Use const and constexpr whenever possible.
2018-01-11 14:50:31 +01:00
static constexpr const rct_window_graphs_y_axis window_graphs_y_axi[] = {
clang-format UI windows
2018-06-22 23:21:44 +02:00
{ 11, 0, 10, STR_RIDE_STATS_VELOCITY_FORMAT }, // GRAPH_VELOCITY
{ 10, 0, 15, STR_RIDE_STATS_ALTITUDE_FORMAT }, // GRAPH_ALTITUDE
{ 13, -3, 1, STR_RIDE_STATS_G_FORCE_FORMAT }, // GRAPH_VERTICAL
{ 13, -4, 1, STR_RIDE_STATS_G_FORCE_FORMAT }, // GRAPH_LATERAL
Include ride stats labels
2016-08-02 18:49:04 +02:00
};
Draw dangerous G forces on graph in red
2018-06-22 19:20:27 +02:00
static constexpr auto RIDE_G_FORCES_RED_POS_VERTICAL = FIXED_2DP(5, 00);
static constexpr auto RIDE_G_FORCES_RED_NEG_VERTICAL = -FIXED_2DP(2, 00);
static constexpr auto RIDE_G_FORCES_RED_LATERAL = FIXED_2DP(2, 80);
Order ride type dropdown orthographically.
2018-05-29 19:09:29 +02:00
// Used for sorting the ride type cheat dropdown.
struct RideTypeLabel
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint8_t ride_type_id;
Order ride type dropdown orthographically.
2018-05-29 19:09:29 +02:00
rct_string_id label_id;
const char* label_string;
};
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static int32_t RideDropdownDataLanguage = LANGUAGE_UNDEFINED;
Order ride type dropdown orthographically.
2018-05-29 19:09:29 +02:00
static std::vector<RideTypeLabel> RideDropdownData;
Order vehicle type dropdown orthographically.
2018-06-01 20:13:47 +02:00
// Used for sorting the vehicle type dropdown.
struct VehicleTypeLabel
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t subtype_id;
Order vehicle type dropdown orthographically.
2018-06-01 20:13:47 +02:00
rct_string_id label_id;
const char* label_string;
};
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static int32_t VehicleDropdownDataLanguage = LANGUAGE_UNDEFINED;
clang-format UI windows
2018-06-22 23:21:44 +02:00
static rct_ride_entry* VehicleDropdownRideType = nullptr;
Order vehicle type dropdown orthographically.
2018-06-01 20:13:47 +02:00
static bool VehicleDropdownExpanded = false;
static std::vector<VehicleTypeLabel> VehicleDropdownData;
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_draw_tab_image(rct_drawpixelinfo* dpi, rct_window* w, int32_t page, int32_t spriteIndex)
implement tab images
2014-09-04 00:19:13 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_widgetindex widgetIndex = WIDX_TAB_1 + page;
implement tab images
2014-09-04 00:19:13 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (!(w->disabled_widgets & (1LL << widgetIndex)))
{
if (w->page == page)
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t frame = w->frame_no / window_ride_tab_animation_divisor[w->page];
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
spriteIndex += (frame % window_ride_tab_animation_frames[w->page]);
}
implement tab images
2014-09-04 00:19:13 +02:00
Make rct_window use ScreenCoordsXY
2020-03-01 20:32:35 +01:00
gfx_draw_sprite(
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
dpi, spriteIndex, w->windowPos + ScreenCoordsXY{ w->widgets[widgetIndex].left, w->widgets[widgetIndex].top }, 0);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement tab images
2014-09-04 00:19:13 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B2E88
implement tab images
2014-09-04 00:19:13 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_draw_tab_main(rct_drawpixelinfo* dpi, rct_window* w)
implement tab images
2014-09-04 00:19:13 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_widgetindex widgetIndex = WIDX_TAB_1 + WINDOW_RIDE_PAGE_MAIN;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (!(w->disabled_widgets & (1LL << widgetIndex)))
{
Remove ride classifications
2019-08-03 19:11:30 +02:00
auto ride = get_ride(w->number);
if (ride != nullptr)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Remove ride classifications
2019-08-03 19:11:30 +02:00
int32_t spriteIndex = 0;
switch (ride->GetClassification())
{
case RideClassification::Ride:
spriteIndex = SPR_TAB_RIDE_0;
if (w->page == WINDOW_RIDE_PAGE_MAIN)
spriteIndex += (w->frame_no / 4) % 16;
break;
case RideClassification::ShopOrStall:
spriteIndex = SPR_TAB_SHOPS_AND_STALLS_0;
if (w->page == WINDOW_RIDE_PAGE_MAIN)
spriteIndex += (w->frame_no / 4) % 16;
break;
case RideClassification::KioskOrFacility:
spriteIndex = SPR_TAB_KIOSKS_AND_FACILITIES_0;
if (w->page == WINDOW_RIDE_PAGE_MAIN)
spriteIndex += (w->frame_no / 4) % 8;
break;
}
Make rct_window use ScreenCoordsXY
2020-03-01 20:32:35 +01:00
gfx_draw_sprite(
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
dpi, spriteIndex, w->windowPos + ScreenCoordsXY{ w->widgets[widgetIndex].left, w->widgets[widgetIndex].top },
Make rct_window use ScreenCoordsXY
2020-03-01 20:32:35 +01:00
0);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
implement tab images
2014-09-04 00:19:13 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B2B68
implement tab images
2014-09-04 00:19:13 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_draw_tab_vehicle(rct_drawpixelinfo* dpi, rct_window* w)
implement tab images
2014-09-04 00:19:13 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_widgetindex widgetIndex = WIDX_TAB_1 + WINDOW_RIDE_PAGE_VEHICLE;
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_widget* widget = &w->widgets[widgetIndex];
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (!(w->disabled_widgets & (1LL << widgetIndex)))
{
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
auto screenCoords = ScreenCoordsXY{ widget->left + 1, widget->top + 1 };
int32_t width = widget->right - screenCoords.x;
int32_t height = widget->bottom - 3 - screenCoords.y;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (w->page == WINDOW_RIDE_PAGE_VEHICLE)
height += 4;
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
screenCoords += w->windowPos;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_drawpixelinfo clipDPI;
Fix #12085: Use ScreenCoordsXY on clip_drawpixelinfo (#12105)
2020-07-02 19:06:28 +02:00
if (!clip_drawpixelinfo(&clipDPI, dpi, screenCoords, width, height))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
}
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
screenCoords = ScreenCoordsXY{ widget->width() / 2, widget->height() - 12 };
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
auto rideEntry = ride->GetRideEntry();
if (rideEntry == nullptr)
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (rideEntry->flags & RIDE_ENTRY_FLAG_VEHICLE_TAB_SCALE_HALF)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clipDPI.zoom_level = 1;
clipDPI.width *= 2;
clipDPI.height *= 2;
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
screenCoords.x *= 2;
screenCoords.y *= 2;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clipDPI.x *= 2;
clipDPI.y *= 2;
}
Fix #6131: Icon for suspended vehicles aligned too low
2017-08-06 16:01:20 +02:00
// For any suspended rides, move image higher in the vehicle tab on the rides window
Get RTD from ride via a struct method, part 1
2020-12-12 22:53:50 +01:00
if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SUSPENDED))
Fix #6131: Icon for suspended vehicles aligned too low
2017-08-06 16:01:20 +02:00
{
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
screenCoords.y /= 4;
Fix #6131: Icon for suspended vehicles aligned too low
2017-08-06 16:01:20 +02:00
}
Enforce not breaking before assignments and function names Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-21 11:50:45 +02:00
const uint8_t vehicle = ride_entry_get_vehicle_at_position(
ride->subtype, ride->num_cars_per_train, rideEntry->tab_vehicle);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_ride_entry_vehicle* rideVehicleEntry = &rideEntry->vehicles[vehicle];
Fix #10598. Mistake made when fixing #7784. (#10606)
2020-01-23 22:43:29 +01:00
auto vehicleId = ((ride->colour_scheme_type & 3) == VEHICLE_COLOUR_SCHEME_PER_VEHICLE) ? rideEntry->tab_vehicle : 0;
vehicle_colour vehicleColour = ride_get_vehicle_colour(ride, vehicleId);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t spriteIndex = 32;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (w->page == WINDOW_RIDE_PAGE_VEHICLE)
spriteIndex += w->frame_no;
Clean up vehicle flags (#6058)
2017-07-31 12:27:04 +02:00
spriteIndex /= (rideVehicleEntry->flags & VEHICLE_ENTRY_FLAG_11) ? 4 : 2;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
spriteIndex &= rideVehicleEntry->rotation_frame_mask;
Name some rct_ride_entry_vehicle properties
2017-09-15 17:50:38 +02:00
spriteIndex *= rideVehicleEntry->base_num_frames;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
spriteIndex += rideVehicleEntry->base_image_id;
spriteIndex |= (vehicleColour.additional_1 << 24) | (vehicleColour.main << 19);
Name and fix vehicle entry and tertiary colour flags
2017-07-20 12:57:37 +02:00
spriteIndex |= IMAGE_TYPE_REMAP_2_PLUS;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
gfx_draw_sprite(&clipDPI, spriteIndex, screenCoords, vehicleColour.additional_2);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement tab images
2014-09-04 00:19:13 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B2F42
implement tab images
2014-09-04 00:19:13 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_draw_tab_customer(rct_drawpixelinfo* dpi, rct_window* w)
implement tab images
2014-09-04 00:19:13 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_widgetindex widgetIndex = WIDX_TAB_1 + WINDOW_RIDE_PAGE_CUSTOMER;
implement tab images
2014-09-04 00:19:13 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (!(w->disabled_widgets & (1LL << widgetIndex)))
{
rct_widget* widget = &w->widgets[widgetIndex];
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t spriteIndex = 0;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (w->page == WINDOW_RIDE_PAGE_CUSTOMER)
Clean up window vars
2020-03-01 21:51:29 +01:00
spriteIndex = w->picked_peep_frame & ~3;
implement tab images
2014-09-04 00:19:13 +02:00
Use helper function GetPeepAnimation It's intended to retrieve a rct_peep_animation_entry from the global array g_peep_animation_entries, given PeepSpriteType and PeepActionSpriteType as parameters.
2020-10-07 17:01:43 +02:00
spriteIndex += GetPeepAnimation(PeepSpriteType::Normal).base_image;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
spriteIndex += 1;
spriteIndex |= 0xA9E00000;
Strip all whitespace
2015-10-20 20:16:30 +02:00
Introduce widget::midX and widget::midY helper functions
2020-06-25 10:31:15 +02:00
gfx_draw_sprite(dpi, spriteIndex, w->windowPos + ScreenCoordsXY{ widget->midX(), widget->bottom - 6 }, 0);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement tab images
2014-09-04 00:19:13 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B2B35
implement tab images
2014-09-04 00:19:13 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w)
implement tab images
2014-09-04 00:19:13 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_draw_tab_vehicle(dpi, w);
window_ride_draw_tab_image(dpi, w, WINDOW_RIDE_PAGE_OPERATING, SPR_TAB_GEARS_0);
window_ride_draw_tab_image(dpi, w, WINDOW_RIDE_PAGE_MAINTENANCE, SPR_TAB_WRENCH_0);
window_ride_draw_tab_image(dpi, w, WINDOW_RIDE_PAGE_INCOME, SPR_TAB_ADMISSION_0);
window_ride_draw_tab_main(dpi, w);
window_ride_draw_tab_image(dpi, w, WINDOW_RIDE_PAGE_MEASUREMENTS, SPR_TAB_TIMER_0);
window_ride_draw_tab_image(dpi, w, WINDOW_RIDE_PAGE_COLOUR, SPR_TAB_PAINT_0);
window_ride_draw_tab_image(dpi, w, WINDOW_RIDE_PAGE_GRAPHS, SPR_TAB_GRAPH_A_0);
window_ride_draw_tab_customer(dpi, w);
window_ride_draw_tab_image(dpi, w, WINDOW_RIDE_PAGE_MUSIC, SPR_TAB_MUSIC_0);
implement tab images
2014-09-04 00:19:13 +02:00
}
Decompiled window_ride_disable_tabs
2015-03-06 17:05:47 +01:00
/**
clang-format UI windows
2018-06-22 23:21:44 +02:00
*
* rct2: 0x006AEB9F
*/
static void window_ride_disable_tabs(rct_window* w)
Decompiled window_ride_disable_tabs
2015-03-06 17:05:47 +01:00
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint32_t disabled_tabs = 0;
Replace loose usages of 0xFF
2020-10-27 22:24:39 +01:00
auto ride = get_ride(w->number);
Add nullptr checks for more instances of get_ride (#9819)
2019-08-09 15:20:59 +02:00
if (ride == nullptr)
return;
Decompiled window_ride_disable_tabs
2015-03-06 17:05:47 +01:00
Get RTD from ride via a struct method, part 1
2020-12-12 22:53:50 +01:00
const auto& rtd = ride->GetRideTypeDescriptor();
Decompiled window_ride_disable_tabs
2015-03-06 17:05:47 +01:00
Get RTD from ride via a struct method, part 1
2020-12-12 22:53:50 +01:00
if (!rtd.HasFlag(RIDE_TYPE_FLAG_HAS_DATA_LOGGING))
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
disabled_tabs |= (1 << WIDX_TAB_8); // 0x800
Decompiled window_ride_disable_tabs
2015-03-06 17:05:47 +01:00
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
if (ride->type == RIDE_TYPE_MINI_GOLF)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
disabled_tabs |= (1 << WIDX_TAB_2 | 1 << WIDX_TAB_3 | 1 << WIDX_TAB_4); // 0xE0
Decompiled window_ride_disable_tabs
2015-03-06 17:05:47 +01:00
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
if (rtd.HasFlag(RIDE_TYPE_FLAG_NO_VEHICLES))
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
disabled_tabs |= (1 << WIDX_TAB_2); // 0x20
Decompiled window_ride_disable_tabs
2015-03-06 17:05:47 +01:00
Get RTD from ride via a struct method, part 1
2020-12-12 22:53:50 +01:00
if (!rtd.HasFlag(RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN) && !rtd.HasFlag(RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_ADDITIONAL)
&& !rtd.HasFlag(RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_SUPPORTS) && !rtd.HasFlag(RIDE_TYPE_FLAG_HAS_VEHICLE_COLOURS)
&& !rtd.HasFlag(RIDE_TYPE_FLAG_HAS_ENTRANCE_EXIT))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
disabled_tabs |= (1 << WIDX_TAB_5); // 0x100
}
Decompiled window_ride_disable_tabs
2015-03-06 17:05:47 +01:00
Get RTD from ride via a struct method, part 1
2020-12-12 22:53:50 +01:00
if (rtd.HasFlag(RIDE_TYPE_FLAG_IS_SHOP))
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
disabled_tabs |= (1 << WIDX_TAB_3 | 1 << WIDX_TAB_4 | 1 << WIDX_TAB_7); // 0x4C0
Decompiled window_ride_disable_tabs
2015-03-06 17:05:47 +01:00
Get RTD from ride via a struct method, part 1
2020-12-12 22:53:50 +01:00
if (!rtd.HasFlag(RIDE_TYPE_FLAG_ALLOW_MUSIC))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
disabled_tabs |= (1 << WIDX_TAB_6); // 0x200
}
Decompiled window_ride_disable_tabs
2015-03-06 17:05:47 +01:00
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
if (ride->type == RIDE_TYPE_CASH_MACHINE || ride->type == RIDE_TYPE_FIRST_AID || (gParkFlags & PARK_FLAGS_NO_MONEY) != 0)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
disabled_tabs |= (1 << WIDX_TAB_9); // 0x1000
Decompiled window_ride_disable_tabs
2015-03-06 17:05:47 +01:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if ((gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER) != 0)
disabled_tabs |= (1 << WIDX_TAB_4 | 1 << WIDX_TAB_6 | 1 << WIDX_TAB_9 | 1 << WIDX_TAB_10); // 0x3280
Decompiled window_ride_disable_tabs
2015-03-06 17:05:47 +01:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_ride_entry* rideEntry = get_ride_entry(ride->subtype);
Decompiled window_ride_disable_tabs
2015-03-06 17:05:47 +01:00
Ensure that get_ride_entry returns NULL on invalid ride entries
2017-10-12 21:07:35 +02:00
if (rideEntry == nullptr)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
disabled_tabs |= 1 << WIDX_TAB_2 | 1 << WIDX_TAB_3 | 1 << WIDX_TAB_4 | 1 << WIDX_TAB_5 | 1 << WIDX_TAB_6
clang-format UI windows
2018-06-22 23:21:44 +02:00
| 1 << WIDX_TAB_7 | 1 << WIDX_TAB_8 | 1 << WIDX_TAB_9 | 1 << WIDX_TAB_10;
Ensure that get_ride_entry returns NULL on invalid ride entries
2017-10-12 21:07:35 +02:00
}
else if ((rideEntry->flags & RIDE_ENTRY_FLAG_DISABLE_COLOUR_TAB) != 0)
{
disabled_tabs |= (1 << WIDX_TAB_5);
}
Decompiled window_ride_disable_tabs
2015-03-06 17:05:47 +01:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->disabled_widgets = disabled_tabs;
Decompiled window_ride_disable_tabs
2015-03-06 17:05:47 +01:00
}
Pass Ride* instead of ride_id_t
2019-01-18 19:46:22 +01:00
static void window_ride_update_overall_view(Ride* ride)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Calculate x, y, z bounds of the entire ride using its track elements
Rename map_element to tile_element
2017-10-31 12:57:40 +01:00
tile_element_iterator it;
Fix ride overall views being recalculated constantly
2016-02-18 21:38:05 +01:00
Rename map_element to tile_element
2017-10-31 12:57:40 +01:00
tile_element_iterator_begin(&it);
Fix ride overall views being recalculated constantly
2016-02-18 21:38:05 +01:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
int32_t minx = std::numeric_limits<int32_t>::max(), miny = std::numeric_limits<int32_t>::max(),
minz = std::numeric_limits<int32_t>::max();
int32_t maxx = std::numeric_limits<int32_t>::min(), maxy = std::numeric_limits<int32_t>::min(),
maxz = std::numeric_limits<int32_t>::min();
Fix ride overall views being recalculated constantly
2016-02-18 21:38:05 +01:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
while (tile_element_iterator_next(&it))
{
Replace tile_element_get_type() with struct method
2018-05-02 19:27:04 +02:00
if (it.element->GetType() != TILE_ELEMENT_TYPE_TRACK)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
continue;
Fix ride overall views being recalculated constantly
2016-02-18 21:38:05 +01:00
Pass Ride* instead of ride_id_t
2019-01-18 19:46:22 +01:00
if (it.element->AsTrack()->GetRideIndex() != ride->id)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
continue;
Fix ride overall views being recalculated constantly
2016-02-18 21:38:05 +01:00
Clean up many other coordinates
2020-03-13 12:03:43 +01:00
auto location = TileCoordsXY(it.x, it.y).ToCoordsXY();
Refactor to prefer baseZ instead of height for big Z (#10478)
2019-12-31 09:33:27 +01:00
int32_t baseZ = it.element->GetBaseZ();
int32_t clearZ = it.element->GetClearanceZ();
Fix ride overall views being recalculated constantly
2016-02-18 21:38:05 +01:00
Clean up many other coordinates
2020-03-13 12:03:43 +01:00
minx = std::min(minx, location.x);
miny = std::min(miny, location.y);
Refactor to prefer baseZ instead of height for big Z (#10478)
2019-12-31 09:33:27 +01:00
minz = std::min(minz, baseZ);
Fix ride overall views being recalculated constantly
2016-02-18 21:38:05 +01:00
Clean up many other coordinates
2020-03-13 12:03:43 +01:00
maxx = std::max(maxx, location.x);
maxy = std::max(maxy, location.y);
Refactor to prefer baseZ instead of height for big Z (#10478)
2019-12-31 09:33:27 +01:00
maxz = std::max(maxz, clearZ);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Fix ride overall views being recalculated constantly
2016-02-18 21:38:05 +01:00
Refactor ride list to a manager with iterator
2019-08-03 18:27:50 +02:00
if (ride->id >= ride_overall_views.size())
{
ride_overall_views.resize(ride->id + 1);
}
auto& view = ride_overall_views[ride->id];
view.x = (minx + maxx) / 2 + 16;
view.y = (miny + maxy) / 2 + 16;
view.z = (minz + maxz) / 2 - 8;
Fix ride overall views being recalculated constantly
2016-02-18 21:38:05 +01:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Calculate size to determine from how far away to view the ride
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t dx = maxx - minx;
int32_t dy = maxy - miny;
int32_t dz = maxz - minz;
Fix ride overall views being recalculated constantly
2016-02-18 21:38:05 +01:00
Use named casts on openrct2-ui/windows (#11136)
2020-04-18 13:32:48 +02:00
int32_t size = static_cast<int32_t>(std::sqrt(dx * dx + dy * dy + dz * dz));
Fix ride overall views being recalculated constantly
2016-02-18 21:38:05 +01:00
For overall views, show small rides zoomed in all the way.
2018-01-04 00:50:53 +01:00
if (size >= 80)
{
// Each farther zoom level shows twice as many tiles (log)
// Appropriate zoom is lowered by one to fill the entire view with the ride
Refactor ride list to a manager with iterator
2019-08-03 18:27:50 +02:00
view.zoom = std::clamp<int32_t>(std::ceil(std::log(size / 80)) - 1, 0, 3);
For overall views, show small rides zoomed in all the way.
2018-01-04 00:50:53 +01:00
}
else
{
// Small rides or stalls are zoomed in all the way.
Refactor ride list to a manager with iterator
2019-08-03 18:27:50 +02:00
view.zoom = 0;
For overall views, show small rides zoomed in all the way.
2018-01-04 00:50:53 +01:00
}
Fix ride overall views being recalculated constantly
2016-02-18 21:38:05 +01:00
}
add and start implementing ride window
2014-08-25 16:04:28 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AEAB4
add and start implementing ride window
2014-08-25 16:04:28 +02:00
*/
Pass Ride* instead of ride_id_t
2019-01-18 19:46:22 +01:00
static rct_window* window_ride_open(Ride* ride)
add and start implementing ride window
2014-08-25 16:04:28 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_window* w;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
w = WindowCreateAutoPos(316, 207, window_ride_page_events[0], WC_RIDE, WF_10 | WF_RESIZABLE);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->widgets = window_ride_page_widgets[WINDOW_RIDE_PAGE_MAIN];
w->enabled_widgets = window_ride_page_enabled_widgets[WINDOW_RIDE_PAGE_MAIN];
Fix #6017: ride type spinner not working in multiplayer
2017-07-26 23:15:33 +02:00
w->hold_down_widgets = window_ride_page_hold_down_widgets[WINDOW_RIDE_PAGE_MAIN];
Pass Ride* instead of ride_id_t
2019-01-18 19:46:22 +01:00
w->number = ride->id;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Fix #6017: ride type spinner not working in multiplayer
2017-07-26 23:15:33 +02:00
w->page = WINDOW_RIDE_PAGE_MAIN;
Name some window flag aliases
2017-07-28 12:31:49 +02:00
w->vehicleIndex = 0;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->frame_no = 0;
w->list_information_type = 0;
Clean up window vars
2020-03-01 21:51:29 +01:00
w->picked_peep_frame = 0;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->ride_colour = 0;
window_ride_disable_tabs(w);
w->min_width = 316;
w->min_height = 180;
w->max_width = 500;
w->max_height = 450;
Pass Ride* instead of ride_id_t
2019-01-18 19:46:22 +01:00
window_ride_update_overall_view(ride);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return w;
add and start implementing ride window
2014-08-25 16:04:28 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006ACC28
add and start implementing ride window
2014-08-25 16:04:28 +02:00
*/
Pass Ride* instead of ride_id_t
2019-01-18 19:46:22 +01:00
rct_window* window_ride_main_open(Ride* ride)
add and start implementing ride window
2014-08-25 16:04:28 +02:00
{
Fix #13250: Crash when opening parks with new ride types (#13256) This only happens when a new ride type is added and the park is opened in the older version of the game where the ride type does not exist. Reworked so that invalid rides are not loadable. Force reload of title if current scenario is corrupted.
2020-11-01 14:49:43 +01:00
if (ride->type >= RIDE_TYPE_COUNT)
{
return nullptr;
}
add and start implementing ride window
2014-08-25 16:04:28 +02:00
Fix #13250: Crash when opening parks with new ride types (#13256) This only happens when a new ride type is added and the park is opened in the older version of the game where the ride type does not exist. Reworked so that invalid rides are not loadable. Force reload of title if current scenario is corrupted.
2020-11-01 14:49:43 +01:00
rct_window* w = window_bring_to_front_by_number(WC_RIDE, ride->id);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w == nullptr)
{
Pass Ride* instead of ride_id_t
2019-01-18 19:46:22 +01:00
w = window_ride_open(ride);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->ride.var_482 = -1;
Fix #13118: Closing construction window resets ride viewport (#13123)
2020-10-10 15:01:28 +02:00
w->ride.view = 0;
}
else if (w->ride.view >= (1 + ride->num_vehicles + ride->num_stations))
{
w->ride.view = 0;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
add and start implementing ride window
2014-08-25 16:04:28 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (input_test_flag(INPUT_FLAG_TOOL_ACTIVE))
{
if (w->classification == gCurrentToolWidget.window_classification && w->number == gCurrentToolWidget.window_number)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
tool_cancel();
}
}
add and start implementing ride window
2014-08-25 16:04:28 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->page != WINDOW_RIDE_PAGE_MAIN)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_set_page(w, WINDOW_RIDE_PAGE_MAIN);
}
Fix #2384: Testing a ride with a stretched out window leaves artifacts
2016-10-01 16:13:24 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_init_viewport(w);
return w;
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
}
implement viewport_interaction_get_item_left
2014-11-10 01:40:59 +01:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006ACCCE
implement viewport_interaction_get_item_left
2014-11-10 01:40:59 +01:00
*/
Use StationIndex in many more places (#10992)
2020-03-26 21:38:26 +01:00
static rct_window* window_ride_open_station(Ride* ride, StationIndex stationIndex)
implement viewport_interaction_get_item_left
2014-11-10 01:40:59 +01:00
{
Fix #13250: Crash when opening parks with new ride types (#13256) This only happens when a new ride type is added and the park is opened in the older version of the game where the ride type does not exist. Reworked so that invalid rides are not loadable. Force reload of title if current scenario is corrupted.
2020-11-01 14:49:43 +01:00
if (ride->type >= RIDE_TYPE_COUNT)
return nullptr;
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_NO_VEHICLES))
Pass Ride* instead of ride_id_t
2019-01-18 19:46:22 +01:00
return window_ride_main_open(ride);
implement ride open station and ride open vehicle, partial fix for #601
2014-11-29 16:55:44 +01:00
Pass Ride* instead of ride_id_t
2019-01-18 19:46:22 +01:00
auto w = window_bring_to_front_by_number(WC_RIDE, ride->id);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w == nullptr)
{
Pass Ride* instead of ride_id_t
2019-01-18 19:46:22 +01:00
w = window_ride_open(ride);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->ride.var_482 = -1;
}
implement ride open station and ride open vehicle, partial fix for #601
2014-11-29 16:55:44 +01:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (input_test_flag(INPUT_FLAG_TOOL_ACTIVE) && gCurrentToolWidget.window_classification == w->classification
&& gCurrentToolWidget.window_number == w->number)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
tool_cancel();
}
implement ride open station and ride open vehicle, partial fix for #601
2014-11-29 16:55:44 +01:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->page = WINDOW_RIDE_PAGE_MAIN;
w->width = 316;
w->height = 180;
Refactor window_invalidate to use rct_window::Invalidate
2019-06-15 17:20:16 +02:00
w->Invalidate();
implement ride open station and ride open vehicle, partial fix for #601
2014-11-29 16:55:44 +01:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->widgets = window_ride_page_widgets[w->page];
w->enabled_widgets = window_ride_page_enabled_widgets[w->page];
w->hold_down_widgets = window_ride_page_hold_down_widgets[w->page];
w->event_handlers = window_ride_page_events[w->page];
w->pressed_widgets = 0;
window_ride_disable_tabs(w);
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowInitScrollWidgets(w);
implement ride open station and ride open vehicle, partial fix for #601
2014-11-29 16:55:44 +01:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// View
Pass Ride* instead of ride_id_t
2019-01-18 19:46:22 +01:00
for (int32_t i = stationIndex; i >= 0; i--)
Change station_starts to an rct_xy8
2017-07-18 12:23:24 +02:00
{
Modify code using Location8 to use isNull()/setNull() (#10403)
2019-12-21 11:34:46 +01:00
if (ride->stations[i].Start.isNull())
Change station_starts to an rct_xy8
2017-07-18 12:23:24 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
stationIndex--;
Change station_starts to an rct_xy8
2017-07-18 12:23:24 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement ride open station and ride open vehicle, partial fix for #601
2014-11-29 16:55:44 +01:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->ride.view = 1 + ride->num_vehicles + stationIndex;
window_ride_init_viewport(w);
implement ride open station and ride open vehicle, partial fix for #601
2014-11-29 16:55:44 +01:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return w;
implement viewport_interaction_get_item_left
2014-11-10 01:40:59 +01:00
}
Rename rct_tile_element to TileElement
2018-11-01 13:53:50 +01:00
rct_window* window_ride_open_track(TileElement* tileElement)
implement viewport_interaction_get_item_left
2014-11-10 01:40:59 +01:00
{
Pass Ride* instead of ride_id_t
2019-01-18 19:46:22 +01:00
assert(tileElement != nullptr);
Change tile_element_get_ride_index() to method
2020-10-27 21:59:55 +01:00
auto rideIndex = tileElement->GetRideIndex();
Pass Ride* instead of ride_id_t
2019-01-18 19:46:22 +01:00
if (rideIndex != RIDE_ID_NULL)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Pass Ride* instead of ride_id_t
2019-01-18 19:46:22 +01:00
auto ride = get_ride(rideIndex);
if (ride != nullptr)
{
switch (tileElement->GetType())
{
case TILE_ELEMENT_TYPE_ENTRANCE:
{
// Open ride window in station view
auto entranceElement = tileElement->AsEntrance();
auto stationIndex = entranceElement->GetStationIndex();
return window_ride_open_station(ride, stationIndex);
}
case TILE_ELEMENT_TYPE_TRACK:
{
// Open ride window in station view
auto trackElement = tileElement->AsTrack();
auto trackType = trackElement->GetTrackType();
if (TrackSequenceProperties[trackType][0] & TRACK_SEQUENCE_FLAG_ORIGIN)
{
auto stationIndex = trackElement->GetStationIndex();
return window_ride_open_station(ride, stationIndex);
}
}
}
// Open ride window in overview mode
return window_ride_main_open(ride);
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Pass Ride* instead of ride_id_t
2019-01-18 19:46:22 +01:00
return nullptr;
implement viewport_interaction_get_item_left
2014-11-10 01:40:59 +01:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006ACAC2
implement viewport_interaction_get_item_left
2014-11-10 01:40:59 +01:00
*/
Rename rct_vehicle
2020-01-19 16:53:17 +01:00
rct_window* window_ride_open_vehicle(Vehicle* vehicle)
implement viewport_interaction_get_item_left
2014-11-10 01:40:59 +01:00
{
Part of #9473: Create Vehicle::TrainHead and Vehicle::TrainTail Converted from vehicle_get_head and vehicle_get_tail
2020-04-19 06:28:23 +02:00
Vehicle* headVehicle = vehicle->TrainHead();
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint16_t headVehicleSpriteIndex = headVehicle->sprite_index;
Part of #9473: Create Vehicle::GetRide (#12002) * Part of #9473: Create Vehicle::GetRide * Redefine Vehicle::GetRide in Compat.cpp
2020-06-21 09:38:53 +02:00
auto ride = headVehicle->GetRide();
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
if (ride == nullptr)
return nullptr;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Get view index
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t view = 1;
Correct max vehicles per ride value (#10504) * Correct max vehicles per ride value * Fix formatting * Fix constant usage in TrackDesign.cpp
2020-01-04 18:10:33 +01:00
for (int32_t i = 0; i <= MAX_VEHICLES_PER_RIDE; i++)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (ride->vehicles[i] == headVehicleSpriteIndex)
break;
view++;
}
Pass Ride* instead of ride_id_t
2019-01-18 19:46:22 +01:00
rct_window* w = window_find_by_number(WC_RIDE, ride->id);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w != nullptr)
{
Refactor window_invalidate to use rct_window::Invalidate
2019-06-15 17:20:16 +02:00
w->Invalidate();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (input_test_flag(INPUT_FLAG_TOOL_ACTIVE) && gCurrentToolWidget.window_classification == w->classification
&& gCurrentToolWidget.window_number == w->number)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
tool_cancel();
}
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t openedPeepWindow = 0;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->ride.view == view)
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t numPeepsLeft = vehicle->num_peeps;
clang-format UI windows
2018-06-22 23:21:44 +02:00
for (int32_t i = 0; i < 32 && numPeepsLeft > 0; i++)
{
Part of #12497: Remove extra SPRITE_INDEX_NULL check (#12538) * refactor: deleted double check of SPRITE_INDEX_NULL in Staff* ride_get_mechanic(Ride* ride) * refactor: deleted double check of SPRITE_INDEX_NULL in Ride.cpp file * refactor: deleted double check of SPRITE_INDEX_NULL in windows/Ride.cpp in function static rct_string_id window_ride_get_status_vehicle * refactor: deleted double check of SPRITE_INDEX_NULL in ride/Ride.cpp * refactor: deleted double check in FormatStatusTo
2020-08-02 09:28:11 +02:00
Peep* peep = GetEntity<Peep>(vehicle->peep[i]);
Fix #12577: Mistake made in refactor #12538 (#12579) Loop called the peep window open only when nullptr. Added extra checks for nullptr on window open
2020-08-04 01:09:24 +02:00
if (peep == nullptr)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
continue;
numPeepsLeft--;
Part of #12497: Remove extra SPRITE_INDEX_NULL check (#12538) * refactor: deleted double check of SPRITE_INDEX_NULL in Staff* ride_get_mechanic(Ride* ride) * refactor: deleted double check of SPRITE_INDEX_NULL in Ride.cpp file * refactor: deleted double check of SPRITE_INDEX_NULL in windows/Ride.cpp in function static rct_string_id window_ride_get_status_vehicle * refactor: deleted double check of SPRITE_INDEX_NULL in ride/Ride.cpp * refactor: deleted double check in FormatStatusTo
2020-08-02 09:28:11 +02:00
rct_window* w2 = window_find_by_number(WC_PEEP, vehicle->peep[i]);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w2 == nullptr)
{
Move staff and guest windows
2017-10-06 23:21:00 +02:00
auto intent = Intent(WC_PEEP);
intent.putExtra(INTENT_EXTRA_PEEP, peep);
context_open_intent(&intent);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
openedPeepWindow = 1;
break;
}
}
}
Pass Ride* instead of ride_id_t
2019-01-18 19:46:22 +01:00
w = openedPeepWindow ? window_find_by_number(WC_RIDE, ride->id) : window_bring_to_front_by_number(WC_RIDE, ride->id);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w == nullptr)
{
Pass Ride* instead of ride_id_t
2019-01-18 19:46:22 +01:00
w = window_ride_open(ride);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->ride.var_482 = -1;
}
w->page = WINDOW_RIDE_PAGE_MAIN;
w->width = 316;
w->height = 180;
Refactor window_invalidate to use rct_window::Invalidate
2019-06-15 17:20:16 +02:00
w->Invalidate();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->widgets = window_ride_page_widgets[w->page];
w->enabled_widgets = window_ride_page_enabled_widgets[w->page];
w->hold_down_widgets = window_ride_page_hold_down_widgets[w->page];
w->event_handlers = window_ride_page_events[w->page];
w->pressed_widgets = 0;
window_ride_disable_tabs(w);
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowInitScrollWidgets(w);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->ride.view = view;
window_ride_init_viewport(w);
Refactor window_invalidate to use rct_window::Invalidate
2019-06-15 17:20:16 +02:00
w->Invalidate();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return w;
implement viewport_interaction_get_item_left
2014-11-10 01:40:59 +01:00
}
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
/**
*
* rct2: 0x006AF1D2
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_set_page(rct_window* w, int32_t page)
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t listen;
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (input_test_flag(INPUT_FLAG_TOOL_ACTIVE))
if (w->classification == gCurrentToolWidget.window_classification && w->number == gCurrentToolWidget.window_number)
tool_cancel();
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
Fix #3200: Close Construction window upon selecting vehicle page (#13022)
2020-09-28 12:37:22 +02:00
if (page == WINDOW_RIDE_PAGE_VEHICLE)
{
auto constructionWindow = window_find_by_class(WC_RIDE_CONSTRUCTION);
if (constructionWindow && constructionWindow->number == w->number)
{
window_close_by_class(WC_RIDE_CONSTRUCTION);
// Closing the construction window sets the tab to the first page, which we don't want here,
// as user just clicked the Vehicle page
window_ride_set_page(w, WINDOW_RIDE_PAGE_VEHICLE);
}
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Set listen only to viewport
listen = 0;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (page == WINDOW_RIDE_PAGE_MAIN && w->page == WINDOW_RIDE_PAGE_MAIN && w->viewport != nullptr
&& !(w->viewport->flags & VIEWPORT_FLAG_SOUND_ON))
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
listen++;
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->page = page;
w->frame_no = 0;
Clean up window vars
2020-03-01 21:51:29 +01:00
w->picked_peep_frame = 0;
Fix vehicle tab from failing to reload new variables
2015-04-14 19:35:26 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
// There doesn't seem to be any need for this call, and it can sometimes modify the reported number of cars per train, so
Store ride index inside ride struct
2019-01-18 11:46:18 +01:00
// I've removed it if (page == WINDOW_RIDE_PAGE_VEHICLE) { ride_update_max_vehicles(ride);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
//}
Fix vehicle tab from failing to reload new variables
2015-04-14 19:35:26 +02:00
Use RemoveViewport helper function (#13104)
2020-10-06 11:27:56 +02:00
w->RemoveViewport();
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->enabled_widgets = window_ride_page_enabled_widgets[page];
w->hold_down_widgets = window_ride_page_hold_down_widgets[page];
w->event_handlers = window_ride_page_events[page];
w->pressed_widgets = 0;
w->widgets = window_ride_page_widgets[page];
window_ride_disable_tabs(w);
Refactor window_invalidate to use rct_window::Invalidate
2019-06-15 17:20:16 +02:00
w->Invalidate();
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_event_resize_call(w);
window_event_invalidate_call(w);
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowInitScrollWidgets(w);
Refactor window_invalidate to use rct_window::Invalidate
2019-06-15 17:20:16 +02:00
w->Invalidate();
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
if (listen != 0 && w->viewport != nullptr)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->viewport->flags |= VIEWPORT_FLAG_SOUND_ON;
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_set_pressed_tab(rct_window* w)
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t i;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
for (i = 0; i < WINDOW_RIDE_PAGE_COUNT; i++)
w->pressed_widgets &= ~(1 << (WIDX_TAB_1 + i));
w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page);
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_anchor_border_widgets(rct_window* w)
finish window_ride_main_invalidate
2014-08-25 23:06:51 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->widgets[WIDX_BACKGROUND].right = w->width - 1;
w->widgets[WIDX_BACKGROUND].bottom = w->height - 1;
w->widgets[WIDX_PAGE_BACKGROUND].right = w->width - 1;
w->widgets[WIDX_PAGE_BACKGROUND].bottom = w->height - 1;
w->widgets[WIDX_TITLE].right = w->width - 2;
w->widgets[WIDX_CLOSE].left = w->width - 13;
w->widgets[WIDX_CLOSE].right = w->width - 3;
finish window_ride_main_invalidate
2014-08-25 23:06:51 +02:00
}
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
#pragma region Main
implement ride window drawing
2014-09-03 20:13:37 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AF994
implement ride window drawing
2014-09-03 20:13:37 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_init_viewport(rct_window* w)
implement ride window drawing
2014-09-03 20:13:37 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->page != WINDOW_RIDE_PAGE_MAIN)
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Add nullptr checks for more instances of get_ride (#9819)
2019-08-09 15:20:59 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t eax = w->viewport_focus_coordinates.var_480 - 1;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
union
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
sprite_focus sprite;
coordinate_focus coordinate;
} focus;
focus.coordinate.x = 0;
focus.coordinate.y = 0;
focus.coordinate.z = 0;
Replace newly added SPR_NONE's with SPRITE_INDEX_NULL, remove new includes needed to change its type to match .
2017-06-25 22:44:58 +02:00
focus.sprite.sprite_id = SPRITE_INDEX_NULL;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
focus.coordinate.zoom = 0;
focus.coordinate.rotation = get_current_rotation();
focus.coordinate.width = 0;
focus.coordinate.height = 0;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (eax >= 0 && eax < ride->num_vehicles && ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
focus.sprite.sprite_id = ride->vehicles[eax];
Port more functions to Ride struct (#9119)
2019-04-20 22:22:39 +02:00
rct_ride_entry* ride_entry = ride->GetRideEntry();
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (ride_entry && ride_entry->tab_vehicle != 0)
{
Reduce the use of GET_VEHICLE (#12494) * Start removing GET_VEHICLE macro use * Further work * Remove further GET_VEHICLE's * Further removal of GET_VEHICLE * Remove the last of GET_VEHICLE * Fix testpaint * Fix nullptr deref * Make review changes Also swapped in helper functions and used a standard patern for iterating the train cars * Further simplify loops for train cars
2020-07-31 08:48:27 +02:00
Vehicle* vehicle = GetEntity<Vehicle>(focus.sprite.sprite_id);
Fix #9491: Access violation in window_ride_init_viewport
2019-08-01 11:11:59 +02:00
if (vehicle == nullptr)
{
focus.sprite.sprite_id = SPRITE_INDEX_NULL;
}
else if (vehicle->next_vehicle_on_train != SPRITE_INDEX_NULL)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Fix #5489: Sprite index crash for car view on car ride
2017-06-25 18:52:21 +02:00
focus.sprite.sprite_id = vehicle->next_vehicle_on_train;
}
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (focus.sprite.sprite_id != SPRITE_INDEX_NULL)
{
Fix #5489: Sprite index crash for car view on car ride
2017-06-25 18:52:21 +02:00
focus.sprite.type |= VIEWPORT_FOCUS_TYPE_SPRITE;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
else if (eax >= ride->num_vehicles && eax < (ride->num_vehicles + ride->num_stations))
{
Use StationIndex in many more places (#10992)
2020-03-26 21:38:26 +01:00
StationIndex stationIndex = STATION_INDEX_NULL;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t count = eax - ride->num_vehicles;
clang-format UI windows
2018-06-22 23:21:44 +02:00
do
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
stationIndex++;
Modify code using Location8 to use isNull()/setNull() (#10403)
2019-12-21 11:34:46 +01:00
if (!ride->stations[stationIndex].Start.isNull())
Change station_starts to an rct_xy8
2017-07-18 12:23:24 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
count--;
Change station_starts to an rct_xy8
2017-07-18 12:23:24 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
} while (count >= 0);
Change ride->overall_view to CoordsXY (#10673)
2020-02-08 17:19:59 +01:00
auto location = ride->stations[stationIndex].GetStart();
focus.coordinate.x = location.x;
focus.coordinate.y = location.y;
focus.coordinate.z = location.z;
Fix #5489: Sprite index crash for car view on car ride
2017-06-25 18:52:21 +02:00
focus.sprite.type |= VIEWPORT_FOCUS_TYPE_COORDINATE;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
else
{
if (eax > 0)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->viewport_focus_coordinates.var_480 = 0;
}
Refactor ride list to a manager with iterator
2019-08-03 18:27:50 +02:00
if (w->number < ride_overall_views.size())
{
const auto& view = ride_overall_views[w->number];
focus.coordinate.x = view.x;
focus.coordinate.y = view.y;
focus.coordinate.z = view.z;
focus.coordinate.zoom = view.zoom;
focus.sprite.type |= VIEWPORT_FOCUS_TYPE_COORDINATE;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
focus.coordinate.var_480 = w->viewport_focus_coordinates.var_480;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint16_t viewport_flags = 0;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->viewport != nullptr)
{
Fix #7462: Guest window goes beyond the map edge on a spiral slide. (#7752)
2018-08-07 16:20:51 +02:00
if (focus.coordinate.x == w->viewport_focus_coordinates.x
&& (focus.coordinate.y & VIEWPORT_FOCUS_Y_MASK) == w->viewport_focus_coordinates.y
clang-format UI windows
2018-06-22 23:21:44 +02:00
&& focus.coordinate.z == w->viewport_focus_coordinates.z
&& focus.coordinate.rotation == w->viewport_focus_coordinates.rotation
&& focus.coordinate.zoom == w->viewport_focus_coordinates.zoom && focus.coordinate.width == w->width
&& focus.coordinate.height == w->height)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
}
viewport_flags = w->viewport->flags;
Use RemoveViewport helper function (#13104)
2020-10-06 11:27:56 +02:00
w->RemoveViewport();
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else if (gConfigGeneral.always_show_gridlines)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
viewport_flags |= VIEWPORT_FLAG_GRIDLINES;
}
window_event_invalidate_call(w);
w->viewport_focus_coordinates.x = focus.coordinate.x;
w->viewport_focus_coordinates.y = focus.coordinate.y;
w->viewport_focus_coordinates.z = focus.coordinate.z;
w->viewport_focus_coordinates.rotation = focus.coordinate.rotation;
w->viewport_focus_coordinates.zoom = focus.coordinate.zoom;
w->viewport_focus_coordinates.width = w->width;
w->viewport_focus_coordinates.height = w->height;
clang-format UI windows
2018-06-22 23:21:44 +02:00
// rct2: 0x006aec9c only used here so brought it into the function
Modify code using Location8 to use isNull()/setNull() (#10403)
2019-12-21 11:34:46 +01:00
if (!w->viewport && !ride->overall_view.isNull())
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_widget* view_widget = &w->widgets[WIDX_VIEWPORT];
Make rct_window use ScreenCoordsXY
2020-03-01 20:32:35 +01:00
auto screenPos = w->windowPos + ScreenCoordsXY{ view_widget->left + 1, view_widget->top + 1 };
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
int32_t width = view_widget->width() - 1;
int32_t height = view_widget->height() - 1;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
viewport_create(
Use Coords objects for viewport_create()
2020-03-01 05:53:21 +01:00
w, screenPos, width, height, focus.coordinate.zoom,
{ focus.coordinate.x, focus.coordinate.y & VIEWPORT_FOCUS_Y_MASK, focus.coordinate.z },
focus.sprite.type & VIEWPORT_FOCUS_TYPE_MASK, focus.sprite.sprite_id);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->flags |= WF_NO_SCROLLING;
Refactor window_invalidate to use rct_window::Invalidate
2019-06-15 17:20:16 +02:00
w->Invalidate();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->viewport)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->viewport->flags = viewport_flags;
Refactor window_invalidate to use rct_window::Invalidate
2019-06-15 17:20:16 +02:00
w->Invalidate();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement ride window drawing
2014-09-03 20:13:37 +02:00
}
implement ride rename for ride window
2014-09-02 15:05:44 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AF315
implement ride rename for ride window
2014-09-02 15:05:44 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_rename(rct_window* w)
implement ride rename for ride window
2014-09-02 15:05:44 +02:00
{
Refactor ride name to dynamic args and std::string
2019-07-20 20:43:02 +02:00
auto ride = get_ride(w->number);
if (ride != nullptr)
{
auto rideName = ride->GetName();
window_text_input_raw_open(
w, WIDX_RENAME, STR_RIDE_ATTRACTION_NAME, STR_ENTER_NEW_NAME_FOR_THIS_RIDE_ATTRACTION, rideName.c_str(), 32);
}
implement ride rename for ride window
2014-09-02 15:05:44 +02:00
}
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AF17E
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_main_mouseup(rct_window* w, rct_widgetindex widgetIndex)
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_CLOSE:
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_close(w);
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_TAB_1:
case WIDX_TAB_2:
case WIDX_TAB_3:
case WIDX_TAB_4:
case WIDX_TAB_5:
case WIDX_TAB_6:
case WIDX_TAB_7:
case WIDX_TAB_8:
case WIDX_TAB_9:
case WIDX_TAB_10:
window_ride_set_page(w, widgetIndex - WIDX_TAB_1);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_CONSTRUCTION:
Fix #9826: NRE in ride_construct
2019-08-09 19:29:34 +02:00
{
auto ride = get_ride(w->number);
if (ride != nullptr)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Fix #9826: NRE in ride_construct
2019-08-09 19:29:34 +02:00
ride_construct(ride);
if (window_find_by_number(WC_RIDE_CONSTRUCTION, ride->id) != nullptr)
{
window_close(w);
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
break;
Fix #9826: NRE in ride_construct
2019-08-09 19:29:34 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_RENAME:
window_ride_rename(w);
break;
case WIDX_LOCATE:
Refactor window_scroll_to_viewport to use rct_window::ScrollToViewport
2019-06-15 17:12:14 +02:00
w->ScrollToViewport();
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_DEMOLISH:
context_open_detail_window(WD_DEMOLISH_RIDE, w->number);
break;
case WIDX_CLOSE_LIGHT:
Add and implement simulation mode for rides
2019-05-07 21:14:21 +02:00
case WIDX_SIMULATE_LIGHT:
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_TEST_LIGHT:
case WIDX_OPEN_LIGHT:
Fix #9826: NRE in ride_construct
2019-08-09 19:29:34 +02:00
{
Pass Ride* instead of ride_id_t
2019-02-13 00:58:45 +01:00
auto ride = get_ride(w->number);
if (ride != nullptr)
{
Fix #9826: NRE in ride_construct
2019-08-09 19:29:34 +02:00
int32_t status;
switch (widgetIndex)
{
default:
case WIDX_CLOSE_LIGHT:
status = RIDE_STATUS_CLOSED;
break;
case WIDX_SIMULATE_LIGHT:
status = RIDE_STATUS_SIMULATING;
break;
case WIDX_TEST_LIGHT:
status = RIDE_STATUS_TESTING;
break;
case WIDX_OPEN_LIGHT:
status = RIDE_STATUS_OPEN;
break;
}
Pass Ride* instead of ride_id_t
2019-02-13 00:58:45 +01:00
ride_set_status(ride, status);
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Fix #9826: NRE in ride_construct
2019-08-09 19:29:34 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
}
implement ride window drawing
2014-09-03 20:13:37 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AF4A2
implement ride window drawing
2014-09-03 20:13:37 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_main_resize(rct_window* w)
implement ride window drawing
2014-09-03 20:13:37 +02:00
{
Add and use Ride::SupportsStatus
2019-05-08 18:41:29 +02:00
int32_t minHeight = 180;
Refactor UI/Interface misc to TitleCase (#13354) * Refactor LandTool to Namespace * Refactor Theme to TitleCase * Refactor ViewportInteraction to TitleCase
2020-11-03 11:59:00 +01:00
if (ThemeGetFlags() & UITHEME_FLAG_USE_LIGHTS_RIDE)
Add and use Ride::SupportsStatus
2019-05-08 18:41:29 +02:00
{
minHeight += 20 + RCT1_LIGHT_OFFSET;
auto ride = get_ride(w->number);
if (ride != nullptr)
{
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
#ifdef __SIMULATE_IN_RIDE_WINDOW__
Add and use Ride::SupportsStatus
2019-05-08 18:41:29 +02:00
if (ride->SupportsStatus(RIDE_STATUS_SIMULATING))
{
minHeight += 14;
}
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
#endif
Add and use Ride::SupportsStatus
2019-05-08 18:41:29 +02:00
if (ride->SupportsStatus(RIDE_STATUS_TESTING))
{
minHeight += 14;
}
}
}
if (gCheatsAllowArbitraryRideTypeChanges)
{
minHeight += 15;
}
w->flags |= WF_RESIZABLE;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_set_resize(w, 316, minHeight, 500, 450);
window_ride_init_viewport(w);
implement ride window drawing
2014-09-03 20:13:37 +02:00
}
implement ride window widgets and dropdown lists
2014-09-01 13:04:34 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AF825
implement ride window widgets and dropdown lists
2014-09-01 13:04:34 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_show_view_dropdown(rct_window* w, rct_widget* widget)
implement ride window widgets and dropdown lists
2014-09-01 13:04:34 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_widget* dropdownWidget = widget - 1;
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t numItems = 1;
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
if (!ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_NO_VEHICLES))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
numItems += ride->num_stations;
numItems += ride->num_vehicles;
}
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowTextCustomWidth(
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
{ w->windowPos.x + dropdownWidget->left, w->windowPos.y + dropdownWidget->top }, dropdownWidget->height() + 1,
w->colours[1], 0, 0, numItems, widget->right - dropdownWidget->left);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// First item
gDropdownItemsFormat[0] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[0] = STR_OVERALL_VIEW;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t currentItem = 1;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Get RTD from ride via a struct method, part 1
2020-12-12 22:53:50 +01:00
const auto& rtd = ride->GetRideTypeDescriptor();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Vehicles
Get RTD from ride via a struct method, part 1
2020-12-12 22:53:50 +01:00
int32_t name = GetRideComponentName(rtd.NameConvention.vehicle).number;
clang-format UI windows
2018-06-22 23:21:44 +02:00
for (int32_t i = 1; i <= ride->num_vehicles; i++)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gDropdownItemsFormat[currentItem] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[currentItem] = name | (currentItem << 16);
currentItem++;
}
// Stations
Get RTD from ride via a struct method, part 1
2020-12-12 22:53:50 +01:00
name = GetRideComponentName(rtd.NameConvention.station).number;
clang-format UI windows
2018-06-22 23:21:44 +02:00
for (int32_t i = 1; i <= ride->num_stations; i++)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gDropdownItemsFormat[currentItem] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[currentItem] = name | (i << 16);
currentItem++;
}
// Set highlighted item
Make gDropdownItemsChecked and gDropdownItemsDisabled static
2017-07-24 11:24:23 +02:00
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK))
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
for (int32_t i = 0; i < ride->num_vehicles; i++)
Make gDropdownItemsChecked and gDropdownItemsDisabled static
2017-07-24 11:24:23 +02:00
{
// The +1 is to skip 'Overall view'
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetDisabled(i + 1, true);
clang-format UI windows
2018-06-22 23:21:44 +02:00
;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
// Set checked item
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetChecked(w->ride.view, true);
implement ride window widgets and dropdown lists
2014-09-01 13:04:34 +02:00
}
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
static uint8_t window_ride_get_next_default_status(const Ride* ride)
implement ride window widgets and dropdown lists
2014-09-01 13:04:34 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (ride->status)
{
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
default:
clang-format UI windows
2018-06-22 23:21:44 +02:00
case RIDE_STATUS_CLOSED:
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
if ((ride->lifecycle_flags & RIDE_LIFECYCLE_CRASHED)
|| (ride->lifecycle_flags & RIDE_LIFECYCLE_HAS_STALLED_VEHICLE))
Add and use Ride::SupportsStatus
2019-05-08 18:41:29 +02:00
{
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
return RIDE_STATUS_CLOSED;
Add and use Ride::SupportsStatus
2019-05-08 18:41:29 +02:00
}
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
else if (ride->SupportsStatus(RIDE_STATUS_TESTING) && !(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
Add and use Ride::SupportsStatus
2019-05-08 18:41:29 +02:00
{
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
return RIDE_STATUS_TESTING;
Add and use Ride::SupportsStatus
2019-05-08 18:41:29 +02:00
}
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
else
Add and use Ride::SupportsStatus
2019-05-08 18:41:29 +02:00
{
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
return RIDE_STATUS_OPEN;
Add and use Ride::SupportsStatus
2019-05-08 18:41:29 +02:00
}
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
case RIDE_STATUS_SIMULATING:
return RIDE_STATUS_TESTING;
case RIDE_STATUS_TESTING:
return (ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED) ? RIDE_STATUS_OPEN : RIDE_STATUS_CLOSED;
clang-format UI windows
2018-06-22 23:21:44 +02:00
case RIDE_STATUS_OPEN:
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
return RIDE_STATUS_CLOSED;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
struct RideStatusDropdownInfo
{
struct Ride* Ride{};
uint8_t CurrentStatus{};
uint8_t DefaultStatus{};
int32_t NumItems{};
int32_t CheckedIndex = -1;
int32_t DefaultIndex = -1;
};
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
static void window_ride_set_dropdown(RideStatusDropdownInfo& info, uint8_t status, rct_string_id text)
{
if (info.Ride->SupportsStatus(status))
{
auto index = info.NumItems;
gDropdownItemsFormat[index] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[index] = text;
if (info.CurrentStatus == status)
{
info.CheckedIndex = index;
}
if (info.DefaultStatus == status)
{
info.DefaultIndex = index;
}
info.NumItems++;
}
}
static void window_ride_show_open_dropdown(rct_window* w, rct_widget* widget)
{
RideStatusDropdownInfo info;
info.Ride = get_ride(w->number);
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
if (info.Ride == nullptr)
return;
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
info.CurrentStatus = info.Ride->status;
info.DefaultStatus = window_ride_get_next_default_status(info.Ride);
window_ride_set_dropdown(info, RIDE_STATUS_CLOSED, STR_CLOSE_RIDE);
#ifdef __SIMULATE_IN_RIDE_WINDOW__
window_ride_set_dropdown(info, RIDE_STATUS_SIMULATING, STR_SIMULATE_RIDE);
#endif
window_ride_set_dropdown(info, RIDE_STATUS_TESTING, STR_TEST_RIDE);
window_ride_set_dropdown(info, RIDE_STATUS_OPEN, STR_OPEN_RIDE);
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowText(
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
{ w->windowPos.x + widget->left, w->windowPos.y + widget->top }, widget->height() + 1, w->colours[1], 0, info.NumItems);
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetChecked(info.CheckedIndex, true);
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
gDropdownDefaultIndex = info.DefaultIndex;
implement ride window widgets and dropdown lists
2014-09-01 13:04:34 +02:00
}
Move ride naming to RTD This also means that all unused ride types will now have the same name. I have made an exception for the 'arbitrary ride type change' dropdown only.
2020-06-16 22:50:58 +02:00
static rct_string_id get_ride_type_name_for_dropdown(uint8_t rideType)
{
switch (rideType)
{
case RIDE_TYPE_1D:
return STR_RIDE_NAME_1D;
case RIDE_TYPE_1F:
return STR_RIDE_NAME_1F;
case RIDE_TYPE_22:
return STR_RIDE_NAME_22;
case RIDE_TYPE_50:
return STR_RIDE_NAME_50;
case RIDE_TYPE_52:
return STR_RIDE_NAME_52;
case RIDE_TYPE_53:
return STR_RIDE_NAME_53;
case RIDE_TYPE_54:
return STR_RIDE_NAME_54;
case RIDE_TYPE_55:
return STR_RIDE_NAME_55;
case RIDE_TYPE_59:
return STR_RIDE_NAME_59;
default:
Make all access to RTD table use the bounds checking function
2021-02-26 10:01:00 +01:00
return GetRideTypeDescriptor(rideType).Naming.Name;
Move ride naming to RTD This also means that all unused ride types will now have the same name. I have made an exception for the 'arbitrary ride type change' dropdown only.
2020-06-16 22:50:58 +02:00
}
}
Order ride type dropdown orthographically.
2018-05-29 19:09:29 +02:00
static void populate_ride_type_dropdown()
{
auto& ls = OpenRCT2::GetContext()->GetLocalisationService();
if (RideDropdownDataLanguage == ls.GetCurrentLanguage())
return;
RideDropdownData.clear();
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
for (uint8_t i = 0; i < RIDE_TYPE_COUNT; i++)
Order ride type dropdown orthographically.
2018-05-29 19:09:29 +02:00
{
Move ride naming to RTD This also means that all unused ride types will now have the same name. I have made an exception for the 'arbitrary ride type change' dropdown only.
2020-06-16 22:50:58 +02:00
auto name = get_ride_type_name_for_dropdown(i);
Refactor to use push_back more efficient (#13726)
2021-01-08 21:59:55 +01:00
RideDropdownData.push_back({ i, name, ls.GetString(name) });
Order ride type dropdown orthographically.
2018-05-29 19:09:29 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
std::sort(RideDropdownData.begin(), RideDropdownData.end(), [](auto& a, auto& b) {
Use case-insensitive compare for soring ride and vehicle types (#9229)
2019-05-11 13:06:29 +02:00
return String::Compare(a.label_string, b.label_string, true) < 0;
clang-format UI windows
2018-06-22 23:21:44 +02:00
});
Order vehicle type dropdown orthographically.
2018-06-01 20:13:47 +02:00
RideDropdownDataLanguage = ls.GetCurrentLanguage();
Order ride type dropdown orthographically.
2018-05-29 19:09:29 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_show_ride_type_dropdown(rct_window* w, rct_widget* widget)
Implement dropdown/spinner combo for changing ride type
2017-07-25 13:25:31 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Order ride type dropdown orthographically.
2018-05-29 19:09:29 +02:00
populate_ride_type_dropdown();
for (size_t i = 0; i < RideDropdownData.size(); i++)
{
Implement dropdown/spinner combo for changing ride type
2017-07-25 13:25:31 +02:00
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
Order ride type dropdown orthographically.
2018-05-29 19:09:29 +02:00
gDropdownItemsArgs[i] = RideDropdownData[i].label_id;
Implement dropdown/spinner combo for changing ride type
2017-07-25 13:25:31 +02:00
}
Fix #6131: Icon for suspended vehicles aligned too low
2017-08-06 16:01:20 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_widget* dropdownWidget = widget - 1;
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowText(
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
{ w->windowPos.x + dropdownWidget->left, w->windowPos.y + dropdownWidget->top }, dropdownWidget->height() + 1,
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
w->colours[1], Dropdown::Flag::StayOpen, RIDE_TYPE_COUNT);
Implement dropdown/spinner combo for changing ride type
2017-07-25 13:25:31 +02:00
Order ride type dropdown orthographically.
2018-05-29 19:09:29 +02:00
// Find the current ride type in the ordered list.
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint8_t pos = 0;
for (uint8_t i = 0; i < RIDE_TYPE_COUNT; i++)
Order ride type dropdown orthographically.
2018-05-29 19:09:29 +02:00
{
Stop ride type dropdown state sharing among ride windows This eliminates the _rideType variable, which was necessary when we still used a spinner and an Apply button, but is now no longer needed.
2018-06-14 20:15:31 +02:00
if (RideDropdownData[i].ride_type_id == ride->type)
Order ride type dropdown orthographically.
2018-05-29 19:09:29 +02:00
{
pos = i;
break;
}
}
gDropdownHighlightedIndex = pos;
gDropdownDefaultIndex = pos;
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetChecked(pos, true);
Implement dropdown/spinner combo for changing ride type
2017-07-25 13:25:31 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void populate_vehicle_type_dropdown(Ride* ride)
Refactor current vehicle dropdown preparation into its own function. Splitting the lot off to window_ride_show_vehicle_type_dropdown.
2018-06-01 18:48:27 +02:00
{
Refactor the ride type to entry map (#10967) Use C++ vectors and allow larger ride entry indices (> 256)
2020-03-20 18:07:31 +01:00
auto& objManager = GetContext()->GetObjectManager();
Port more functions to Ride struct (#9119)
2019-04-20 22:22:39 +02:00
rct_ride_entry* rideEntry = ride->GetRideEntry();
Refactor current vehicle dropdown preparation into its own function. Splitting the lot off to window_ride_show_vehicle_type_dropdown.
2018-06-01 18:48:27 +02:00
bool selectionShouldBeExpanded;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t rideTypeIterator, rideTypeIteratorMax;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gCheatsShowVehiclesFromOtherTrackTypes
Reformat code with clang-format 8.0.
2019-11-04 14:02:30 +01:00
&& !(
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_FLAT_RIDE) || ride->type == RIDE_TYPE_MAZE
Reformat code with clang-format 8.0.
2019-11-04 14:02:30 +01:00
|| ride->type == RIDE_TYPE_MINI_GOLF))
Refactor current vehicle dropdown preparation into its own function. Splitting the lot off to window_ride_show_vehicle_type_dropdown.
2018-06-01 18:48:27 +02:00
{
selectionShouldBeExpanded = true;
rideTypeIterator = 0;
rideTypeIteratorMax = RIDE_TYPE_COUNT - 1;
}
else
{
selectionShouldBeExpanded = false;
rideTypeIterator = ride->type;
rideTypeIteratorMax = ride->type;
}
Order vehicle type dropdown orthographically.
2018-06-01 20:13:47 +02:00
// Don't repopulate the list if we just did.
auto& ls = OpenRCT2::GetContext()->GetLocalisationService();
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (VehicleDropdownExpanded == selectionShouldBeExpanded && VehicleDropdownRideType == rideEntry
&& VehicleDropdownDataLanguage == ls.GetCurrentLanguage())
Order vehicle type dropdown orthographically.
2018-06-01 20:13:47 +02:00
return;
VehicleDropdownData.clear();
for (; rideTypeIterator <= rideTypeIteratorMax; rideTypeIterator++)
Refactor current vehicle dropdown preparation into its own function. Splitting the lot off to window_ride_show_vehicle_type_dropdown.
2018-06-01 18:48:27 +02:00
{
Replace ride_type_has_flag() with retrieving RTD
2021-02-26 09:49:09 +01:00
if (selectionShouldBeExpanded && GetRideTypeDescriptor(rideTypeIterator).HasFlag(RIDE_TYPE_FLAG_FLAT_RIDE))
Refactor current vehicle dropdown preparation into its own function. Splitting the lot off to window_ride_show_vehicle_type_dropdown.
2018-06-01 18:48:27 +02:00
continue;
if (selectionShouldBeExpanded && (rideTypeIterator == RIDE_TYPE_MAZE || rideTypeIterator == RIDE_TYPE_MINI_GOLF))
continue;
Refactor the ride type to entry map (#10967) Use C++ vectors and allow larger ride entry indices (> 256)
2020-03-20 18:07:31 +01:00
auto& rideEntries = objManager.GetAllRideEntries(rideTypeIterator);
for (auto rideEntryIndex : rideEntries)
Refactor current vehicle dropdown preparation into its own function. Splitting the lot off to window_ride_show_vehicle_type_dropdown.
2018-06-01 18:48:27 +02:00
{
Refactor the ride type to entry map (#10967) Use C++ vectors and allow larger ride entry indices (> 256)
2020-03-20 18:07:31 +01:00
auto currentRideEntry = get_ride_entry(rideEntryIndex);
Refactor current vehicle dropdown preparation into its own function. Splitting the lot off to window_ride_show_vehicle_type_dropdown.
2018-06-01 18:48:27 +02:00
// Skip if vehicle type has not been invented yet
if (!ride_entry_is_invented(rideEntryIndex) && !gCheatsIgnoreResearchStatus)
continue;
Refactor to use push_back more efficient (#13726)
2021-01-08 21:59:55 +01:00
VehicleDropdownData.push_back(
{ rideEntryIndex, currentRideEntry->naming.Name, ls.GetString(currentRideEntry->naming.Name) });
Order vehicle type dropdown orthographically.
2018-06-01 20:13:47 +02:00
}
}
Refactor current vehicle dropdown preparation into its own function. Splitting the lot off to window_ride_show_vehicle_type_dropdown.
2018-06-01 18:48:27 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
std::sort(VehicleDropdownData.begin(), VehicleDropdownData.end(), [](auto& a, auto& b) {
Use case-insensitive compare for soring ride and vehicle types (#9229)
2019-05-11 13:06:29 +02:00
return String::Compare(a.label_string, b.label_string, true) < 0;
clang-format UI windows
2018-06-22 23:21:44 +02:00
});
Refactor current vehicle dropdown preparation into its own function. Splitting the lot off to window_ride_show_vehicle_type_dropdown.
2018-06-01 18:48:27 +02:00
Order vehicle type dropdown orthographically.
2018-06-01 20:13:47 +02:00
VehicleDropdownExpanded = selectionShouldBeExpanded;
VehicleDropdownRideType = rideEntry;
VehicleDropdownDataLanguage = ls.GetCurrentLanguage();
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_show_vehicle_type_dropdown(rct_window* w, rct_widget* widget)
Order vehicle type dropdown orthographically.
2018-06-01 20:13:47 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Order vehicle type dropdown orthographically.
2018-06-01 20:13:47 +02:00
populate_vehicle_type_dropdown(ride);
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
size_t numItems = std::min<size_t>(VehicleDropdownData.size(), Dropdown::ItemsMaxSize);
Order vehicle type dropdown orthographically.
2018-06-01 20:13:47 +02:00
for (size_t i = 0; i < numItems; i++)
{
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[i] = VehicleDropdownData[i].label_id;
Refactor current vehicle dropdown preparation into its own function. Splitting the lot off to window_ride_show_vehicle_type_dropdown.
2018-06-01 18:48:27 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_widget* dropdownWidget = widget - 1;
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowTextCustomWidth(
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
{ w->windowPos.x + dropdownWidget->left, w->windowPos.y + dropdownWidget->top }, dropdownWidget->height() + 1,
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
w->colours[1], 0, Dropdown::Flag::StayOpen, numItems, widget->right - dropdownWidget->left);
Refactor current vehicle dropdown preparation into its own function. Splitting the lot off to window_ride_show_vehicle_type_dropdown.
2018-06-01 18:48:27 +02:00
Order vehicle type dropdown orthographically.
2018-06-01 20:13:47 +02:00
// Find the current vehicle type in the ordered list.
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint8_t pos = 0;
for (uint8_t i = 0; i < VehicleDropdownData.size(); i++)
Order vehicle type dropdown orthographically.
2018-06-01 20:13:47 +02:00
{
if (VehicleDropdownData[i].subtype_id == ride->subtype)
{
pos = i;
break;
}
}
gDropdownHighlightedIndex = pos;
gDropdownDefaultIndex = pos;
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetChecked(pos, true);
Refactor current vehicle dropdown preparation into its own function. Splitting the lot off to window_ride_show_vehicle_type_dropdown.
2018-06-01 18:48:27 +02:00
}
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AF1BD
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_main_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_VIEW_DROPDOWN:
window_ride_show_view_dropdown(w, widget);
break;
case WIDX_OPEN:
window_ride_show_open_dropdown(w, widget);
break;
case WIDX_RIDE_TYPE_DROPDOWN:
window_ride_show_ride_type_dropdown(w, widget);
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AF300
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_main_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_VIEW_DROPDOWN:
if (dropdownIndex == -1)
{
Add and use Ride::SupportsStatus
2019-05-08 18:41:29 +02:00
dropdownIndex = w->ride.view + 1;
auto ride = get_ride(w->number);
if (ride != nullptr)
{
if (dropdownIndex != 0 && dropdownIndex <= ride->num_vehicles
&& !(ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK))
{
dropdownIndex = ride->num_vehicles + 1;
}
if (dropdownIndex >= gDropdownNumItems)
{
dropdownIndex = 0;
}
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
w->ride.view = dropdownIndex;
window_ride_init_viewport(w);
Refactor window_invalidate to use rct_window::Invalidate
2019-06-15 17:20:16 +02:00
w->Invalidate();
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_OPEN:
Add and use Ride::SupportsStatus
2019-05-08 18:41:29 +02:00
{
auto ride = get_ride(w->number);
if (ride != nullptr)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
auto status = RIDE_STATUS_CLOSED;
if (dropdownIndex < 0)
Add and use Ride::SupportsStatus
2019-05-08 18:41:29 +02:00
{
dropdownIndex = gDropdownHighlightedIndex;
}
openrct2-ui cast fixes (#11348)
2020-04-19 14:08:22 +02:00
if (dropdownIndex < static_cast<int32_t>(std::size(gDropdownItemsArgs)))
Add and use Ride::SupportsStatus
2019-05-08 18:41:29 +02:00
{
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
switch (gDropdownItemsArgs[dropdownIndex])
{
case STR_CLOSE_RIDE:
status = RIDE_STATUS_CLOSED;
break;
case STR_SIMULATE_RIDE:
status = RIDE_STATUS_SIMULATING;
break;
case STR_TEST_RIDE:
status = RIDE_STATUS_TESTING;
break;
case STR_OPEN_RIDE:
status = RIDE_STATUS_OPEN;
break;
}
Add and use Ride::SupportsStatus
2019-05-08 18:41:29 +02:00
}
ride_set_status(ride, status);
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
break;
Add and use Ride::SupportsStatus
2019-05-08 18:41:29 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_RIDE_TYPE_DROPDOWN:
if (dropdownIndex != -1 && dropdownIndex < RIDE_TYPE_COUNT)
Turn ride type selection into a normal dropdown. This removes the spinner aspect that previously worked around dropdown item limits.
2018-05-29 11:04:17 +02:00
{
Remove Math::Clamp in favour of std::clamp
2018-08-12 13:50:40 +02:00
uint8_t rideLabelId = std::clamp(dropdownIndex, 0, RIDE_TYPE_COUNT - 1);
clang-format UI windows
2018-06-22 23:21:44 +02:00
uint8_t rideType = RideDropdownData[rideLabelId].ride_type_id;
if (rideType < RIDE_TYPE_COUNT)
{
Fix crash when switching ride types with construct window open (#12694)
2020-08-16 19:48:21 +02:00
auto rideSetSetting = RideSetSettingAction(w->number, RideSetSetting::RideType, rideType);
Rename GameActionResult and use GameActions namespace instead (#13184)
2020-10-15 03:04:39 +02:00
rideSetSetting.SetCallback([](const GameAction* ga, const GameActions::Result* result) {
Fix crash when switching ride types with construct window open (#12694)
2020-08-16 19:48:21 +02:00
// Reset ghost track if ride construction window is open, prevents a crash
// Will get set to the correct Alternative variable during set_default_next_piece.
// TODO: Rework construction window to prevent the need for this.
_currentTrackAlternative = RIDE_TYPE_NO_ALTERNATIVES;
ride_construction_set_default_next_piece();
});
GameActions::Execute(&rideSetSetting);
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Turn ride type selection into a normal dropdown. This removes the spinner aspect that previously worked around dropdown item limits.
2018-05-29 11:04:17 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AF40F
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_main_update(rct_window* w)
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Update tab animation
w->frame_no++;
window_event_invalidate_call(w);
widget_invalidate(w, WIDX_TAB_1);
// Update status
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride != nullptr)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
if (!(ride->window_invalidate_flags & RIDE_INVALIDATE_RIDE_MAIN))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
if (w->ride.view == 0)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
if (w->ride.view <= ride->num_vehicles)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Part of #12497: Remove extra SPRITE_INDEX_NULL check (#12538) * refactor: deleted double check of SPRITE_INDEX_NULL in Staff* ride_get_mechanic(Ride* ride) * refactor: deleted double check of SPRITE_INDEX_NULL in Ride.cpp file * refactor: deleted double check of SPRITE_INDEX_NULL in windows/Ride.cpp in function static rct_string_id window_ride_get_status_vehicle * refactor: deleted double check of SPRITE_INDEX_NULL in ride/Ride.cpp * refactor: deleted double check in FormatStatusTo
2020-08-02 09:28:11 +02:00
Vehicle* vehicle = GetEntity<Vehicle>(ride->vehicles[w->ride.view - 1]);
Fix null pointers reported by launchpad builders (#12168)
2020-07-09 23:52:14 +02:00
if (vehicle == nullptr
Close #12440: Refactor VEHICLE_STATUS to use strong enum (#12606) * Close #12440: Refactor VEHICLE_STATUS to use strong enum * Fix code formatting for VEHICLE_STATUS refactoring * Refactor VehicleStatus enum to be inside Vehicle This commit moves VehicleStatus inside Vehicle, renamed as Status.
2020-08-09 07:24:25 +02:00
|| (vehicle->status != Vehicle::Status::Travelling
&& vehicle->status != Vehicle::Status::TravellingCableLift
&& vehicle->status != Vehicle::Status::TravellingDodgems
&& vehicle->status != Vehicle::Status::TravellingBoat))
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
{
return;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
ride->window_invalidate_flags &= ~RIDE_INVALIDATE_RIDE_MAIN;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
widget_invalidate(w, WIDX_STATUS);
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AF2F9
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_main_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
{
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
if (widgetIndex != WIDX_RENAME || text == nullptr)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
Pass Ride* instead of ride_id_t
2019-02-13 00:58:45 +01:00
auto ride = get_ride(w->number);
if (ride != nullptr)
{
ride_set_name(ride, text, 0);
}
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
}
implement tab images
2014-09-04 00:19:13 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AF55A
implement tab images
2014-09-04 00:19:13 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_main_viewport_rotate(rct_window* w)
implement tab images
2014-09-04 00:19:13 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_init_viewport(w);
implement tab images
2014-09-04 00:19:13 +02:00
}
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AECF6
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_main_invalidate(rct_window* w)
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_widget* widgets;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t i, height;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
widgets = window_ride_page_widgets[w->page];
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->widgets != widgets)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->widgets = widgets;
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowInitScrollWidgets(w);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
window_ride_set_pressed_tab(w);
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->disabled_widgets &= ~((1 << WIDX_DEMOLISH) | (1 << WIDX_CONSTRUCTION));
if (ride->lifecycle_flags & (RIDE_LIFECYCLE_INDESTRUCTIBLE | RIDE_LIFECYCLE_INDESTRUCTIBLE_TRACK))
w->disabled_widgets |= (1 << WIDX_DEMOLISH);
Part of #11389: Use formatter class for Ride::FormatNameTo (#12041)
2020-06-25 02:02:08 +02:00
auto ft = Formatter::Common();
ride->FormatNameTo(ft);
Fix openrct2ui errors
2019-07-21 02:28:33 +02:00
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint32_t spriteIds[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
SPR_CLOSED,
SPR_OPEN,
SPR_TESTING,
Add new simulate icon.
2019-05-25 11:25:50 +02:00
SPR_G2_SIMULATE,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
};
window_ride_main_widgets[WIDX_OPEN].image = spriteIds[ride->status];
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
#ifdef __SIMULATE_IN_RIDE_WINDOW__
Enforce not breaking before assignments and function names Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-21 11:50:45 +02:00
window_ride_main_widgets[WIDX_CLOSE_LIGHT].image = SPR_G2_RCT1_CLOSE_BUTTON_0 + (ride->status == RIDE_STATUS_CLOSED) * 2
Refactor Widget to TitleCase (#13355)
2020-11-03 22:29:22 +01:00
+ WidgetIsPressed(w, WIDX_CLOSE_LIGHT);
Add RCT1 traffic light sprites for ride simulate status.
2019-05-25 14:15:42 +02:00
window_ride_main_widgets[WIDX_SIMULATE_LIGHT].image = SPR_G2_RCT1_SIMULATE_BUTTON_0
Refactor Widget to TitleCase (#13355)
2020-11-03 22:29:22 +01:00
+ (ride->status == RIDE_STATUS_SIMULATING) * 2 + WidgetIsPressed(w, WIDX_SIMULATE_LIGHT);
Add RCT1 traffic light sprites for ride simulate status.
2019-05-25 14:15:42 +02:00
window_ride_main_widgets[WIDX_TEST_LIGHT].image = SPR_G2_RCT1_TEST_BUTTON_0 + (ride->status == RIDE_STATUS_TESTING) * 2
Refactor Widget to TitleCase (#13355)
2020-11-03 22:29:22 +01:00
+ WidgetIsPressed(w, WIDX_TEST_LIGHT);
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
#else
Add RCT1 traffic light sprites for ride simulate status.
2019-05-25 14:15:42 +02:00
window_ride_main_widgets[WIDX_CLOSE_LIGHT].image = SPR_G2_RCT1_CLOSE_BUTTON_0 + (ride->status == RIDE_STATUS_CLOSED) * 2
Refactor Widget to TitleCase (#13355)
2020-11-03 22:29:22 +01:00
+ WidgetIsPressed(w, WIDX_CLOSE_LIGHT);
Add RCT1 traffic light sprites for ride simulate status.
2019-05-25 14:15:42 +02:00
auto baseSprite = ride->status == RIDE_STATUS_SIMULATING ? SPR_G2_RCT1_SIMULATE_BUTTON_0 : SPR_G2_RCT1_TEST_BUTTON_0;
window_ride_main_widgets[WIDX_TEST_LIGHT].image = baseSprite
+ (ride->status == RIDE_STATUS_TESTING || ride->status == RIDE_STATUS_SIMULATING) * 2
Refactor Widget to TitleCase (#13355)
2020-11-03 22:29:22 +01:00
+ WidgetIsPressed(w, WIDX_TEST_LIGHT);
Add RCT1 traffic light sprites for ride simulate status.
2019-05-25 14:15:42 +02:00
#endif
Enforce not breaking before assignments and function names Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-21 11:50:45 +02:00
window_ride_main_widgets[WIDX_OPEN_LIGHT].image = SPR_G2_RCT1_OPEN_BUTTON_0 + (ride->status == RIDE_STATUS_OPEN) * 2
Refactor Widget to TitleCase (#13355)
2020-11-03 22:29:22 +01:00
+ WidgetIsPressed(w, WIDX_OPEN_LIGHT);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_anchor_border_widgets(w);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
const int32_t offset = gCheatsAllowArbitraryRideTypeChanges ? 15 : 0;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Anchor main page specific widgets
window_ride_main_widgets[WIDX_VIEWPORT].right = w->width - 26;
window_ride_main_widgets[WIDX_VIEWPORT].bottom = w->height - (14 + offset);
window_ride_main_widgets[WIDX_STATUS].right = w->width - 26;
window_ride_main_widgets[WIDX_STATUS].top = w->height - (13 + offset);
window_ride_main_widgets[WIDX_STATUS].bottom = w->height - (3 + offset);
window_ride_main_widgets[WIDX_VIEW].right = w->width - 60;
window_ride_main_widgets[WIDX_VIEW_DROPDOWN].right = w->width - 61;
window_ride_main_widgets[WIDX_VIEW_DROPDOWN].left = w->width - 71;
Turn ride type selection into a normal dropdown. This removes the spinner aspect that previously worked around dropdown item limits.
2018-05-29 11:04:17 +02:00
window_ride_main_widgets[WIDX_RIDE_TYPE].right = w->width - 26;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_main_widgets[WIDX_RIDE_TYPE].top = w->height - 17;
window_ride_main_widgets[WIDX_RIDE_TYPE].bottom = w->height - 4;
Turn ride type selection into a normal dropdown. This removes the spinner aspect that previously worked around dropdown item limits.
2018-05-29 11:04:17 +02:00
window_ride_main_widgets[WIDX_RIDE_TYPE_DROPDOWN].left = w->width - 37;
window_ride_main_widgets[WIDX_RIDE_TYPE_DROPDOWN].right = w->width - 27;
window_ride_main_widgets[WIDX_RIDE_TYPE_DROPDOWN].top = w->height - 16;
window_ride_main_widgets[WIDX_RIDE_TYPE_DROPDOWN].bottom = w->height - 5;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (!gCheatsAllowArbitraryRideTypeChanges)
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_main_widgets[WIDX_RIDE_TYPE].type = WindowWidgetType::Empty;
window_ride_main_widgets[WIDX_RIDE_TYPE_DROPDOWN].type = WindowWidgetType::Empty;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_main_widgets[WIDX_RIDE_TYPE].type = WindowWidgetType::DropdownMenu;
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor()
2021-02-24 14:02:58 +01:00
window_ride_main_widgets[WIDX_RIDE_TYPE].text = ride->GetRideTypeDescriptor().Naming.Name;
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_main_widgets[WIDX_RIDE_TYPE_DROPDOWN].type = WindowWidgetType::Button;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_10);
Refactor UI/Interface misc to TitleCase (#13354) * Refactor LandTool to Namespace * Refactor Theme to TitleCase * Refactor ViewportInteraction to TitleCase
2020-11-03 11:59:00 +01:00
if (ThemeGetFlags() & UITHEME_FLAG_USE_LIGHTS_RIDE)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_main_widgets[WIDX_OPEN].type = WindowWidgetType::Empty;
window_ride_main_widgets[WIDX_CLOSE_LIGHT].type = WindowWidgetType::ImgBtn;
window_ride_main_widgets[WIDX_SIMULATE_LIGHT].type = WindowWidgetType::Empty;
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
#ifdef __SIMULATE_IN_RIDE_WINDOW__
if (ride->SupportsStatus(RIDE_STATUS_SIMULATING))
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_main_widgets[WIDX_SIMULATE_LIGHT].type = WindowWidgetType::ImgBtn;
Remove simulate from ride window
2019-05-23 19:41:17 +02:00
#endif
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_main_widgets[WIDX_TEST_LIGHT].type = ride->SupportsStatus(RIDE_STATUS_TESTING) ? WindowWidgetType::ImgBtn
: WindowWidgetType::Empty;
window_ride_main_widgets[WIDX_OPEN_LIGHT].type = WindowWidgetType::ImgBtn;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
height = 62;
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
if (window_ride_main_widgets[WIDX_SIMULATE_LIGHT].type != WindowWidgetType::Empty)
Add and implement simulation mode for rides
2019-05-07 21:14:21 +02:00
{
window_ride_main_widgets[WIDX_SIMULATE_LIGHT].top = height;
window_ride_main_widgets[WIDX_SIMULATE_LIGHT].bottom = height + 13;
height += 14;
}
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
if (window_ride_main_widgets[WIDX_TEST_LIGHT].type != WindowWidgetType::Empty)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_main_widgets[WIDX_TEST_LIGHT].top = height;
window_ride_main_widgets[WIDX_TEST_LIGHT].bottom = height + 13;
height += 14;
}
window_ride_main_widgets[WIDX_OPEN_LIGHT].top = height;
window_ride_main_widgets[WIDX_OPEN_LIGHT].bottom = height + 13;
height += 14 - 24 + RCT1_LIGHT_OFFSET;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_main_widgets[WIDX_OPEN].type = WindowWidgetType::FlatBtn;
window_ride_main_widgets[WIDX_CLOSE_LIGHT].type = WindowWidgetType::Empty;
window_ride_main_widgets[WIDX_SIMULATE_LIGHT].type = WindowWidgetType::Empty;
window_ride_main_widgets[WIDX_TEST_LIGHT].type = WindowWidgetType::Empty;
window_ride_main_widgets[WIDX_OPEN_LIGHT].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
height = 46;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
for (i = WIDX_CLOSE_LIGHT; i <= WIDX_OPEN_LIGHT; i++)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_main_widgets[i].left = w->width - 20;
window_ride_main_widgets[i].right = w->width - 7;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
for (i = WIDX_OPEN; i <= WIDX_DEMOLISH; i++, height += 24)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_main_widgets[i].left = w->width - 25;
window_ride_main_widgets[i].right = w->width - 2;
window_ride_main_widgets[i].top = height;
window_ride_main_widgets[i].bottom = height + 23;
}
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
}
implement ride window drawing
2014-09-03 20:13:37 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AF10A
implement ride window drawing
2014-09-03 20:13:37 +02:00
*/
Use Formatter&
2020-08-26 17:13:19 +02:00
static rct_string_id window_ride_get_status_overall_view(rct_window* w, Formatter& ft)
implement ride window drawing
2014-09-03 20:13:37 +02:00
{
Pass Ride* instead of ride_id_t
2019-02-13 00:58:45 +01:00
auto stringId = STR_NONE;
auto ride = get_ride(w->number);
if (ride != nullptr)
{
Use Formatter&
2020-08-26 17:13:19 +02:00
ride->FormatStatusTo(ft);
Do not use user strings for peep names
2019-07-21 21:44:19 +02:00
stringId = STR_BLACK_STRING;
if ((ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN) || (ride->lifecycle_flags & RIDE_LIFECYCLE_CRASHED))
Pass Ride* instead of ride_id_t
2019-02-13 00:58:45 +01:00
{
Do not use user strings for peep names
2019-07-21 21:44:19 +02:00
stringId = STR_RED_OUTLINED_STRING;
Pass Ride* instead of ride_id_t
2019-02-13 00:58:45 +01:00
}
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return stringId;
implement ride window drawing
2014-09-03 20:13:37 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AEFEF
implement ride window drawing
2014-09-03 20:13:37 +02:00
*/
Use Formatter&
2020-08-26 17:13:19 +02:00
static rct_string_id window_ride_get_status_vehicle(rct_window* w, Formatter& ft)
implement ride window drawing
2014-09-03 20:13:37 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
Fix null pointers reported by launchpad builders (#12168)
2020-07-09 23:52:14 +02:00
return STR_EMPTY;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Part of #12497: Remove extra SPRITE_INDEX_NULL check (#12538) * refactor: deleted double check of SPRITE_INDEX_NULL in Staff* ride_get_mechanic(Ride* ride) * refactor: deleted double check of SPRITE_INDEX_NULL in Ride.cpp file * refactor: deleted double check of SPRITE_INDEX_NULL in windows/Ride.cpp in function static rct_string_id window_ride_get_status_vehicle * refactor: deleted double check of SPRITE_INDEX_NULL in ride/Ride.cpp * refactor: deleted double check in FormatStatusTo
2020-08-02 09:28:11 +02:00
auto vehicle = GetEntity<Vehicle>(ride->vehicles[w->ride.view - 1]);
Fix null pointers reported by launchpad builders (#12168)
2020-07-09 23:52:14 +02:00
if (vehicle == nullptr)
return STR_EMPTY;
Close #12440: Refactor VEHICLE_STATUS to use strong enum (#12606) * Close #12440: Refactor VEHICLE_STATUS to use strong enum * Fix code formatting for VEHICLE_STATUS refactoring * Refactor VehicleStatus enum to be inside Vehicle This commit moves VehicleStatus inside Vehicle, renamed as Status.
2020-08-09 07:24:25 +02:00
if (vehicle->status != Vehicle::Status::Crashing && vehicle->status != Vehicle::Status::Crashed)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Use track_type_t in more places
2021-01-22 11:33:55 +01:00
auto trackType = vehicle->GetTrackType();
Rename TRACK_ELEM_* enums to TrackElemType::* - Replace enum in Track.h with namespace and constexpr - Find and replace all instances of TRACK_ELEM_* enums
2020-08-18 08:28:41 +02:00
if (trackType == TrackElemType::BlockBrakes || trackType == TrackElemType::CableLiftHill
|| trackType == TrackElemType::Up25ToFlat || trackType == TrackElemType::Up60ToFlat
|| trackType == TrackElemType::DiagUp25ToFlat || trackType == TrackElemType::DiagUp60ToFlat)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor()
2021-02-24 14:02:58 +01:00
if (ride->GetRideTypeDescriptor().SupportsTrackPiece(TRACK_BLOCK_BRAKES) && vehicle->velocity == 0)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Use Formatter&
2020-08-26 17:13:19 +02:00
ft.Add<rct_string_id>(STR_STOPPED_BY_BLOCK_BRAKES);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return STR_BLACK_STRING;
}
}
}
if (ride->type == RIDE_TYPE_MINI_GOLF)
Use Formatter in windows/Ride.cpp
2020-08-26 13:59:18 +02:00
return STR_EMPTY;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Use Formatter in windows/Ride.cpp
2020-08-26 13:59:18 +02:00
auto stringId = VehicleStatusNames[static_cast<size_t>(vehicle->status)];
Replace loose flag checking with helper function
2021-02-25 22:55:06 +01:00
if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_SINGLE_SESSION)
Close #12440: Refactor VEHICLE_STATUS to use strong enum (#12606) * Close #12440: Refactor VEHICLE_STATUS to use strong enum * Fix code formatting for VEHICLE_STATUS refactoring * Refactor VehicleStatus enum to be inside Vehicle This commit moves VehicleStatus inside Vehicle, renamed as Status.
2020-08-09 07:24:25 +02:00
&& vehicle->status <= Vehicle::Status::UnloadingPassengers)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Close #12440: Refactor VEHICLE_STATUS to use strong enum (#12606) * Close #12440: Refactor VEHICLE_STATUS to use strong enum * Fix code formatting for VEHICLE_STATUS refactoring * Refactor VehicleStatus enum to be inside Vehicle This commit moves VehicleStatus inside Vehicle, renamed as Status.
2020-08-09 07:24:25 +02:00
stringId = SingleSessionVehicleStatusNames[static_cast<size_t>(vehicle->status)];
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Use Formatter&
2020-08-26 17:13:19 +02:00
ft.Add<rct_string_id>(stringId);
Use Formatter in windows/Ride.cpp
2020-08-26 13:59:18 +02:00
uint16_t speedInMph = (abs(vehicle->velocity) * 9) >> 18;
Use Formatter&
2020-08-26 17:13:19 +02:00
ft.Add<uint16_t>(speedInMph);
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor()
2021-02-24 14:02:58 +01:00
const RideComponentName stationName = GetRideComponentName(ride->GetRideTypeDescriptor().NameConvention.station);
Use Formatter&
2020-08-26 17:13:19 +02:00
ft.Add<rct_string_id>(ride->num_stations > 1 ? stationName.number : stationName.singular);
ft.Add<uint16_t>(vehicle->current_station + 1);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return stringId != STR_CRASHING && stringId != STR_CRASHED_0 ? STR_BLACK_STRING : STR_RED_OUTLINED_STRING;
implement ride window drawing
2014-09-03 20:13:37 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AEF65
implement ride window drawing
2014-09-03 20:13:37 +02:00
*/
Use Formatter&
2020-08-26 17:13:19 +02:00
static rct_string_id window_ride_get_status_station(rct_window* w, Formatter& ft)
implement ride window drawing
2014-09-03 20:13:37 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return STR_NONE;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t count = w->ride.view - ride->num_vehicles - 1;
Use StationIndex in many more places (#10992)
2020-03-26 21:38:26 +01:00
StationIndex stationIndex = STATION_INDEX_NULL;
Use Formatter in windows/Ride.cpp
2020-08-26 13:59:18 +02:00
rct_string_id stringId = STR_EMPTY;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
do
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
stationIndex++;
Modify code using Location8 to use isNull()/setNull() (#10403)
2019-12-21 11:34:46 +01:00
if (!ride->stations[stationIndex].Start.isNull())
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
count--;
} while (count >= 0);
// Entrance / exit
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (ride->status == RIDE_STATUS_CLOSED)
{
Use named casts on openrct2-ui/windows (#11136)
2020-04-18 13:32:48 +02:00
if (ride_get_entrance_location(ride, static_cast<uint8_t>(stationIndex)).isNull())
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
stringId = STR_NO_ENTRANCE;
Use named casts on openrct2-ui/windows (#11136)
2020-04-18 13:32:48 +02:00
else if (ride_get_exit_location(ride, static_cast<uint8_t>(stationIndex)).isNull())
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
stringId = STR_NO_EXIT;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Use named casts on openrct2-ui/windows (#11136)
2020-04-18 13:32:48 +02:00
if (ride_get_entrance_location(ride, static_cast<uint8_t>(stationIndex)).isNull())
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
stringId = STR_EXIT_ONLY;
}
// Queue length
Use Formatter in windows/Ride.cpp
2020-08-26 13:59:18 +02:00
if (stringId == STR_EMPTY)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
stringId = STR_QUEUE_EMPTY;
Use Formatter in windows/Ride.cpp
2020-08-26 13:59:18 +02:00
uint16_t queueLength = ride->stations[stationIndex].QueueLength;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (queueLength == 1)
stringId = STR_QUEUE_ONE_PERSON;
else if (queueLength > 1)
stringId = STR_QUEUE_PEOPLE;
Use Formatter in windows/Ride.cpp
2020-08-26 13:59:18 +02:00
Use Formatter&
2020-08-26 17:13:19 +02:00
ft.Add<rct_string_id>(stringId);
ft.Add<uint16_t>(queueLength);
Use Formatter in windows/Ride.cpp
2020-08-26 13:59:18 +02:00
}
else
{
Use Formatter&
2020-08-26 17:13:19 +02:00
ft.Add<rct_string_id>(stringId);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
return STR_BLACK_STRING;
implement ride window drawing
2014-09-03 20:13:37 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AEE73
implement ride window drawing
2014-09-03 20:13:37 +02:00
*/
Use Formatter&
2020-08-26 17:13:19 +02:00
static rct_string_id window_ride_get_status(rct_window* w, Formatter& ft)
implement ride window drawing
2014-09-03 20:13:37 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (w->ride.view == 0)
Use Formatter in windows/Ride.cpp
2020-08-26 13:59:18 +02:00
return window_ride_get_status_overall_view(w, ft);
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
if (ride != nullptr && w->ride.view <= ride->num_vehicles)
Use Formatter in windows/Ride.cpp
2020-08-26 13:59:18 +02:00
return window_ride_get_status_vehicle(w, ft);
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
if (ride != nullptr && ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)
Use Formatter in windows/Ride.cpp
2020-08-26 13:59:18 +02:00
return window_ride_get_status_overall_view(w, ft);
return window_ride_get_status_station(w, ft);
implement ride window drawing
2014-09-03 20:13:37 +02:00
}
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AEE73
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_main_paint(rct_window* w, rct_drawpixelinfo* dpi)
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_widget* widget;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowDrawWidgets(w, dpi);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_draw_tab_images(dpi, w);
// Viewport and ear icon
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->viewport != nullptr)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_draw_viewport(dpi, w);
if (w->viewport->flags & VIEWPORT_FLAG_SOUND_ON)
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
gfx_draw_sprite(dpi, SPR_HEARING_VIEWPORT, w->windowPos + ScreenCoordsXY{ 2, 2 }, 0);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// View dropdown
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Remove common format formatter where possible (#13034) * Remove common format formatter where possible Eventually should have it limited to tooltips, window titles and widget args * Remove remaining paint functions using common * Remove misuse of gCommonFormatArgs
2020-09-30 23:42:04 +02:00
auto ft = Formatter();
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->ride.view != 0)
{
if (w->ride.view > ride->num_vehicles)
{
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor()
2021-02-24 14:02:58 +01:00
ft.Add<rct_string_id>(GetRideComponentName(ride->GetRideTypeDescriptor().NameConvention.station).number);
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Add<uint16_t>(w->ride.view - ride->num_vehicles);
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor()
2021-02-24 14:02:58 +01:00
ft.Add<rct_string_id>(GetRideComponentName(ride->GetRideTypeDescriptor().NameConvention.vehicle).number);
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Add<uint16_t>(w->ride.view);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
else
{
ft.Add<rct_string_id>(STR_OVERALL_VIEW);
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
widget = &window_ride_main_widgets[WIDX_VIEW];
gfx_draw_string_centred(
Fix #11570 - create gfx_draw_string_centered() overload (#11760) * Fix #11570 - create gfx_draw_string_centered() overload I created the overload, updated all calls from the old function to the new and deleted the old one
2020-05-17 20:29:56 +02:00
dpi, STR_WINDOW_COLOUR_2_STRINGID,
Remove common format formatter where possible (#13034) * Remove common format formatter where possible Eventually should have it limited to tooltips, window titles and widget args * Remove remaining paint functions using common * Remove misuse of gCommonFormatArgs
2020-09-30 23:42:04 +02:00
{ w->windowPos.x + (widget->left + widget->right - 11) / 2, w->windowPos.y + widget->top }, COLOUR_BLACK, ft.Data());
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Status
Remove common format formatter where possible (#13034) * Remove common format formatter where possible Eventually should have it limited to tooltips, window titles and widget args * Remove remaining paint functions using common * Remove misuse of gCommonFormatArgs
2020-09-30 23:42:04 +02:00
ft = Formatter();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
widget = &window_ride_main_widgets[WIDX_STATUS];
Use Formatter&
2020-08-26 17:13:19 +02:00
rct_string_id rideStatus = window_ride_get_status(w, ft);
Replace gfx_draw_string_clipped() calls with DrawTextEllipsised
2020-08-28 18:03:51 +02:00
DrawTextEllipsised(
dpi, w->windowPos + ScreenCoordsXY{ (widget->left + widget->right) / 2, widget->top }, widget->width(), rideStatus, ft,
COLOUR_BLACK, TextAlignment::CENTRE);
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
}
#pragma endregion
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
#pragma region Vehicle
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B272D
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_vehicle_mouseup(rct_window* w, rct_widgetindex widgetIndex)
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_CLOSE:
window_close(w);
break;
case WIDX_TAB_1:
case WIDX_TAB_2:
case WIDX_TAB_3:
case WIDX_TAB_4:
case WIDX_TAB_5:
case WIDX_TAB_6:
case WIDX_TAB_7:
case WIDX_TAB_8:
case WIDX_TAB_9:
case WIDX_TAB_10:
window_ride_set_page(w, widgetIndex - WIDX_TAB_1);
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B2ABB
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_vehicle_resize(rct_window* w)
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
{
Raise vehicle tab window height to avoid text clipping
2017-11-21 15:10:35 +01:00
window_set_resize(w, 316, 214, 316, 214);
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B2748
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_vehicle_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_VEHICLE_TYPE_DROPDOWN:
window_ride_show_vehicle_type_dropdown(w, &w->widgets[widgetIndex]);
break;
case WIDX_VEHICLE_TRAINS_INCREASE:
if (ride->num_vehicles < 32)
Move some ride functions to struct methods
2019-03-20 20:05:25 +01:00
ride->SetNumVehicles(ride->num_vehicles + 1);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_VEHICLE_TRAINS_DECREASE:
if (ride->num_vehicles > 1)
Move some ride functions to struct methods
2019-03-20 20:05:25 +01:00
ride->SetNumVehicles(ride->num_vehicles - 1);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_VEHICLE_CARS_PER_TRAIN_INCREASE:
if (ride->num_cars_per_train < 255)
Move some ride functions to struct methods
2019-03-20 20:05:25 +01:00
ride->SetNumCarsPerVehicle(ride->num_cars_per_train + 1);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_VEHICLE_CARS_PER_TRAIN_DECREASE:
Port more functions to Ride struct (#9119)
2019-04-20 22:22:39 +02:00
rct_ride_entry* rideEntry = ride->GetRideEntry();
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (ride->num_cars_per_train > rideEntry->zero_cars + 1)
Move some ride functions to struct methods
2019-03-20 20:05:25 +01:00
ride->SetNumCarsPerVehicle(ride->num_cars_per_train - 1);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B2767
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_vehicle_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (dropdownIndex == -1)
return;
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_VEHICLE_TYPE_DROPDOWN:
Fix #8443: Crash when clicking default vehicle for hacked ride
2018-12-15 11:35:36 +01:00
if (dropdownIndex >= 0 && static_cast<std::size_t>(dropdownIndex) < VehicleDropdownData.size())
{
Pass Ride* instead of ride_id_t
2019-02-13 21:16:42 +01:00
auto ride = get_ride(w->number);
if (ride != nullptr)
{
auto newRideType = VehicleDropdownData[dropdownIndex].subtype_id;
Move some ride functions to struct methods
2019-03-20 20:05:25 +01:00
ride->SetRideEntry(newRideType);
Pass Ride* instead of ride_id_t
2019-02-13 21:16:42 +01:00
}
Fix #8443: Crash when clicking default vehicle for hacked ride
2018-12-15 11:35:36 +01:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B2AA1
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_vehicle_update(rct_window* w)
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->frame_no++;
window_event_invalidate_call(w);
widget_invalidate(w, WIDX_TAB_2);
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
}
Tooltip 2 (#13159) * Use ScreenCoords for tooltip * Remove temporary variables * Small refactor * Fix #13151. Not passing tooltip arguments correctly for ride window * Fix Server List window version tooltip * Fix cheats tooltip event * Add static to function decl * Remove unreachable break statements in Ride.cpp * Apply review suggestions Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-10-17 10:10:08 +02:00
static OpenRCT2String window_ride_vehicle_tooltip(
rct_window* const w, const rct_widgetindex widgetIndex, rct_string_id fallback)
{
auto ride = get_ride(w->number);
if (ride == nullptr)
return { STR_NONE, {} };
switch (widgetIndex)
{
case WIDX_VEHICLE_TRAINS:
case WIDX_VEHICLE_TRAINS_DECREASE:
case WIDX_VEHICLE_TRAINS_INCREASE:
{
auto ft = Formatter();
ft.Increment(12);
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor()
2021-02-24 14:02:58 +01:00
RideComponentType vehicleType = ride->GetRideTypeDescriptor().NameConvention.vehicle;
Close #12438: Refactor RIDE_COMPONENT_TYPE to use strong enum (#13456) * Part of #12438 Changed RIDE_COMPONENT_TYPE to enum class (1/3) Changed the enum RIDE_COMPONENT_TYPE to be enum class in RideData.h. Shortened the enumerators. And fixed I split the changes I did into 3 commits because the enum is used in a total of 85 different files where I just replace the single line where they occur. The changes in those 85 files are analogous to my change in line 328 in RideData.h in this commit. * Part of #12438 changed all RIDE_COMPONENT_TYPE enumerators appearances (2/3) Changed every appearance of the old RIDE_COMPONENT_TYPE enumerators to the changed enumerators from last commit. * Part of #12438 (3/3) Used EnumValue() wherever a field or variable of the type RideComponentType was used as an index. Havent checked if anything from these 3 commits on this branch got codestyle issues * Part of #12438 used clang-format * Closes #12438 Added Accessor function for RideComponentName Added Accessor function GetRideComponentName to RideData. to replace the use RideComponentNames[EnumValue(RideComponentType type)] * Close #12438 moving GetRideComponentName to RideData Headerfile Moved GetRideComponentName to RideData Headerfile since thats where it should be.
2020-11-26 19:23:47 +01:00
rct_string_id stringId = GetRideComponentName(vehicleType).count;
Tooltip 2 (#13159) * Use ScreenCoords for tooltip * Remove temporary variables * Small refactor * Fix #13151. Not passing tooltip arguments correctly for ride window * Fix Server List window version tooltip * Fix cheats tooltip event * Add static to function decl * Remove unreachable break statements in Ride.cpp * Apply review suggestions Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-10-17 10:10:08 +02:00
if (ride->max_trains > 1)
{
Close #12438: Refactor RIDE_COMPONENT_TYPE to use strong enum (#13456) * Part of #12438 Changed RIDE_COMPONENT_TYPE to enum class (1/3) Changed the enum RIDE_COMPONENT_TYPE to be enum class in RideData.h. Shortened the enumerators. And fixed I split the changes I did into 3 commits because the enum is used in a total of 85 different files where I just replace the single line where they occur. The changes in those 85 files are analogous to my change in line 328 in RideData.h in this commit. * Part of #12438 changed all RIDE_COMPONENT_TYPE enumerators appearances (2/3) Changed every appearance of the old RIDE_COMPONENT_TYPE enumerators to the changed enumerators from last commit. * Part of #12438 (3/3) Used EnumValue() wherever a field or variable of the type RideComponentType was used as an index. Havent checked if anything from these 3 commits on this branch got codestyle issues * Part of #12438 used clang-format * Closes #12438 Added Accessor function for RideComponentName Added Accessor function GetRideComponentName to RideData. to replace the use RideComponentNames[EnumValue(RideComponentType type)] * Close #12438 moving GetRideComponentName to RideData Headerfile Moved GetRideComponentName to RideData Headerfile since thats where it should be.
2020-11-26 19:23:47 +01:00
stringId = GetRideComponentName(vehicleType).count_plural;
Tooltip 2 (#13159) * Use ScreenCoords for tooltip * Remove temporary variables * Small refactor * Fix #13151. Not passing tooltip arguments correctly for ride window * Fix Server List window version tooltip * Fix cheats tooltip event * Add static to function decl * Remove unreachable break statements in Ride.cpp * Apply review suggestions Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-10-17 10:10:08 +02:00
}
ft.Add<rct_string_id>(stringId);
ft.Add<uint16_t>(ride->max_trains);
return { fallback, ft };
}
case WIDX_VEHICLE_CARS_PER_TRAIN:
case WIDX_VEHICLE_CARS_PER_TRAIN_DECREASE:
case WIDX_VEHICLE_CARS_PER_TRAIN_INCREASE:
{
auto rideEntry = ride->GetRideEntry();
if (rideEntry == nullptr)
return { STR_NONE, {} };
auto ft = Formatter();
ft.Increment(16);
Create calls for min/max cars per train
2020-11-05 17:42:02 +01:00
ft.Add<uint16_t>(std::max(uint8_t(1), ride->GetMaxCarsPerTrain()) - rideEntry->zero_cars);
Tooltip 2 (#13159) * Use ScreenCoords for tooltip * Remove temporary variables * Small refactor * Fix #13151. Not passing tooltip arguments correctly for ride window * Fix Server List window version tooltip * Fix cheats tooltip event * Add static to function decl * Remove unreachable break statements in Ride.cpp * Apply review suggestions Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-10-17 10:10:08 +02:00
Close #12438: Refactor RIDE_COMPONENT_TYPE to use strong enum (#13456) * Part of #12438 Changed RIDE_COMPONENT_TYPE to enum class (1/3) Changed the enum RIDE_COMPONENT_TYPE to be enum class in RideData.h. Shortened the enumerators. And fixed I split the changes I did into 3 commits because the enum is used in a total of 85 different files where I just replace the single line where they occur. The changes in those 85 files are analogous to my change in line 328 in RideData.h in this commit. * Part of #12438 changed all RIDE_COMPONENT_TYPE enumerators appearances (2/3) Changed every appearance of the old RIDE_COMPONENT_TYPE enumerators to the changed enumerators from last commit. * Part of #12438 (3/3) Used EnumValue() wherever a field or variable of the type RideComponentType was used as an index. Havent checked if anything from these 3 commits on this branch got codestyle issues * Part of #12438 used clang-format * Closes #12438 Added Accessor function for RideComponentName Added Accessor function GetRideComponentName to RideData. to replace the use RideComponentNames[EnumValue(RideComponentType type)] * Close #12438 moving GetRideComponentName to RideData Headerfile Moved GetRideComponentName to RideData Headerfile since thats where it should be.
2020-11-26 19:23:47 +01:00
rct_string_id stringId = GetRideComponentName(RideComponentType::Car).singular;
Create calls for min/max cars per train
2020-11-05 17:42:02 +01:00
if (ride->GetMaxCarsPerTrain() - rideEntry->zero_cars > 1)
Tooltip 2 (#13159) * Use ScreenCoords for tooltip * Remove temporary variables * Small refactor * Fix #13151. Not passing tooltip arguments correctly for ride window * Fix Server List window version tooltip * Fix cheats tooltip event * Add static to function decl * Remove unreachable break statements in Ride.cpp * Apply review suggestions Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-10-17 10:10:08 +02:00
{
Close #12438: Refactor RIDE_COMPONENT_TYPE to use strong enum (#13456) * Part of #12438 Changed RIDE_COMPONENT_TYPE to enum class (1/3) Changed the enum RIDE_COMPONENT_TYPE to be enum class in RideData.h. Shortened the enumerators. And fixed I split the changes I did into 3 commits because the enum is used in a total of 85 different files where I just replace the single line where they occur. The changes in those 85 files are analogous to my change in line 328 in RideData.h in this commit. * Part of #12438 changed all RIDE_COMPONENT_TYPE enumerators appearances (2/3) Changed every appearance of the old RIDE_COMPONENT_TYPE enumerators to the changed enumerators from last commit. * Part of #12438 (3/3) Used EnumValue() wherever a field or variable of the type RideComponentType was used as an index. Havent checked if anything from these 3 commits on this branch got codestyle issues * Part of #12438 used clang-format * Closes #12438 Added Accessor function for RideComponentName Added Accessor function GetRideComponentName to RideData. to replace the use RideComponentNames[EnumValue(RideComponentType type)] * Close #12438 moving GetRideComponentName to RideData Headerfile Moved GetRideComponentName to RideData Headerfile since thats where it should be.
2020-11-26 19:23:47 +01:00
stringId = GetRideComponentName(RideComponentType::Car).plural;
Tooltip 2 (#13159) * Use ScreenCoords for tooltip * Remove temporary variables * Small refactor * Fix #13151. Not passing tooltip arguments correctly for ride window * Fix Server List window version tooltip * Fix cheats tooltip event * Add static to function decl * Remove unreachable break statements in Ride.cpp * Apply review suggestions Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-10-17 10:10:08 +02:00
}
ft.Add<rct_string_id>(stringId);
return { fallback, ft };
}
}
return { fallback, {} };
}
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B222C
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_vehicle_invalidate(rct_window* w)
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_widget* widgets;
rct_ride_entry* rideEntry;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_string_id stringId;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t carsPerTrain;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
widgets = window_ride_page_widgets[w->page];
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->widgets != widgets)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->widgets = widgets;
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowInitScrollWidgets(w);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
window_ride_set_pressed_tab(w);
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Port more functions to Ride struct (#9119)
2019-04-20 22:22:39 +02:00
rideEntry = ride->GetRideEntry();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Fix a few more bugs
2019-07-21 13:09:23 +02:00
w->widgets[WIDX_TITLE].text = STR_ARG_20_STRINGID;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Widget setup
carsPerTrain = ride->num_cars_per_train - rideEntry->zero_cars;
// Vehicle type
Move ride naming to RTD This also means that all unused ride types will now have the same name. I have made an exception for the 'arbitrary ride type change' dropdown only.
2020-06-16 22:50:58 +02:00
window_ride_vehicle_widgets[WIDX_VEHICLE_TYPE].text = rideEntry->naming.Name;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Trains
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (rideEntry->cars_per_flat_ride > 1 || gCheatsDisableTrainLengthLimit)
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_vehicle_widgets[WIDX_VEHICLE_TRAINS].type = WindowWidgetType::Spinner;
window_ride_vehicle_widgets[WIDX_VEHICLE_TRAINS_INCREASE].type = WindowWidgetType::Button;
window_ride_vehicle_widgets[WIDX_VEHICLE_TRAINS_DECREASE].type = WindowWidgetType::Button;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_vehicle_widgets[WIDX_VEHICLE_TRAINS].type = WindowWidgetType::Empty;
window_ride_vehicle_widgets[WIDX_VEHICLE_TRAINS_INCREASE].type = WindowWidgetType::Empty;
window_ride_vehicle_widgets[WIDX_VEHICLE_TRAINS_DECREASE].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Cars per train
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (rideEntry->zero_cars + 1 < rideEntry->max_cars_in_train || gCheatsDisableTrainLengthLimit)
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_vehicle_widgets[WIDX_VEHICLE_CARS_PER_TRAIN].type = WindowWidgetType::Spinner;
window_ride_vehicle_widgets[WIDX_VEHICLE_CARS_PER_TRAIN_INCREASE].type = WindowWidgetType::Button;
window_ride_vehicle_widgets[WIDX_VEHICLE_CARS_PER_TRAIN_DECREASE].type = WindowWidgetType::Button;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_vehicle_widgets[WIDX_VEHICLE_CARS_PER_TRAIN].type = WindowWidgetType::Empty;
window_ride_vehicle_widgets[WIDX_VEHICLE_CARS_PER_TRAIN_INCREASE].type = WindowWidgetType::Empty;
window_ride_vehicle_widgets[WIDX_VEHICLE_CARS_PER_TRAIN_DECREASE].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
auto ft = Formatter::Common();
ft.Increment(6);
ft.Add<uint16_t>(carsPerTrain);
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor()
2021-02-24 14:02:58 +01:00
RideComponentType vehicleType = ride->GetRideTypeDescriptor().NameConvention.vehicle;
Close #12438: Refactor RIDE_COMPONENT_TYPE to use strong enum (#13456) * Part of #12438 Changed RIDE_COMPONENT_TYPE to enum class (1/3) Changed the enum RIDE_COMPONENT_TYPE to be enum class in RideData.h. Shortened the enumerators. And fixed I split the changes I did into 3 commits because the enum is used in a total of 85 different files where I just replace the single line where they occur. The changes in those 85 files are analogous to my change in line 328 in RideData.h in this commit. * Part of #12438 changed all RIDE_COMPONENT_TYPE enumerators appearances (2/3) Changed every appearance of the old RIDE_COMPONENT_TYPE enumerators to the changed enumerators from last commit. * Part of #12438 (3/3) Used EnumValue() wherever a field or variable of the type RideComponentType was used as an index. Havent checked if anything from these 3 commits on this branch got codestyle issues * Part of #12438 used clang-format * Closes #12438 Added Accessor function for RideComponentName Added Accessor function GetRideComponentName to RideData. to replace the use RideComponentNames[EnumValue(RideComponentType type)] * Close #12438 moving GetRideComponentName to RideData Headerfile Moved GetRideComponentName to RideData Headerfile since thats where it should be.
2020-11-26 19:23:47 +01:00
stringId = GetRideComponentName(vehicleType).count;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (ride->num_vehicles > 1)
{
Close #12438: Refactor RIDE_COMPONENT_TYPE to use strong enum (#13456) * Part of #12438 Changed RIDE_COMPONENT_TYPE to enum class (1/3) Changed the enum RIDE_COMPONENT_TYPE to be enum class in RideData.h. Shortened the enumerators. And fixed I split the changes I did into 3 commits because the enum is used in a total of 85 different files where I just replace the single line where they occur. The changes in those 85 files are analogous to my change in line 328 in RideData.h in this commit. * Part of #12438 changed all RIDE_COMPONENT_TYPE enumerators appearances (2/3) Changed every appearance of the old RIDE_COMPONENT_TYPE enumerators to the changed enumerators from last commit. * Part of #12438 (3/3) Used EnumValue() wherever a field or variable of the type RideComponentType was used as an index. Havent checked if anything from these 3 commits on this branch got codestyle issues * Part of #12438 used clang-format * Closes #12438 Added Accessor function for RideComponentName Added Accessor function GetRideComponentName to RideData. to replace the use RideComponentNames[EnumValue(RideComponentType type)] * Close #12438 moving GetRideComponentName to RideData Headerfile Moved GetRideComponentName to RideData Headerfile since thats where it should be.
2020-11-26 19:23:47 +01:00
stringId = GetRideComponentName(vehicleType).count_plural;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Add<rct_string_id>(stringId);
ft.Add<uint16_t>(ride->num_vehicles);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Tooltip 2 (#13159) * Use ScreenCoords for tooltip * Remove temporary variables * Small refactor * Fix #13151. Not passing tooltip arguments correctly for ride window * Fix Server List window version tooltip * Fix cheats tooltip event * Add static to function decl * Remove unreachable break statements in Ride.cpp * Apply review suggestions Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-10-17 10:10:08 +02:00
ft.Increment(8);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Part of #11389: Use formatter class for Ride::FormatNameTo (#12041)
2020-06-25 02:02:08 +02:00
ride->FormatNameTo(ft);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_anchor_border_widgets(w);
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_10);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (ride->num_cars_per_train > (rideEntry->zero_cars + 1))
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_vehicle_widgets[WIDX_VEHICLE_CARS_PER_TRAIN].text = STR_X_CARS_PER_TRAIN;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_vehicle_widgets[WIDX_VEHICLE_CARS_PER_TRAIN].text = STR_1_CAR_PER_TRAIN;
}
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B23DC
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_vehicle_paint(rct_window* w, rct_drawpixelinfo* dpi)
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
{
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowDrawWidgets(w, dpi);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_draw_tab_images(dpi, w);
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto rideEntry = ride->GetRideEntry();
if (rideEntry == nullptr)
return;
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
auto screenCoords = w->windowPos + ScreenCoordsXY{ 8, 64 };
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Description
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
screenCoords.y += gfx_draw_string_left_wrapped(
Fix #11562 - gfx_draw_string_left_wrapped overload (#12015) I created the overload, replaced remaining calls with the new function and removed the old function.
2020-06-21 11:25:31 +02:00
dpi, &rideEntry->naming.Description, screenCoords, 300, STR_BLACK_STRING, COLOUR_BLACK);
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
screenCoords.y += 2;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Capacity
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, STR_CAPACITY, &rideEntry->capacity, COLOUR_BLACK, screenCoords);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Remove most usages of separate flag This removes most usages of the separate flag, instead relying on ride groups to do its job. Research is more complicated and will follow in another commit.
2017-12-07 16:12:37 +01:00
// Excitement Factor
Use named casts on openrct2-ui/windows (#11136)
2020-04-18 13:32:48 +02:00
auto factor = static_cast<int16_t>(rideEntry->excitement_multiplier);
Remove most usages of separate flag This removes most usages of the separate flag, instead relying on ride groups to do its job. Research is more complicated and will follow in another commit.
2017-12-07 16:12:37 +01:00
if (factor > 0)
Raise vehicle tab window height to avoid text clipping
2017-11-21 15:10:35 +01:00
{
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
screenCoords.y += LIST_ROW_HEIGHT;
gfx_draw_string_left(dpi, STR_EXCITEMENT_FACTOR, &factor, COLOUR_BLACK, screenCoords);
Remove most usages of separate flag This removes most usages of the separate flag, instead relying on ride groups to do its job. Research is more complicated and will follow in another commit.
2017-12-07 16:12:37 +01:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Remove most usages of separate flag This removes most usages of the separate flag, instead relying on ride groups to do its job. Research is more complicated and will follow in another commit.
2017-12-07 16:12:37 +01:00
// Intensity Factor
factor = rideEntry->intensity_multiplier;
if (factor > 0)
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t lineHeight = font_get_line_height(FONT_SPRITE_BASE_MEDIUM);
Fix #7021: Extra rating factors overflow the vehicle tab in Korean (#7073)
2018-01-23 16:06:37 +01:00
if (lineHeight != 10)
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
screenCoords.x += 150;
Fix #7021: Extra rating factors overflow the vehicle tab in Korean (#7073)
2018-01-23 16:06:37 +01:00
else
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
screenCoords.y += LIST_ROW_HEIGHT;
Fix #7021: Extra rating factors overflow the vehicle tab in Korean (#7073)
2018-01-23 16:06:37 +01:00
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, STR_INTENSITY_FACTOR, &factor, COLOUR_BLACK, screenCoords);
Fix #7021: Extra rating factors overflow the vehicle tab in Korean (#7073)
2018-01-23 16:06:37 +01:00
if (lineHeight != 10)
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
screenCoords.x -= 150;
Remove most usages of separate flag This removes most usages of the separate flag, instead relying on ride groups to do its job. Research is more complicated and will follow in another commit.
2017-12-07 16:12:37 +01:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Remove most usages of separate flag This removes most usages of the separate flag, instead relying on ride groups to do its job. Research is more complicated and will follow in another commit.
2017-12-07 16:12:37 +01:00
// Nausea Factor
factor = rideEntry->nausea_multiplier;
if (factor > 0)
{
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
screenCoords.y += LIST_ROW_HEIGHT;
gfx_draw_string_left(dpi, STR_NAUSEA_FACTOR, &factor, COLOUR_BLACK, screenCoords);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
struct rct_vehicle_paintinfo
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int16_t x;
int16_t y;
int32_t sprite_index;
int32_t tertiary_colour;
Remove and replace C typedefs `typedef struct/union/enum name { ... } name_again;` is not needed whe compiling C++, moving the name at the back to be in front of the object and removing `typedef` makes it usable the very same way. This also replaces typedefs with the using keyword. They have better readability, especially for function pointer types, and would allow more flexibility when used with templates.
2018-02-14 09:42:26 +01:00
};
add drawing of vehicles on ride window vehicle page
2014-09-20 00:43:35 +02:00
Fix a few typos 'vehichle' -> 'vehicle' 'none zero' and 'non zero' -> 'nonzero'
2018-03-09 14:41:05 +01:00
static rct_vehicle_paintinfo _sprites_to_draw[144];
add drawing of vehicles on ride window vehicle page
2014-09-20 00:43:35 +02:00
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B2502
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_vehicle_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Port more functions to Ride struct (#9119)
2019-04-20 22:22:39 +02:00
rct_ride_entry* rideEntry = ride->GetRideEntry();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Background
Part of #12096: ScreenRect on gfx_fill_rect in windows/Ride.cpp (#12239)
2020-07-13 22:49:12 +02:00
gfx_fill_rect(dpi, { { dpi->x, dpi->y }, { dpi->x + dpi->width, dpi->y + dpi->height } }, PALETTE_INDEX_12);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_widget* widget = &window_ride_vehicle_widgets[WIDX_VEHICLE_TRAINS_PREVIEW];
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
int32_t startX = std::max(2, (widget->width() - ((ride->num_vehicles - 1) * 36)) / 2 - 25);
int32_t startY = widget->height() - 4;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Enforce not breaking before assignments and function names Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-21 11:50:45 +02:00
rct_ride_entry_vehicle* rideVehicleEntry = &rideEntry->vehicles[ride_entry_get_vehicle_at_position(
ride->subtype, ride->num_cars_per_train, 0)];
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
startY += rideVehicleEntry->tab_height;
// For each train
clang-format UI windows
2018-06-22 23:21:44 +02:00
for (int32_t i = 0; i < ride->num_vehicles; i++)
{
rct_vehicle_paintinfo* nextSpriteToDraw = _sprites_to_draw;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t x = startX;
int32_t y = startY;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// For each car in train
clang-format UI windows
2018-06-22 23:21:44 +02:00
for (int32_t j = 0; j < ride->num_cars_per_train; j++)
{
Enforce not breaking before assignments and function names Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-21 11:50:45 +02:00
rideVehicleEntry = &rideEntry
->vehicles[ride_entry_get_vehicle_at_position(ride->subtype, ride->num_cars_per_train, j)];
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
x += rideVehicleEntry->spacing / 17432;
y -= (rideVehicleEntry->spacing / 2) / 17432;
// Get colour of vehicle
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t vehicleColourIndex = 0;
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (ride->colour_scheme_type & 3)
{
case VEHICLE_COLOUR_SCHEME_SAME:
vehicleColourIndex = 0;
break;
case VEHICLE_COLOUR_SCHEME_PER_TRAIN:
vehicleColourIndex = i;
break;
case VEHICLE_COLOUR_SCHEME_PER_VEHICLE:
vehicleColourIndex = j;
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
vehicle_colour vehicleColour = ride_get_vehicle_colour(ride, vehicleColourIndex);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t spriteIndex = 16;
Clean up vehicle flags (#6058)
2017-07-31 12:27:04 +02:00
if (rideVehicleEntry->flags & VEHICLE_ENTRY_FLAG_11)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
spriteIndex /= 2;
spriteIndex &= rideVehicleEntry->rotation_frame_mask;
Name some rct_ride_entry_vehicle properties
2017-09-15 17:50:38 +02:00
spriteIndex *= rideVehicleEntry->base_num_frames;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
spriteIndex += rideVehicleEntry->base_image_id;
spriteIndex |= (vehicleColour.additional_1 << 24) | (vehicleColour.main << 19);
Name and fix vehicle entry and tertiary colour flags
2017-07-20 12:57:37 +02:00
spriteIndex |= IMAGE_TYPE_REMAP_2_PLUS;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
nextSpriteToDraw->x = x;
nextSpriteToDraw->y = y;
nextSpriteToDraw->sprite_index = spriteIndex;
nextSpriteToDraw->tertiary_colour = vehicleColour.additional_2;
nextSpriteToDraw++;
x += rideVehicleEntry->spacing / 17432;
y -= (rideVehicleEntry->spacing / 2) / 17432;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (ride->type == RIDE_TYPE_REVERSER_ROLLER_COASTER)
{
Fix a few typos 'vehichle' -> 'vehicle' 'none zero' and 'non zero' -> 'nonzero'
2018-03-09 14:41:05 +01:00
rct_vehicle_paintinfo tmp = *(nextSpriteToDraw - 1);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
*(nextSpriteToDraw - 1) = *(nextSpriteToDraw - 2);
*(nextSpriteToDraw - 2) = tmp;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_vehicle_paintinfo* current = nextSpriteToDraw;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
while (--current >= _sprites_to_draw)
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
gfx_draw_sprite(dpi, current->sprite_index, { current->x, current->y }, current->tertiary_colour);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
startX += 36;
}
implement most of vehicle tab for ride window
2014-09-18 03:48:51 +02:00
}
#pragma endregion
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
#pragma region Operating
finish operating tab on ride window
2014-09-09 18:17:08 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B11D5
finish operating tab on ride window
2014-09-09 18:17:08 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_mode_tweak_increase(rct_window* w)
finish operating tab on ride window
2014-09-09 18:17:08 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Allow maxing out launch speed and many other operation settings as well
2015-05-17 17:26:07 +02:00
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor()
2021-02-24 14:02:58 +01:00
const auto& operatingSettings = ride->GetRideTypeDescriptor().OperatingSettings;
Move RideProperties and rideBonusValue to RideTypeDescriptors Part of #11964.
2020-06-17 18:59:04 +02:00
uint8_t maxValue = operatingSettings.MaxValue;
uint8_t minValue = gCheatsFastLiftHill ? 0 : operatingSettings.MinValue;
Implement max people on maze properly Last year the limit for max people on maze was raised using a hack. Since the responsible table has been implemented since then, remove the hack and update the value in the table.
2016-08-03 20:41:31 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gCheatsFastLiftHill)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
maxValue = 255;
}
finish operating tab on ride window
2014-09-09 18:17:08 +02:00
Close #12437, refactor: RIDE_MODE_* to strong enums (#12833) * partial refactor: RIDE_MODE_* to strong enums * Close #12437, refactor: RIDE_MODE_* to strong enums * chore: code formatting * refactor: RideMode, change enum names to CamelCase and resolve casting order. * chore: refactor due to code formatting * Close #12437, refactor: RIDE_MODE_* to strong enums Resolved comments * chore: Formatting correction. * Use EnumsToFlags constexpr * refactor: resolved comments added newline at the end of file * refactor: Change case stack to default in Switch Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2020-09-28 15:09:59 +02:00
uint8_t increment = ride->mode == RideMode::Dodgems ? 10 : 1;
Fix overflow in ride_mode_tweak (#3478) Fixes #2529: Time overflow when unlocking dodgems' operating limits Fixes #3424: Max. people on ride overflows when operating limit is unlocked
2016-05-03 15:44:54 +02:00
Add RideSetSettingAction Use game action for calling Use correct error titles for operation mode changes
2019-02-22 11:13:08 +01:00
set_operating_setting(
w->number, RideSetSetting::Operation, std::clamp<int16_t>(ride->operation_option + increment, minValue, maxValue));
finish operating tab on ride window
2014-09-09 18:17:08 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B120A
finish operating tab on ride window
2014-09-09 18:17:08 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_mode_tweak_decrease(rct_window* w)
finish operating tab on ride window
2014-09-09 18:17:08 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Extend fast lift hill cheat and update description
2015-12-20 20:47:59 +01:00
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor()
2021-02-24 14:02:58 +01:00
const auto& operatingSettings = ride->GetRideTypeDescriptor().OperatingSettings;
Move RideProperties and rideBonusValue to RideTypeDescriptors Part of #11964.
2020-06-17 18:59:04 +02:00
uint8_t maxValue = operatingSettings.MaxValue;
uint8_t minValue = gCheatsFastLiftHill ? 0 : operatingSettings.MinValue;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gCheatsFastLiftHill)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
maxValue = 255;
}
finish operating tab on ride window
2014-09-09 18:17:08 +02:00
Close #12437, refactor: RIDE_MODE_* to strong enums (#12833) * partial refactor: RIDE_MODE_* to strong enums * Close #12437, refactor: RIDE_MODE_* to strong enums * chore: code formatting * refactor: RideMode, change enum names to CamelCase and resolve casting order. * chore: refactor due to code formatting * Close #12437, refactor: RIDE_MODE_* to strong enums Resolved comments * chore: Formatting correction. * Use EnumsToFlags constexpr * refactor: resolved comments added newline at the end of file * refactor: Change case stack to default in Switch Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2020-09-28 15:09:59 +02:00
uint8_t decrement = ride->mode == RideMode::Dodgems ? 10 : 1;
Refactor and add better operation-mode bound checks (#3600)
2016-05-19 19:21:36 +02:00
Add RideSetSettingAction Use game action for calling Use correct error titles for operation mode changes
2019-02-22 11:13:08 +01:00
set_operating_setting(
w->number, RideSetSetting::Operation, std::clamp<int16_t>(ride->operation_option - decrement, minValue, maxValue));
finish operating tab on ride window
2014-09-09 18:17:08 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B1631
finish operating tab on ride window
2014-09-09 18:17:08 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_mode_dropdown(rct_window* w, rct_widget* widget)
finish operating tab on ride window
2014-09-09 18:17:08 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_widget* dropdownWidget;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
dropdownWidget = widget - 1;
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Move available ride modes to RTD; ride mode cleanup
2020-04-25 15:29:18 +02:00
auto availableModes = ride->GetAvailableModes();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Create dropdown list
Move available ride modes to RTD; ride mode cleanup
2020-04-25 15:29:18 +02:00
auto numAvailableModes = 0;
auto checkedIndex = -1;
Close #12437, refactor: RIDE_MODE_* to strong enums (#12833) * partial refactor: RIDE_MODE_* to strong enums * Close #12437, refactor: RIDE_MODE_* to strong enums * chore: code formatting * refactor: RideMode, change enum names to CamelCase and resolve casting order. * chore: refactor due to code formatting * Close #12437, refactor: RIDE_MODE_* to strong enums Resolved comments * chore: Formatting correction. * Use EnumsToFlags constexpr * refactor: resolved comments added newline at the end of file * refactor: Change case stack to default in Switch Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2020-09-28 15:09:59 +02:00
for (auto i = 0; i < static_cast<uint8_t>(RideMode::Count); i++)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Move available ride modes to RTD; ride mode cleanup
2020-04-25 15:29:18 +02:00
if (availableModes & (1ULL << i))
{
gDropdownItemsFormat[numAvailableModes] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[numAvailableModes] = RideModeNames[i];
Close #12437, refactor: RIDE_MODE_* to strong enums (#12833) * partial refactor: RIDE_MODE_* to strong enums * Close #12437, refactor: RIDE_MODE_* to strong enums * chore: code formatting * refactor: RideMode, change enum names to CamelCase and resolve casting order. * chore: refactor due to code formatting * Close #12437, refactor: RIDE_MODE_* to strong enums Resolved comments * chore: Formatting correction. * Use EnumsToFlags constexpr * refactor: resolved comments added newline at the end of file * refactor: Change case stack to default in Switch Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2020-09-28 15:09:59 +02:00
if (ride->mode == static_cast<RideMode>(i))
Move available ride modes to RTD; ride mode cleanup
2020-04-25 15:29:18 +02:00
checkedIndex = numAvailableModes;
numAvailableModes++;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Move available ride modes to RTD; ride mode cleanup
2020-04-25 15:29:18 +02:00
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowTextCustomWidth(
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
{ w->windowPos.x + dropdownWidget->left, w->windowPos.y + dropdownWidget->top }, dropdownWidget->height() + 1,
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
w->colours[1], 0, Dropdown::Flag::StayOpen, numAvailableModes, widget->right - dropdownWidget->left);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Move available ride modes to RTD; ride mode cleanup
2020-04-25 15:29:18 +02:00
if (checkedIndex != -1)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetChecked(checkedIndex, true);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
finish operating tab on ride window
2014-09-09 18:17:08 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B15C0
finish operating tab on ride window
2014-09-09 18:17:08 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_load_dropdown(rct_window* w, rct_widget* widget)
finish operating tab on ride window
2014-09-09 18:17:08 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
finish operating tab on ride window
2014-09-09 18:17:08 +02:00
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto dropdownWidget = widget - 1;
for (auto i = 0; i < 5; i++)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[i] = VehicleLoadNames[i];
}
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowTextCustomWidth(
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
{ w->windowPos.x + dropdownWidget->left, w->windowPos.y + dropdownWidget->top }, dropdownWidget->height() + 1,
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
w->colours[1], 0, Dropdown::Flag::StayOpen, 5, widget->right - dropdownWidget->left);
finish operating tab on ride window
2014-09-09 18:17:08 +02:00
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetChecked(ride->depart_flags & RIDE_DEPART_WAIT_FOR_LOAD_MASK, true);
finish operating tab on ride window
2014-09-09 18:17:08 +02:00
}
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B10A7
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_operating_mouseup(rct_window* w, rct_widgetindex widgetIndex)
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_CLOSE:
window_close(w);
break;
case WIDX_TAB_1:
case WIDX_TAB_2:
case WIDX_TAB_3:
case WIDX_TAB_4:
case WIDX_TAB_5:
case WIDX_TAB_6:
case WIDX_TAB_7:
case WIDX_TAB_8:
case WIDX_TAB_9:
case WIDX_TAB_10:
window_ride_set_page(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_LOAD_CHECKBOX:
Add RideSetSettingAction Use game action for calling Use correct error titles for operation mode changes
2019-02-22 11:13:08 +01:00
set_operating_setting(w->number, RideSetSetting::Departure, ride->depart_flags ^ RIDE_DEPART_WAIT_FOR_LOAD);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX:
set_operating_setting(
Add RideSetSettingAction Use game action for calling Use correct error titles for operation mode changes
2019-02-22 11:13:08 +01:00
w->number, RideSetSetting::Departure, ride->depart_flags ^ RIDE_DEPART_LEAVE_WHEN_ANOTHER_ARRIVES);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_MINIMUM_LENGTH_CHECKBOX:
Add RideSetSettingAction Use game action for calling Use correct error titles for operation mode changes
2019-02-22 11:13:08 +01:00
set_operating_setting(
w->number, RideSetSetting::Departure, ride->depart_flags ^ RIDE_DEPART_WAIT_FOR_MINIMUM_LENGTH);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_MAXIMUM_LENGTH_CHECKBOX:
Add RideSetSettingAction Use game action for calling Use correct error titles for operation mode changes
2019-02-22 11:13:08 +01:00
set_operating_setting(
w->number, RideSetSetting::Departure, ride->depart_flags ^ RIDE_DEPART_WAIT_FOR_MAXIMUM_LENGTH);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_SYNCHRONISE_WITH_ADJACENT_STATIONS_CHECKBOX:
set_operating_setting(
Add RideSetSettingAction Use game action for calling Use correct error titles for operation mode changes
2019-02-22 11:13:08 +01:00
w->number, RideSetSetting::Departure, ride->depart_flags ^ RIDE_DEPART_SYNCHRONISE_WITH_ADJACENT_STATIONS);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B1715
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_operating_resize(rct_window* w)
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_set_resize(w, 316, 186, 316, 186);
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B10F4
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_operating_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
uint8_t upper_bound, lower_bound;
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_MODE_TWEAK_INCREASE:
window_ride_mode_tweak_increase(w);
break;
case WIDX_MODE_TWEAK_DECREASE:
window_ride_mode_tweak_decrease(w);
break;
case WIDX_LIFT_HILL_SPEED_INCREASE:
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor()
2021-02-24 14:02:58 +01:00
upper_bound = gCheatsFastLiftHill ? 255 : ride->GetRideTypeDescriptor().LiftData.maximum_speed;
lower_bound = gCheatsFastLiftHill ? 0 : ride->GetRideTypeDescriptor().LiftData.minimum_speed;
clang-format UI windows
2018-06-22 23:21:44 +02:00
set_operating_setting(
Add RideSetSettingAction Use game action for calling Use correct error titles for operation mode changes
2019-02-22 11:13:08 +01:00
w->number, RideSetSetting::LiftHillSpeed,
Remove Math::Clamp in favour of std::clamp
2018-08-12 13:50:40 +02:00
std::clamp<int16_t>(ride->lift_hill_speed + 1, lower_bound, upper_bound));
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_LIFT_HILL_SPEED_DECREASE:
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor()
2021-02-24 14:02:58 +01:00
upper_bound = gCheatsFastLiftHill ? 255 : ride->GetRideTypeDescriptor().LiftData.maximum_speed;
lower_bound = gCheatsFastLiftHill ? 0 : ride->GetRideTypeDescriptor().LiftData.minimum_speed;
clang-format UI windows
2018-06-22 23:21:44 +02:00
set_operating_setting(
Add RideSetSettingAction Use game action for calling Use correct error titles for operation mode changes
2019-02-22 11:13:08 +01:00
w->number, RideSetSetting::LiftHillSpeed,
Remove Math::Clamp in favour of std::clamp
2018-08-12 13:50:40 +02:00
std::clamp<int16_t>(ride->lift_hill_speed - 1, lower_bound, upper_bound));
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_MINIMUM_LENGTH_INCREASE:
upper_bound = 250;
lower_bound = 0;
set_operating_setting(
Add RideSetSettingAction Use game action for calling Use correct error titles for operation mode changes
2019-02-22 11:13:08 +01:00
w->number, RideSetSetting::MinWaitingTime,
Remove Math::Clamp in favour of std::clamp
2018-08-12 13:50:40 +02:00
std::clamp<int16_t>(ride->min_waiting_time + 1, lower_bound, upper_bound));
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_MINIMUM_LENGTH_DECREASE:
upper_bound = 250;
lower_bound = 0;
set_operating_setting(
Add RideSetSettingAction Use game action for calling Use correct error titles for operation mode changes
2019-02-22 11:13:08 +01:00
w->number, RideSetSetting::MinWaitingTime,
Remove Math::Clamp in favour of std::clamp
2018-08-12 13:50:40 +02:00
std::clamp<int16_t>(ride->min_waiting_time - 1, lower_bound, upper_bound));
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_MAXIMUM_LENGTH_INCREASE:
upper_bound = 250;
lower_bound = 0;
set_operating_setting(
Add RideSetSettingAction Use game action for calling Use correct error titles for operation mode changes
2019-02-22 11:13:08 +01:00
w->number, RideSetSetting::MaxWaitingTime,
Remove Math::Clamp in favour of std::clamp
2018-08-12 13:50:40 +02:00
std::clamp<int16_t>(ride->max_waiting_time + 1, lower_bound, upper_bound));
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_MAXIMUM_LENGTH_DECREASE:
upper_bound = 250;
lower_bound = 0;
set_operating_setting(
Add RideSetSettingAction Use game action for calling Use correct error titles for operation mode changes
2019-02-22 11:13:08 +01:00
w->number, RideSetSetting::MaxWaitingTime,
Remove Math::Clamp in favour of std::clamp
2018-08-12 13:50:40 +02:00
std::clamp<int16_t>(ride->max_waiting_time - 1, lower_bound, upper_bound));
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_MODE_DROPDOWN:
window_ride_mode_dropdown(w, widget);
break;
case WIDX_LOAD_DROPDOWN:
window_ride_load_dropdown(w, widget);
break;
case WIDX_OPERATE_NUMBER_OF_CIRCUITS_INCREASE:
upper_bound = gCheatsFastLiftHill ? 255 : 20;
lower_bound = 1;
set_operating_setting(
Add RideSetSettingAction Use game action for calling Use correct error titles for operation mode changes
2019-02-22 11:13:08 +01:00
w->number, RideSetSetting::NumCircuits, std::clamp<int16_t>(ride->num_circuits + 1, lower_bound, upper_bound));
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_OPERATE_NUMBER_OF_CIRCUITS_DECREASE:
upper_bound = gCheatsFastLiftHill ? 255 : 20;
lower_bound = 1;
set_operating_setting(
Add RideSetSettingAction Use game action for calling Use correct error titles for operation mode changes
2019-02-22 11:13:08 +01:00
w->number, RideSetSetting::NumCircuits, std::clamp<int16_t>(ride->num_circuits - 1, lower_bound, upper_bound));
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B1165
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_operating_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (dropdownIndex == -1)
return;
finish operating tab on ride window
2014-09-09 18:17:08 +02:00
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
finish operating tab on ride window
2014-09-09 18:17:08 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_MODE_DROPDOWN:
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
{
Close #12437, refactor: RIDE_MODE_* to strong enums (#12833) * partial refactor: RIDE_MODE_* to strong enums * Close #12437, refactor: RIDE_MODE_* to strong enums * chore: code formatting * refactor: RideMode, change enum names to CamelCase and resolve casting order. * chore: refactor due to code formatting * Close #12437, refactor: RIDE_MODE_* to strong enums Resolved comments * chore: Formatting correction. * Use EnumsToFlags constexpr * refactor: resolved comments added newline at the end of file * refactor: Change case stack to default in Switch Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2020-09-28 15:09:59 +02:00
RideMode rideMode = RideMode::NullMode;
Move available ride modes to RTD; ride mode cleanup
2020-04-25 15:29:18 +02:00
auto availableModes = ride->GetAvailableModes();
auto modeInDropdownIndex = -1;
Close #12437, refactor: RIDE_MODE_* to strong enums (#12833) * partial refactor: RIDE_MODE_* to strong enums * Close #12437, refactor: RIDE_MODE_* to strong enums * chore: code formatting * refactor: RideMode, change enum names to CamelCase and resolve casting order. * chore: refactor due to code formatting * Close #12437, refactor: RIDE_MODE_* to strong enums Resolved comments * chore: Formatting correction. * Use EnumsToFlags constexpr * refactor: resolved comments added newline at the end of file * refactor: Change case stack to default in Switch Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2020-09-28 15:09:59 +02:00
for (RideMode rideModeIndex = RideMode::Normal; rideModeIndex < RideMode::Count; rideModeIndex++)
Move available ride modes to RTD; ride mode cleanup
2020-04-25 15:29:18 +02:00
{
Close #12437, refactor: RIDE_MODE_* to strong enums (#12833) * partial refactor: RIDE_MODE_* to strong enums * Close #12437, refactor: RIDE_MODE_* to strong enums * chore: code formatting * refactor: RideMode, change enum names to CamelCase and resolve casting order. * chore: refactor due to code formatting * Close #12437, refactor: RIDE_MODE_* to strong enums Resolved comments * chore: Formatting correction. * Use EnumsToFlags constexpr * refactor: resolved comments added newline at the end of file * refactor: Change case stack to default in Switch Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2020-09-28 15:09:59 +02:00
if (availableModes & EnumToFlag(rideModeIndex))
Move available ride modes to RTD; ride mode cleanup
2020-04-25 15:29:18 +02:00
{
modeInDropdownIndex++;
if (modeInDropdownIndex == dropdownIndex)
{
rideMode = rideModeIndex;
break;
}
}
}
Close #12437, refactor: RIDE_MODE_* to strong enums (#12833) * partial refactor: RIDE_MODE_* to strong enums * Close #12437, refactor: RIDE_MODE_* to strong enums * chore: code formatting * refactor: RideMode, change enum names to CamelCase and resolve casting order. * chore: refactor due to code formatting * Close #12437, refactor: RIDE_MODE_* to strong enums Resolved comments * chore: Formatting correction. * Use EnumsToFlags constexpr * refactor: resolved comments added newline at the end of file * refactor: Change case stack to default in Switch Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2020-09-28 15:09:59 +02:00
if (rideMode != RideMode::NullMode)
set_operating_setting(w->number, RideSetSetting::Mode, static_cast<uint8_t>(rideMode));
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_LOAD_DROPDOWN:
set_operating_setting(
Add RideSetSettingAction Use game action for calling Use correct error titles for operation mode changes
2019-02-22 11:13:08 +01:00
w->number, RideSetSetting::Departure, (ride->depart_flags & ~RIDE_DEPART_WAIT_FOR_LOAD_MASK) | dropdownIndex);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B178E
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_operating_update(rct_window* w)
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->frame_no++;
window_event_invalidate_call(w);
widget_invalidate(w, WIDX_TAB_3);
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride != nullptr && ride->window_invalidate_flags & RIDE_INVALIDATE_RIDE_OPERATING)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
ride->window_invalidate_flags &= ~RIDE_INVALIDATE_RIDE_OPERATING;
Refactor window_invalidate to use rct_window::Invalidate
2019-06-15 17:20:16 +02:00
w->Invalidate();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B0B30
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_operating_invalidate(rct_window* w)
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_widget* widgets;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_string_id format, caption, tooltip;
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
widgets = window_ride_page_widgets[w->page];
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->widgets != widgets)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->widgets = widgets;
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowInitScrollWidgets(w);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_set_pressed_tab(w);
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
Add nullptr checks for more instances of get_ride (#9819)
2019-08-09 15:20:59 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
finish invalidate event for ride window
2014-09-09 15:16:09 +02:00
Part of #11389: Use formatter class for Ride::FormatNameTo (#12041)
2020-06-25 02:02:08 +02:00
auto ft = Formatter::Common();
ride->FormatNameTo(ft);
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Widget setup
w->pressed_widgets &= ~(
clang-format UI windows
2018-06-22 23:21:44 +02:00
(1ULL << WIDX_LOAD_CHECKBOX) | (1ULL << WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX)
| (1ULL << WIDX_MINIMUM_LENGTH_CHECKBOX) | (1ULL << WIDX_MAXIMUM_LENGTH_CHECKBOX)
| (1ULL << WIDX_SYNCHRONISE_WITH_ADJACENT_STATIONS_CHECKBOX));
finish invalidate event for ride window
2014-09-09 15:16:09 +02:00
Fix #10694: Lift hill speed of the Flying RC cannot be changed
2020-02-22 18:47:33 +01:00
// Sometimes, only one of the alternatives support lift hill pieces. Make sure to check both.
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor()
2021-02-24 14:02:58 +01:00
bool hasAlternativeType = ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_HAS_ALTERNATIVE_TRACK_TYPE);
if (ride->GetRideTypeDescriptor().SupportsTrackPiece(TRACK_LIFT_HILL)
Fix #10694: Lift hill speed of the Flying RC cannot be changed
2020-02-22 18:47:33 +01:00
|| (hasAlternativeType
Make all access to RTD table use the bounds checking function
2021-02-26 10:01:00 +01:00
&& GetRideTypeDescriptor(ride->GetRideTypeDescriptor().AlternateType).SupportsTrackPiece(TRACK_LIFT_HILL)))
Remove residual usages of rideEntry->enabledTrackPieces
2018-03-27 20:40:50 +02:00
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_operating_widgets[WIDX_LIFT_HILL_SPEED_LABEL].type = WindowWidgetType::Label;
window_ride_operating_widgets[WIDX_LIFT_HILL_SPEED].type = WindowWidgetType::Spinner;
window_ride_operating_widgets[WIDX_LIFT_HILL_SPEED_INCREASE].type = WindowWidgetType::Button;
window_ride_operating_widgets[WIDX_LIFT_HILL_SPEED_DECREASE].type = WindowWidgetType::Button;
Part of #11389: Use formatter class for Ride::FormatNameTo (#12041)
2020-06-25 02:02:08 +02:00
ft.Rewind();
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Increment(20);
ft.Add<uint16_t>(ride->lift_hill_speed);
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_operating_widgets[WIDX_LIFT_HILL_SPEED_LABEL].type = WindowWidgetType::Empty;
window_ride_operating_widgets[WIDX_LIFT_HILL_SPEED].type = WindowWidgetType::Empty;
window_ride_operating_widgets[WIDX_LIFT_HILL_SPEED_INCREASE].type = WindowWidgetType::Empty;
window_ride_operating_widgets[WIDX_LIFT_HILL_SPEED_DECREASE].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Number of circuits
Port more functions to Ride struct (#9119)
2019-04-20 22:22:39 +02:00
if (ride->CanHaveMultipleCircuits())
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_operating_widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS_LABEL].type = WindowWidgetType::Label;
window_ride_operating_widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS].type = WindowWidgetType::Spinner;
window_ride_operating_widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS_INCREASE].type = WindowWidgetType::Button;
window_ride_operating_widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS_DECREASE].type = WindowWidgetType::Button;
Part of #11389: Use formatter class for Ride::FormatNameTo (#12041)
2020-06-25 02:02:08 +02:00
ft.Rewind();
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Increment(22);
ft.Add<uint16_t>(ride->num_circuits);
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_operating_widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS_LABEL].type = WindowWidgetType::Empty;
window_ride_operating_widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS].type = WindowWidgetType::Empty;
window_ride_operating_widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS_INCREASE].type = WindowWidgetType::Empty;
window_ride_operating_widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS_DECREASE].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Leave if another vehicle arrives at station
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION)
Fix #13046: Simplify block sectioned comparisons (#13049)
2020-10-01 14:06:28 +02:00
&& ride->num_vehicles > 1 && !ride->IsBlockSectioned())
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_operating_widgets[WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX].type = WindowWidgetType::Checkbox;
clang-format UI windows
2018-06-22 23:21:44 +02:00
window_ride_operating_widgets[WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX].tooltip
= STR_LEAVE_IF_ANOTHER_VEHICLE_ARRIVES_TIP;
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor()
2021-02-24 14:02:58 +01:00
window_ride_operating_widgets[WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX].text = ride->GetRideTypeDescriptor()
Move naming convention to RTD (#11319)
2020-04-18 12:12:07 +02:00
.NameConvention.vehicle
Close #12438: Refactor RIDE_COMPONENT_TYPE to use strong enum (#13456) * Part of #12438 Changed RIDE_COMPONENT_TYPE to enum class (1/3) Changed the enum RIDE_COMPONENT_TYPE to be enum class in RideData.h. Shortened the enumerators. And fixed I split the changes I did into 3 commits because the enum is used in a total of 85 different files where I just replace the single line where they occur. The changes in those 85 files are analogous to my change in line 328 in RideData.h in this commit. * Part of #12438 changed all RIDE_COMPONENT_TYPE enumerators appearances (2/3) Changed every appearance of the old RIDE_COMPONENT_TYPE enumerators to the changed enumerators from last commit. * Part of #12438 (3/3) Used EnumValue() wherever a field or variable of the type RideComponentType was used as an index. Havent checked if anything from these 3 commits on this branch got codestyle issues * Part of #12438 used clang-format * Closes #12438 Added Accessor function for RideComponentName Added Accessor function GetRideComponentName to RideData. to replace the use RideComponentNames[EnumValue(RideComponentType type)] * Close #12438 moving GetRideComponentName to RideData Headerfile Moved GetRideComponentName to RideData Headerfile since thats where it should be.
2020-11-26 19:23:47 +01:00
== RideComponentType::Boat
Enforce not breaking before assignments and function names Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-21 11:50:45 +02:00
? STR_LEAVE_IF_ANOTHER_BOAT_ARRIVES
: STR_LEAVE_IF_ANOTHER_TRAIN_ARRIVES;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_operating_widgets[WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Synchronise with adjacent stations
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_CAN_SYNCHRONISE_ADJACENT_STATIONS))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_operating_widgets[WIDX_SYNCHRONISE_WITH_ADJACENT_STATIONS_CHECKBOX].type = WindowWidgetType::Checkbox;
clang-format UI windows
2018-06-22 23:21:44 +02:00
window_ride_operating_widgets[WIDX_SYNCHRONISE_WITH_ADJACENT_STATIONS_CHECKBOX].image
= STR_SYNCHRONISE_WITH_ADJACENT_STATIONS;
window_ride_operating_widgets[WIDX_SYNCHRONISE_WITH_ADJACENT_STATIONS_CHECKBOX].tooltip
= STR_SYNCHRONISE_WITH_ADJACENT_STATIONS_TIP;
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_operating_widgets[WIDX_SYNCHRONISE_WITH_ADJACENT_STATIONS_CHECKBOX].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Mode
Close #12437, refactor: RIDE_MODE_* to strong enums (#12833) * partial refactor: RIDE_MODE_* to strong enums * Close #12437, refactor: RIDE_MODE_* to strong enums * chore: code formatting * refactor: RideMode, change enum names to CamelCase and resolve casting order. * chore: refactor due to code formatting * Close #12437, refactor: RIDE_MODE_* to strong enums Resolved comments * chore: Formatting correction. * Use EnumsToFlags constexpr * refactor: resolved comments added newline at the end of file * refactor: Change case stack to default in Switch Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2020-09-28 15:09:59 +02:00
window_ride_operating_widgets[WIDX_MODE].text = RideModeNames[static_cast<int>(ride->mode)];
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Waiting
window_ride_operating_widgets[WIDX_LOAD].text = VehicleLoadNames[(ride->depart_flags & RIDE_DEPART_WAIT_FOR_LOAD_MASK)];
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_HAS_LOAD_OPTIONS))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_operating_widgets[WIDX_LOAD_CHECKBOX].type = WindowWidgetType::Checkbox;
window_ride_operating_widgets[WIDX_LOAD].type = WindowWidgetType::DropdownMenu;
window_ride_operating_widgets[WIDX_LOAD_DROPDOWN].type = WindowWidgetType::Button;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_operating_widgets[WIDX_MINIMUM_LENGTH_CHECKBOX].type = WindowWidgetType::Checkbox;
window_ride_operating_widgets[WIDX_MINIMUM_LENGTH].type = WindowWidgetType::Spinner;
window_ride_operating_widgets[WIDX_MINIMUM_LENGTH_INCREASE].type = WindowWidgetType::Button;
window_ride_operating_widgets[WIDX_MINIMUM_LENGTH_DECREASE].type = WindowWidgetType::Button;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_operating_widgets[WIDX_MAXIMUM_LENGTH_CHECKBOX].type = WindowWidgetType::Checkbox;
window_ride_operating_widgets[WIDX_MAXIMUM_LENGTH].type = WindowWidgetType::Spinner;
window_ride_operating_widgets[WIDX_MAXIMUM_LENGTH_INCREASE].type = WindowWidgetType::Button;
window_ride_operating_widgets[WIDX_MAXIMUM_LENGTH_DECREASE].type = WindowWidgetType::Button;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Part of #11389: Use formatter class for Ride::FormatNameTo (#12041)
2020-06-25 02:02:08 +02:00
ft.Rewind();
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Increment(10);
ft.Add<rct_string_id>(STR_FORMAT_SECONDS);
ft.Add<uint16_t>(ride->min_waiting_time);
ft.Add<rct_string_id>(STR_FORMAT_SECONDS);
ft.Add<uint16_t>(ride->max_waiting_time);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (ride->depart_flags & RIDE_DEPART_WAIT_FOR_LOAD)
w->pressed_widgets |= (1 << WIDX_LOAD_CHECKBOX);
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_operating_widgets[WIDX_LOAD_CHECKBOX].type = WindowWidgetType::Empty;
window_ride_operating_widgets[WIDX_LOAD].type = WindowWidgetType::Empty;
window_ride_operating_widgets[WIDX_LOAD_DROPDOWN].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_operating_widgets[WIDX_MINIMUM_LENGTH_CHECKBOX].type = WindowWidgetType::Empty;
window_ride_operating_widgets[WIDX_MINIMUM_LENGTH].type = WindowWidgetType::Empty;
window_ride_operating_widgets[WIDX_MINIMUM_LENGTH_INCREASE].type = WindowWidgetType::Empty;
window_ride_operating_widgets[WIDX_MINIMUM_LENGTH_DECREASE].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_operating_widgets[WIDX_MAXIMUM_LENGTH_CHECKBOX].type = WindowWidgetType::Empty;
window_ride_operating_widgets[WIDX_MAXIMUM_LENGTH].type = WindowWidgetType::Empty;
window_ride_operating_widgets[WIDX_MAXIMUM_LENGTH_INCREASE].type = WindowWidgetType::Empty;
window_ride_operating_widgets[WIDX_MAXIMUM_LENGTH_DECREASE].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
if (ride->depart_flags & RIDE_DEPART_LEAVE_WHEN_ANOTHER_ARRIVES)
w->pressed_widgets |= (1 << WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX);
if (ride->depart_flags & RIDE_DEPART_SYNCHRONISE_WITH_ADJACENT_STATIONS)
w->pressed_widgets |= (1 << WIDX_SYNCHRONISE_WITH_ADJACENT_STATIONS_CHECKBOX);
if (ride->depart_flags & RIDE_DEPART_WAIT_FOR_MINIMUM_LENGTH)
w->pressed_widgets |= (1 << WIDX_MINIMUM_LENGTH_CHECKBOX);
if (ride->depart_flags & RIDE_DEPART_WAIT_FOR_MAXIMUM_LENGTH)
w->pressed_widgets |= (1 << WIDX_MAXIMUM_LENGTH_CHECKBOX);
// Mode specific functionality
Part of #11389: Use formatter class for Ride::FormatNameTo (#12041)
2020-06-25 02:02:08 +02:00
ft.Rewind();
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Increment(18);
ft.Add<uint16_t>(ride->operation_option);
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (ride->mode)
{
Close #12437, refactor: RIDE_MODE_* to strong enums (#12833) * partial refactor: RIDE_MODE_* to strong enums * Close #12437, refactor: RIDE_MODE_* to strong enums * chore: code formatting * refactor: RideMode, change enum names to CamelCase and resolve casting order. * chore: refactor due to code formatting * Close #12437, refactor: RIDE_MODE_* to strong enums Resolved comments * chore: Formatting correction. * Use EnumsToFlags constexpr * refactor: resolved comments added newline at the end of file * refactor: Change case stack to default in Switch Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2020-09-28 15:09:59 +02:00
case RideMode::PoweredLaunchPasstrough:
case RideMode::PoweredLaunch:
case RideMode::UpwardLaunch:
case RideMode::PoweredLaunchBlockSectioned:
Create Rewind method on Formatter
2020-06-03 12:54:39 +02:00
ft.Rewind();
ft.Increment(18);
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Add<uint16_t>((ride->launch_speed * 9) / 4);
clang-format UI windows
2018-06-22 23:21:44 +02:00
format = STR_RIDE_MODE_SPEED_VALUE;
caption = STR_LAUNCH_SPEED;
tooltip = STR_LAUNCH_SPEED_TIP;
break;
Close #12437, refactor: RIDE_MODE_* to strong enums (#12833) * partial refactor: RIDE_MODE_* to strong enums * Close #12437, refactor: RIDE_MODE_* to strong enums * chore: code formatting * refactor: RideMode, change enum names to CamelCase and resolve casting order. * chore: refactor due to code formatting * Close #12437, refactor: RIDE_MODE_* to strong enums Resolved comments * chore: Formatting correction. * Use EnumsToFlags constexpr * refactor: resolved comments added newline at the end of file * refactor: Change case stack to default in Switch Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2020-09-28 15:09:59 +02:00
case RideMode::StationToStation:
Create Rewind method on Formatter
2020-06-03 12:54:39 +02:00
ft.Rewind();
ft.Increment(18);
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Add<uint16_t>((ride->speed * 9) / 4);
clang-format UI windows
2018-06-22 23:21:44 +02:00
format = STR_RIDE_MODE_SPEED_VALUE;
caption = STR_SPEED;
tooltip = STR_SPEED_TIP;
break;
Close #12437, refactor: RIDE_MODE_* to strong enums (#12833) * partial refactor: RIDE_MODE_* to strong enums * Close #12437, refactor: RIDE_MODE_* to strong enums * chore: code formatting * refactor: RideMode, change enum names to CamelCase and resolve casting order. * chore: refactor due to code formatting * Close #12437, refactor: RIDE_MODE_* to strong enums Resolved comments * chore: Formatting correction. * Use EnumsToFlags constexpr * refactor: resolved comments added newline at the end of file * refactor: Change case stack to default in Switch Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2020-09-28 15:09:59 +02:00
case RideMode::Race:
Create Rewind method on Formatter
2020-06-03 12:54:39 +02:00
ft.Rewind();
ft.Increment(18);
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Add<uint16_t>(ride->num_laps);
clang-format UI windows
2018-06-22 23:21:44 +02:00
format = STR_NUMBER_OF_LAPS_VALUE;
caption = STR_NUMBER_OF_LAPS;
tooltip = STR_NUMBER_OF_LAPS_TIP;
break;
Close #12437, refactor: RIDE_MODE_* to strong enums (#12833) * partial refactor: RIDE_MODE_* to strong enums * Close #12437, refactor: RIDE_MODE_* to strong enums * chore: code formatting * refactor: RideMode, change enum names to CamelCase and resolve casting order. * chore: refactor due to code formatting * Close #12437, refactor: RIDE_MODE_* to strong enums Resolved comments * chore: Formatting correction. * Use EnumsToFlags constexpr * refactor: resolved comments added newline at the end of file * refactor: Change case stack to default in Switch Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2020-09-28 15:09:59 +02:00
case RideMode::Dodgems:
clang-format UI windows
2018-06-22 23:21:44 +02:00
format = STR_RIDE_MODE_TIME_LIMIT_VALUE;
caption = STR_TIME_LIMIT;
tooltip = STR_TIME_LIMIT_TIP;
break;
Close #12437, refactor: RIDE_MODE_* to strong enums (#12833) * partial refactor: RIDE_MODE_* to strong enums * Close #12437, refactor: RIDE_MODE_* to strong enums * chore: code formatting * refactor: RideMode, change enum names to CamelCase and resolve casting order. * chore: refactor due to code formatting * Close #12437, refactor: RIDE_MODE_* to strong enums Resolved comments * chore: Formatting correction. * Use EnumsToFlags constexpr * refactor: resolved comments added newline at the end of file * refactor: Change case stack to default in Switch Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2020-09-28 15:09:59 +02:00
case RideMode::Swing:
clang-format UI windows
2018-06-22 23:21:44 +02:00
format = STR_RIDE_MODE_NUMBER_OF_SWINGS_VALUE;
caption = STR_NUMBER_OF_SWINGS;
tooltip = STR_NUMBER_OF_SWINGS_TIP;
break;
Close #12437, refactor: RIDE_MODE_* to strong enums (#12833) * partial refactor: RIDE_MODE_* to strong enums * Close #12437, refactor: RIDE_MODE_* to strong enums * chore: code formatting * refactor: RideMode, change enum names to CamelCase and resolve casting order. * chore: refactor due to code formatting * Close #12437, refactor: RIDE_MODE_* to strong enums Resolved comments * chore: Formatting correction. * Use EnumsToFlags constexpr * refactor: resolved comments added newline at the end of file * refactor: Change case stack to default in Switch Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2020-09-28 15:09:59 +02:00
case RideMode::Rotation:
case RideMode::ForwardRotation:
case RideMode::BackwardRotation:
clang-format UI windows
2018-06-22 23:21:44 +02:00
format = STR_NUMBER_OF_ROTATIONS_VALUE;
caption = STR_NUMBER_OF_ROTATIONS;
tooltip = STR_NUMBER_OF_ROTATIONS_TIP;
break;
default:
format = STR_MAX_PEOPLE_ON_RIDE_VALUE;
caption = STR_MAX_PEOPLE_ON_RIDE;
tooltip = STR_MAX_PEOPLE_ON_RIDE_TIP;
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
if (!ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_NO_VEHICLES))
clang-format UI windows
2018-06-22 23:21:44 +02:00
format = 0;
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (format != 0)
{
if (ride->type == RIDE_TYPE_TWIST)
{
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft = Formatter::Common();
ft.Increment(18);
Remove common format formatter where possible (#13034) * Remove common format formatter where possible Eventually should have it limited to tooltips, window titles and widget args * Remove remaining paint functions using common * Remove misuse of gCommonFormatArgs
2020-09-30 23:42:04 +02:00
ft.Add<uint16_t>(ride->operation_option * 3);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_operating_widgets[WIDX_MODE_TWEAK_LABEL].type = WindowWidgetType::Label;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_operating_widgets[WIDX_MODE_TWEAK_LABEL].text = caption;
window_ride_operating_widgets[WIDX_MODE_TWEAK_LABEL].tooltip = tooltip;
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_operating_widgets[WIDX_MODE_TWEAK].type = WindowWidgetType::Spinner;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_operating_widgets[WIDX_MODE_TWEAK].text = format;
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_operating_widgets[WIDX_MODE_TWEAK_INCREASE].type = WindowWidgetType::Button;
window_ride_operating_widgets[WIDX_MODE_TWEAK_DECREASE].type = WindowWidgetType::Button;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->pressed_widgets &= ~(1 << WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX);
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_operating_widgets[WIDX_MODE_TWEAK_LABEL].type = WindowWidgetType::Empty;
window_ride_operating_widgets[WIDX_MODE_TWEAK].type = WindowWidgetType::Empty;
window_ride_operating_widgets[WIDX_MODE_TWEAK_INCREASE].type = WindowWidgetType::Empty;
window_ride_operating_widgets[WIDX_MODE_TWEAK_DECREASE].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
window_ride_anchor_border_widgets(w);
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_10);
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B1001
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_operating_paint(rct_window* w, rct_drawpixelinfo* dpi)
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
{
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowDrawWidgets(w, dpi);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_draw_tab_images(dpi, w);
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Horizontal rule between mode settings and depart settings
gfx_fill_rect_inset(
Part of #12097: Use ScreenRect on gfx_fill_rect_inset (1) (#12938) * Part of #12097: Use ScreenRect on gfx_fill_rect_inset (1) Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-09-16 05:02:22 +02:00
dpi,
{ w->windowPos + ScreenCoordsXY{ window_ride_operating_widgets[WIDX_PAGE_BACKGROUND].left + 4, 103 },
w->windowPos + ScreenCoordsXY{ window_ride_operating_widgets[WIDX_PAGE_BACKGROUND].right - 5, 104 } },
w->colours[1], INSET_RECT_FLAG_BORDER_INSET);
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Number of block sections
Fix #13046: Simplify block sectioned comparisons (#13049)
2020-10-01 14:06:28 +02:00
if (ride->IsBlockSectioned())
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto blockSections = ride->num_block_brakes + ride->num_stations;
clang-format UI windows
2018-06-22 23:21:44 +02:00
gfx_draw_string_left(
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
dpi, STR_BLOCK_SECTIONS, &blockSections, COLOUR_BLACK,
Close #12437, refactor: RIDE_MODE_* to strong enums (#12833) * partial refactor: RIDE_MODE_* to strong enums * Close #12437, refactor: RIDE_MODE_* to strong enums * chore: code formatting * refactor: RideMode, change enum names to CamelCase and resolve casting order. * chore: refactor due to code formatting * Close #12437, refactor: RIDE_MODE_* to strong enums Resolved comments * chore: Formatting correction. * Use EnumsToFlags constexpr * refactor: resolved comments added newline at the end of file * refactor: Change case stack to default in Switch Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2020-09-28 15:09:59 +02:00
w->windowPos + ScreenCoordsXY{ 21, ride->mode == RideMode::PoweredLaunchBlockSectioned ? 89 : 61 });
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
start implementing operating tab on ride window
2014-09-09 02:12:32 +02:00
}
#pragma endregion
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
#pragma region Maintenance
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B1AE4
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_locate_mechanic(rct_window* w)
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
{
Add nullptr checks for more instances of get_ride (#9819)
2019-08-09 15:20:59 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
implement find mechanic in ride window
2014-11-04 20:33:17 +01:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// First check if there is a mechanic assigned
Add nullptr checks for more instances of get_ride (#9819)
2019-08-09 15:20:59 +02:00
Peep* mechanic = ride_get_assigned_mechanic(ride);
implement find mechanic in ride window
2014-11-04 20:33:17 +01:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Otherwise find the closest mechanic
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
if (mechanic == nullptr)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
mechanic = ride_find_closest_mechanic(ride, 1);
implement find mechanic in ride window
2014-11-04 20:33:17 +01:00
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
if (mechanic == nullptr)
Explicitly pass formatter arguments to ShowError and family
2020-08-27 00:01:15 +02:00
context_show_error(STR_UNABLE_TO_LOCATE_MECHANIC, STR_NONE, {});
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
else
Move staff and guest windows
2017-10-06 23:21:00 +02:00
{
auto intent = Intent(WC_PEEP);
intent.putExtra(INTENT_EXTRA_PEEP, mechanic);
context_open_intent(&intent);
}
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B7D08
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
*/
Enforce not breaking before assignments and function names Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-21 11:50:45 +02:00
static void window_ride_maintenance_draw_bar(
rct_window* w, rct_drawpixelinfo* dpi, int32_t x, int32_t y, int32_t value, int32_t colour)
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
{
Part of #12097: Use ScreenRect on gfx_fill_rect_inset (1) (#12938) * Part of #12097: Use ScreenRect on gfx_fill_rect_inset (1) Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-09-16 05:02:22 +02:00
ScreenCoordsXY coords{ x, y };
gfx_fill_rect_inset(dpi, { coords, coords + ScreenCoordsXY{ 149, 8 } }, w->colours[1], INSET_RECT_F_30);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (colour & BAR_BLINK)
{
Use remap flags, SPRITE_ID_PALETTE_COLOUR_1 and _2 in many more places
2017-07-20 20:56:29 +02:00
colour &= ~BAR_BLINK;
Use gCurrentRealTimeTicks whenever appropriate.
2018-12-01 17:00:11 +01:00
if (game_is_not_paused() && (gCurrentRealTimeTicks & 8))
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
}
refactor and implement locate mechanic for ride window
2014-09-05 15:24:54 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
value = ((186 * ((value * 2) & 0xFF)) >> 8) & 0xFF;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (value > 2)
{
Part of #12097: Use ScreenRect on gfx_fill_rect_inset (1) (#12938) * Part of #12097: Use ScreenRect on gfx_fill_rect_inset (1) Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-09-16 05:02:22 +02:00
gfx_fill_rect_inset(dpi, { coords + ScreenCoordsXY{ 2, 1 }, coords + ScreenCoordsXY{ value + 1, 7 } }, colour, 0);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B1AAD
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_maintenance_mouseup(rct_window* w, rct_widgetindex widgetIndex)
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_CLOSE:
window_close(w);
break;
case WIDX_TAB_1:
case WIDX_TAB_2:
case WIDX_TAB_3:
case WIDX_TAB_4:
case WIDX_TAB_5:
case WIDX_TAB_6:
case WIDX_TAB_7:
case WIDX_TAB_8:
case WIDX_TAB_9:
case WIDX_TAB_10:
window_ride_set_page(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_LOCATE_MECHANIC:
window_ride_locate_mechanic(w);
break;
case WIDX_REFURBISH_RIDE:
context_open_detail_window(WD_REFURBISH_RIDE, w->number);
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B1D70
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_maintenance_resize(rct_window* w)
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_set_resize(w, 316, 135, 316, 135);
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B1ACE
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_maintenance_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
auto rideEntry = ride->GetRideEntry();
Ensure that get_ride_entry returns NULL on invalid ride entries
2017-10-12 21:07:35 +02:00
if (rideEntry == nullptr)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_widget* dropdownWidget = widget;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t j, num_items;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_INSPECTION_INTERVAL_DROPDOWN:
dropdownWidget--;
for (int32_t i = 0; i < 7; i++)
{
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[i] = RideInspectionIntervalNames[i];
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowTextCustomWidth(
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
{ w->windowPos.x + dropdownWidget->left, w->windowPos.y + dropdownWidget->top }, dropdownWidget->height() + 1,
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
w->colours[1], 0, Dropdown::Flag::StayOpen, 7, widget->right - dropdownWidget->left);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetChecked(ride->inspection_interval, true);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_FORCE_BREAKDOWN:
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
num_items = 1;
clang-format UI windows
2018-06-22 23:21:44 +02:00
for (j = 0; j < MAX_RIDE_TYPES_PER_RIDE_ENTRY; j++)
{
Replace loose usages of 0xFF
2020-10-27 22:24:39 +01:00
if (rideEntry->ride_type[j] != RIDE_TYPE_NULL)
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
}
gDropdownItemsFormat[0] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[0] = STR_DEBUG_FIX_RIDE;
for (int32_t i = 0; i < 8; i++)
{
Replace many C-style casts (#11720)
2020-05-11 14:32:56 +02:00
assert(j < static_cast<int32_t>(std::size(rideEntry->ride_type)));
Make all access to RTD table use the bounds checking function
2021-02-26 10:01:00 +01:00
if (GetRideTypeDescriptor(rideEntry->ride_type[j]).AvailableBreakdowns & static_cast<uint8_t>(1 << i))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Fix #13046: Simplify block sectioned comparisons (#13049)
2020-10-01 14:06:28 +02:00
if (i == BREAKDOWN_BRAKES_FAILURE && ride->IsBlockSectioned())
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
if (ride->num_vehicles != 1)
continue;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
gDropdownItemsFormat[num_items] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[num_items] = RideBreakdownReasonNames[i];
num_items++;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (num_items == 1)
{
Explicitly pass formatter arguments to ShowError and family
2020-08-27 00:01:15 +02:00
context_show_error(STR_DEBUG_NO_BREAKDOWNS_AVAILABLE, STR_NONE, {});
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowText(
Make window_dropdown_show_text() use ScreenCoordsXY
2020-05-01 20:58:36 +02:00
{ w->windowPos.x + dropdownWidget->left, w->windowPos.y + dropdownWidget->top },
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
dropdownWidget->height() + 1, w->colours[1], Dropdown::Flag::StayOpen, num_items);
clang-format UI windows
2018-06-22 23:21:44 +02:00
num_items = 1;
int32_t breakdownReason = ride->breakdown_reason_pending;
if (breakdownReason != BREAKDOWN_NONE && (ride->lifecycle_flags & RIDE_LIFECYCLE_BREAKDOWN_PENDING))
{
for (int32_t i = 0; i < 8; i++)
{
Make all access to RTD table use the bounds checking function
2021-02-26 10:01:00 +01:00
if (GetRideTypeDescriptor(rideEntry->ride_type[j]).AvailableBreakdowns & static_cast<uint8_t>(1 << i))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Fix #13046: Simplify block sectioned comparisons (#13049)
2020-10-01 14:06:28 +02:00
if (i == BREAKDOWN_BRAKES_FAILURE && ride->IsBlockSectioned())
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
if (ride->num_vehicles != 1)
continue;
}
if (i == breakdownReason)
{
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetChecked(num_items, true);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
}
gDropdownItemsFormat[num_items] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[num_items] = RideBreakdownReasonNames[i];
num_items++;
}
}
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if ((ride->lifecycle_flags & RIDE_LIFECYCLE_BREAKDOWN_PENDING) == 0)
{
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetDisabled(0, true);
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B1AD9
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_maintenance_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (dropdownIndex == -1)
return;
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
auto rideEntry = ride->GetRideEntry();
if (rideEntry == nullptr)
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_INSPECTION_INTERVAL_DROPDOWN:
Add RideSetSettingAction Use game action for calling Use correct error titles for operation mode changes
2019-02-22 11:13:08 +01:00
set_operating_setting(w->number, RideSetSetting::InspectionInterval, dropdownIndex);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_FORCE_BREAKDOWN:
if (dropdownIndex == 0)
{
Rename rct_vehicle
2020-01-19 16:53:17 +01:00
Vehicle* vehicle;
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (ride->breakdown_reason_pending)
{
case BREAKDOWN_SAFETY_CUT_OUT:
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK))
break;
for (int32_t i = 0; i < ride->num_vehicles; ++i)
{
Reduce the use of GET_VEHICLE (#12494) * Start removing GET_VEHICLE macro use * Further work * Remove further GET_VEHICLE's * Further removal of GET_VEHICLE * Remove the last of GET_VEHICLE * Fix testpaint * Fix nullptr deref * Make review changes Also swapped in helper functions and used a standard patern for iterating the train cars * Further simplify loops for train cars
2020-07-31 08:48:27 +02:00
for (vehicle = GetEntity<Vehicle>(ride->vehicles[i]); vehicle != nullptr;
vehicle = GetEntity<Vehicle>(vehicle->next_vehicle_on_train))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Create Vehicle::ClearUpdateFlag
2020-06-07 21:57:40 +02:00
vehicle->ClearUpdateFlag(
clang-format UI windows
2018-06-22 23:21:44 +02:00
VEHICLE_UPDATE_FLAG_BROKEN_CAR | VEHICLE_UPDATE_FLAG_ZERO_VELOCITY
| VEHICLE_UPDATE_FLAG_BROKEN_TRAIN);
}
}
break;
case BREAKDOWN_RESTRAINTS_STUCK_CLOSED:
case BREAKDOWN_RESTRAINTS_STUCK_OPEN:
case BREAKDOWN_DOORS_STUCK_CLOSED:
case BREAKDOWN_DOORS_STUCK_OPEN:
Implement GetSprite and use it in a number of places This will eventually replace all of the get_sprite and try_get_sprite calls Further use of GetSprite Use GetSprite in all remaining easy to use functions Correct formatting Rename GetSprite to GetEntity Make suggested changes Remove const to allow for building Fix crashes due to next sprite
2020-06-06 12:32:37 +02:00
vehicle = GetEntity<Vehicle>(ride->vehicles[ride->broken_vehicle]);
Fix null pointers reported by launchpad builders (#12168)
2020-07-09 23:52:14 +02:00
if (vehicle != nullptr)
{
vehicle->ClearUpdateFlag(VEHICLE_UPDATE_FLAG_BROKEN_CAR);
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case BREAKDOWN_VEHICLE_MALFUNCTION:
Implement GetSprite and use it in a number of places This will eventually replace all of the get_sprite and try_get_sprite calls Further use of GetSprite Use GetSprite in all remaining easy to use functions Correct formatting Rename GetSprite to GetEntity Make suggested changes Remove const to allow for building Fix crashes due to next sprite
2020-06-06 12:32:37 +02:00
vehicle = GetEntity<Vehicle>(ride->vehicles[ride->broken_vehicle]);
Fix null pointers reported by launchpad builders (#12168)
2020-07-09 23:52:14 +02:00
if (vehicle != nullptr)
{
vehicle->ClearUpdateFlag(VEHICLE_UPDATE_FLAG_BROKEN_TRAIN);
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
ride->lifecycle_flags &= ~(RIDE_LIFECYCLE_BREAKDOWN_PENDING | RIDE_LIFECYCLE_BROKEN_DOWN);
window_invalidate_by_number(WC_RIDE, w->number);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
break;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (ride->lifecycle_flags
& (RIDE_LIFECYCLE_BREAKDOWN_PENDING | RIDE_LIFECYCLE_BROKEN_DOWN | RIDE_LIFECYCLE_CRASHED))
{
Explicitly pass formatter arguments to ShowError and family
2020-08-27 00:01:15 +02:00
context_show_error(STR_DEBUG_CANT_FORCE_BREAKDOWN, STR_DEBUG_RIDE_ALREADY_BROKEN, {});
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
else if (ride->status == RIDE_STATUS_CLOSED)
{
Explicitly pass formatter arguments to ShowError and family
2020-08-27 00:01:15 +02:00
context_show_error(STR_DEBUG_CANT_FORCE_BREAKDOWN, STR_DEBUG_RIDE_IS_CLOSED, {});
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
int32_t j;
for (j = 0; j < MAX_RIDE_TYPES_PER_RIDE_ENTRY; j++)
{
if (rideEntry->ride_type[j] != RIDE_TYPE_NULL)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
break;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
int32_t i;
int32_t num_items = 1;
for (i = 0; i < BREAKDOWN_COUNT; i++)
{
Replace many C-style casts (#11720)
2020-05-11 14:32:56 +02:00
assert(j < static_cast<int32_t>(std::size(rideEntry->ride_type)));
Make all access to RTD table use the bounds checking function
2021-02-26 10:01:00 +01:00
if (GetRideTypeDescriptor(rideEntry->ride_type[j]).AvailableBreakdowns & static_cast<uint8_t>(1 << i))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Fix #13046: Simplify block sectioned comparisons (#13049)
2020-10-01 14:06:28 +02:00
if (i == BREAKDOWN_BRAKES_FAILURE && ride->IsBlockSectioned())
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
if (ride->num_vehicles != 1)
continue;
}
if (num_items == dropdownIndex)
break;
num_items++;
}
}
Pass Ride* instead of ride_id_t
2019-02-13 00:58:45 +01:00
ride_prepare_breakdown(ride, i);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B1D37
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_maintenance_update(rct_window* w)
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->frame_no++;
window_event_invalidate_call(w);
widget_invalidate(w, WIDX_TAB_4);
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride != nullptr && ride->window_invalidate_flags & RIDE_INVALIDATE_RIDE_MAINTENANCE)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
ride->window_invalidate_flags &= ~RIDE_INVALIDATE_RIDE_MAINTENANCE;
Refactor window_invalidate to use rct_window::Invalidate
2019-06-15 17:20:16 +02:00
w->Invalidate();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B17C8
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_maintenance_invalidate(rct_window* w)
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto widgets = window_ride_page_widgets[w->page];
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->widgets != widgets)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->widgets = widgets;
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowInitScrollWidgets(w);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_set_pressed_tab(w);
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Fix openrct2ui errors
2019-07-21 02:28:33 +02:00
Part of #11389: Use formatter class for Ride::FormatNameTo (#12041)
2020-06-25 02:02:08 +02:00
auto ft = Formatter::Common();
ride->FormatNameTo(ft);
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_maintenance_widgets[WIDX_INSPECTION_INTERVAL].text = RideInspectionIntervalNames[ride->inspection_interval];
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_anchor_border_widgets(w);
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_10);
Can now force ride breakdowns
2015-06-10 02:18:04 +02:00
Add button to refurbish ride Add a button to refurbish the selected ride. The cost for this is 35% of the build price and may only be done if the ride is closed and empty.
2018-03-29 11:17:54 +02:00
if (gConfigGeneral.debugging_tools && network_get_mode() == NETWORK_MODE_NONE)
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_maintenance_widgets[WIDX_FORCE_BREAKDOWN].type = WindowWidgetType::FlatBtn;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Add button to refurbish ride Add a button to refurbish the selected ride. The cost for this is 35% of the build price and may only be done if the ride is closed and empty.
2018-03-29 11:17:54 +02:00
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_maintenance_widgets[WIDX_FORCE_BREAKDOWN].type = WindowWidgetType::Empty;
Add button to refurbish ride Add a button to refurbish the selected ride. The cost for this is 35% of the build price and may only be done if the ride is closed and empty.
2018-03-29 11:17:54 +02:00
}
Can now force ride breakdowns
2015-06-10 02:18:04 +02:00
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor()
2021-02-24 14:02:58 +01:00
if (ride->GetRideTypeDescriptor().AvailableBreakdowns == 0 || !(ride->lifecycle_flags & RIDE_LIFECYCLE_EVER_BEEN_OPENED))
Add button to refurbish ride Add a button to refurbish the selected ride. The cost for this is 35% of the build price and may only be done if the ride is closed and empty.
2018-03-29 11:17:54 +02:00
{
w->disabled_widgets |= (1 << WIDX_REFURBISH_RIDE);
window_ride_maintenance_widgets[WIDX_REFURBISH_RIDE].tooltip = STR_CANT_REFURBISH_NOT_NEEDED;
}
else
{
w->disabled_widgets &= ~(1 << WIDX_REFURBISH_RIDE);
window_ride_maintenance_widgets[WIDX_REFURBISH_RIDE].tooltip = STR_REFURBISH_RIDE_TIP;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B1877
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_maintenance_paint(rct_window* w, rct_drawpixelinfo* dpi)
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
{
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowDrawWidgets(w, dpi);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_draw_tab_images(dpi, w);
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Locate mechanic button image
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_widget* widget = &window_ride_maintenance_widgets[WIDX_LOCATE_MECHANIC];
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
auto screenCoords = w->windowPos + ScreenCoordsXY{ widget->left, widget->top };
gfx_draw_sprite(
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
dpi, (gStaffMechanicColour << 24) | IMAGE_TYPE_REMAP | IMAGE_TYPE_REMAP_2_PLUS | SPR_MECHANIC, screenCoords, 0);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Inspection label
widget = &window_ride_maintenance_widgets[WIDX_INSPECTION_INTERVAL];
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
screenCoords = w->windowPos + ScreenCoordsXY{ 4, widget->top + 1 };
gfx_draw_string_left(dpi, STR_INSPECTION, nullptr, COLOUR_BLACK, screenCoords);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Reliability
widget = &window_ride_maintenance_widgets[WIDX_PAGE_BACKGROUND];
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
screenCoords = w->windowPos + ScreenCoordsXY{ widget->left + 4, widget->top + 4 };
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint16_t reliability = ride->reliability_percentage;
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, STR_RELIABILITY_LABEL_1757, &reliability, COLOUR_BLACK, screenCoords);
window_ride_maintenance_draw_bar(
w, dpi, screenCoords.x + 103, screenCoords.y, std::max<int32_t>(10, reliability), COLOUR_BRIGHT_GREEN);
screenCoords.y += 11;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint16_t downTime = ride->downtime;
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, STR_DOWN_TIME_LABEL_1889, &downTime, COLOUR_BLACK, screenCoords);
window_ride_maintenance_draw_bar(w, dpi, screenCoords.x + 103, screenCoords.y, downTime, COLOUR_BRIGHT_RED);
screenCoords.y += 26;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Last inspection
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint16_t lastInspection = ride->last_inspection;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Use singular form for 1 minute of time or less
rct_string_id stringId;
if (lastInspection <= 1)
stringId = STR_TIME_SINCE_LAST_INSPECTION_MINUTE;
else if (lastInspection <= 240)
stringId = STR_TIME_SINCE_LAST_INSPECTION_MINUTES;
else
stringId = STR_TIME_SINCE_LAST_INSPECTION_MORE_THAN_4_HOURS;
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, stringId, &lastInspection, COLOUR_BLACK, screenCoords);
screenCoords.y += 12;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Last / current breakdown
if (ride->breakdown_reason == BREAKDOWN_NONE)
return;
clang-format UI windows
2018-06-22 23:21:44 +02:00
stringId = (ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN) ? STR_CURRENT_BREAKDOWN : STR_LAST_BREAKDOWN;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_string_id breakdownMessage = RideBreakdownReasonNames[ride->breakdown_reason];
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, stringId, &breakdownMessage, COLOUR_BLACK, screenCoords);
screenCoords.y += 10;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Mechanic status
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)
{
switch (ride->mechanic_status)
{
case RIDE_MECHANIC_STATUS_CALLING:
Refactor peep struct
2019-02-28 20:28:58 +01:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
stringId = STR_NO_MECHANICS_ARE_HIRED_MESSAGE;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Convert SPRITE_LIST to an enum class
2020-06-17 22:42:40 +02:00
for (auto peep : EntityList<Staff>(EntityListId::Peep))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Remove AsGuest and AsStaff duplicated functions
2021-02-21 13:23:31 +01:00
if (peep->IsMechanic())
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
stringId = STR_CALLING_MECHANIC;
break;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Refactor peep struct
2019-02-28 20:28:58 +01:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
case RIDE_MECHANIC_STATUS_HEADING:
stringId = STR_MEHCANIC_IS_HEADING_FOR_THE_RIDE;
break;
case RIDE_MECHANIC_STATUS_FIXING:
case RIDE_MECHANIC_STATUS_HAS_FIXED_STATION_BRAKES:
stringId = STR_MEHCANIC_IS_FIXING_THE_RIDE;
break;
default:
stringId = STR_EMPTY;
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (stringId != STR_EMPTY)
{
if (stringId == STR_CALLING_MECHANIC || stringId == STR_NO_MECHANICS_ARE_HIRED_MESSAGE)
{
Fix #11562 - gfx_draw_string_left_wrapped overload (#12015) I created the overload, replaced remaining calls with the new function and removed the old function.
2020-06-21 11:25:31 +02:00
gfx_draw_string_left_wrapped(dpi, nullptr, screenCoords + ScreenCoordsXY{ 4, 0 }, 280, stringId, COLOUR_BLACK);
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12969: Crash opening ride window with invalid mechanic assigned
2020-09-27 12:36:23 +02:00
auto staff = GetEntity<Staff>(ride->mechanic);
if (staff != nullptr && staff->IsMechanic())
Make more global functions part of rct_peep
2018-04-26 17:15:29 +02:00
{
Remove common format formatter where possible (#13034) * Remove common format formatter where possible Eventually should have it limited to tooltips, window titles and widget args * Remove remaining paint functions using common * Remove misuse of gCommonFormatArgs
2020-09-30 23:42:04 +02:00
auto ft = Formatter();
Fix #12969: Crash opening ride window with invalid mechanic assigned
2020-09-27 12:36:23 +02:00
staff->FormatNameTo(ft);
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left_wrapped(
Remove common format formatter where possible (#13034) * Remove common format formatter where possible Eventually should have it limited to tooltips, window titles and widget args * Remove remaining paint functions using common * Remove misuse of gCommonFormatArgs
2020-09-30 23:42:04 +02:00
dpi, ft.Data(), screenCoords + ScreenCoordsXY{ 4, 0 }, 280, stringId, COLOUR_BLACK);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
}
}
implement maintenance tab on ride window
2014-09-05 03:37:48 +02:00
}
#pragma endregion
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
#pragma region Colour
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static uint32_t window_ride_get_colour_button_image(int32_t colour)
implement more of ride window colour invalidate
2014-09-11 00:05:20 +02:00
{
Use remap flags, SPRITE_ID_PALETTE_COLOUR_1 and _2 in many more places
2017-07-20 20:56:29 +02:00
return IMAGE_TYPE_TRANSPARENT | SPRITE_ID_PALETTE_COLOUR_1(colour) | SPR_PALETTE_BTN;
implement more of ride window colour invalidate
2014-09-11 00:05:20 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
static int32_t window_ride_has_track_colour(Ride* ride, int32_t trackColour)
implement more of ride window colour invalidate
2014-09-11 00:05:20 +02:00
{
Implement surfaces, edges and stations as objects
2018-12-05 21:33:45 +01:00
// Get station flags (shops don't have them)
auto stationObjFlags = 0;
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
if (!ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP))
Implement surfaces, edges and stations as objects
2018-12-05 21:33:45 +01:00
{
auto stationObj = ride_get_station_object(ride);
if (stationObj != nullptr)
{
stationObjFlags = stationObj->Flags;
}
}
implement more of ride window colour invalidate
2014-09-11 00:05:20 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (trackColour)
{
case 0:
Implement surfaces, edges and stations as objects
2018-12-05 21:33:45 +01:00
return (stationObjFlags & STATION_OBJECT_FLAGS::HAS_PRIMARY_COLOUR)
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
|| ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN);
clang-format UI windows
2018-06-22 23:21:44 +02:00
case 1:
Implement surfaces, edges and stations as objects
2018-12-05 21:33:45 +01:00
return (stationObjFlags & STATION_OBJECT_FLAGS::HAS_SECONDARY_COLOUR)
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
|| ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_ADDITIONAL);
clang-format UI windows
2018-06-22 23:21:44 +02:00
case 2:
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
return ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_SUPPORTS);
clang-format UI windows
2018-06-22 23:21:44 +02:00
default:
return 0;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement more of ride window colour invalidate
2014-09-11 00:05:20 +02:00
}
Use ScreenCoordsXY on windows/Ride.cpp
2020-05-01 17:58:10 +02:00
static void window_ride_set_track_colour_scheme(rct_window* w, const ScreenCoordsXY& screenPos)
finish colour tab for ride window
2014-09-18 01:31:20 +02:00
{
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
auto newColourScheme = static_cast<uint8_t>(w->ride_colour);
Refactor viewport interaction flags and add plugin API
2021-02-10 02:06:18 +01:00
auto info = get_map_coordinates_from_pos(screenPos, EnumsToFlags(ViewportInteractionItem::Ride));
finish colour tab for ride window
2014-09-18 01:31:20 +02:00
Close #13624: Refactor ViewportInteractionItem to use strong enum (#13657) * Closes #13624: Refactor ViewportInteractionItem to use strong enum
2020-12-29 19:09:15 +01:00
if (info.SpriteType != ViewportInteractionItem::Ride)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
if (info.Element->GetType() != TILE_ELEMENT_TYPE_TRACK)
Fix #8047: Crash when using the paint tool and you click an entrance/exit
2018-10-09 22:15:12 +02:00
return;
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
if (info.Element->AsTrack()->GetRideIndex() != w->number)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
if (info.Element->AsTrack()->GetColourScheme() == newColourScheme)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
finish colour tab for ride window
2014-09-18 01:31:20 +02:00
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
auto z = info.Element->GetBaseZ();
auto direction = info.Element->GetDirection();
Fix review issues and formatting
2019-07-07 03:53:59 +02:00
auto gameAction = RideSetColourSchemeAction(
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
CoordsXYZD{ info.Loc, z, static_cast<Direction>(direction) }, info.Element->AsTrack()->GetTrackType(), newColourScheme);
Fix #3832: Track piece colour scheme paint not network-safe
2018-12-11 22:17:52 +01:00
GameActions::Execute(&gameAction);
finish colour tab for ride window
2014-09-18 01:31:20 +02:00
}
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B04FA
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_colour_close(rct_window* w)
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (!(input_test_flag(INPUT_FLAG_TOOL_ACTIVE)))
return;
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (gCurrentToolWidget.window_classification != w->classification)
return;
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (gCurrentToolWidget.window_number != w->number)
return;
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
tool_cancel();
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B02A1
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_colour_mouseup(rct_window* w, rct_widgetindex widgetIndex)
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_CLOSE:
window_close(w);
break;
case WIDX_TAB_1:
case WIDX_TAB_2:
case WIDX_TAB_3:
case WIDX_TAB_4:
case WIDX_TAB_5:
case WIDX_TAB_6:
case WIDX_TAB_7:
case WIDX_TAB_8:
case WIDX_TAB_9:
case WIDX_TAB_10:
window_ride_set_page(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_PAINT_INDIVIDUAL_AREA:
Close #13625: Refactor TOOL_IDX to use strong enum
2020-12-23 05:11:15 +01:00
tool_set(w, WIDX_PAINT_INDIVIDUAL_AREA, Tool::PaintDown);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B0AB6
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_colour_resize(rct_window* w)
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_set_resize(w, 316, 207, 316, 207);
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B02C6
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_colour_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
implement dropdowns for window ride colour tab
2014-09-14 19:43:36 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
vehicle_colour vehicleColour;
Implement surfaces, edges and stations as objects
2018-12-05 21:33:45 +01:00
int32_t i, numItems;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_string_id stringId;
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
auto rideEntry = ride->GetRideEntry();
if (rideEntry == nullptr)
return;
auto colourSchemeIndex = w->ride_colour;
auto dropdownWidget = widget - 1;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_TRACK_COLOUR_SCHEME_DROPDOWN:
for (i = 0; i < NUM_COLOUR_SCHEMES; i++)
{
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[i] = ColourSchemeNames[i];
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowTextCustomWidth(
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
{ w->windowPos.x + dropdownWidget->left, w->windowPos.y + dropdownWidget->top }, dropdownWidget->height() + 1,
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
w->colours[1], 0, Dropdown::Flag::StayOpen, 4, widget->right - dropdownWidget->left);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetChecked(colourSchemeIndex, true);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_TRACK_MAIN_COLOUR:
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowColour(w, widget, w->colours[1], ride->track_colour[colourSchemeIndex].main);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_TRACK_ADDITIONAL_COLOUR:
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowColour(w, widget, w->colours[1], ride->track_colour[colourSchemeIndex].additional);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_TRACK_SUPPORT_COLOUR:
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowColour(w, widget, w->colours[1], ride->track_colour[colourSchemeIndex].supports);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_MAZE_STYLE_DROPDOWN:
for (i = 0; i < 4; i++)
{
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[i] = MazeOptions[i].text;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowTextCustomWidth(
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
{ w->windowPos.x + dropdownWidget->left, w->windowPos.y + dropdownWidget->top }, dropdownWidget->height() + 1,
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
w->colours[1], 0, Dropdown::Flag::StayOpen, 4, widget->right - dropdownWidget->left);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetChecked(ride->track_colour[colourSchemeIndex].supports, true);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_ENTRANCE_STYLE_DROPDOWN:
Implement surfaces, edges and stations as objects
2018-12-05 21:33:45 +01:00
{
auto ddIndex = 0;
auto& objManager = GetContext()->GetObjectManager();
for (i = 0; i < MAX_STATION_OBJECTS; i++)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
refactor: ObjectType to use strong enum enum renaming complete
2020-11-09 10:36:37 +01:00
auto stationObj = static_cast<StationObject*>(objManager.GetLoadedObject(ObjectType::Station, i));
Implement surfaces, edges and stations as objects
2018-12-05 21:33:45 +01:00
if (stationObj != nullptr)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Implement surfaces, edges and stations as objects
2018-12-05 21:33:45 +01:00
gDropdownItemsFormat[ddIndex] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[ddIndex] = stationObj->NameStringId;
if (ride->entrance_style == i)
{
gDropdownItemsFormat[ddIndex] = STR_DROPDOWN_MENU_LABEL_SELECTED;
}
ddIndex++;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowTextCustomWidth(
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
{ w->windowPos.x + dropdownWidget->left, w->windowPos.y + dropdownWidget->top }, dropdownWidget->height() + 1,
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
w->colours[1], 0, Dropdown::Flag::StayOpen, ddIndex, widget->right - dropdownWidget->left);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Implement surfaces, edges and stations as objects
2018-12-05 21:33:45 +01:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_VEHICLE_COLOUR_SCHEME_DROPDOWN:
for (i = 0; i < 3; i++)
{
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor()
2021-02-24 14:02:58 +01:00
gDropdownItemsArgs[i] = (GetRideComponentName(ride->GetRideTypeDescriptor().NameConvention.vehicle).singular
Move naming convention to RTD (#11319)
2020-04-18 12:12:07 +02:00
<< 16)
Enforce not breaking before assignments and function names Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-21 11:50:45 +02:00
| VehicleColourSchemeNames[i];
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowTextCustomWidth(
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
{ w->windowPos.x + dropdownWidget->left, w->windowPos.y + dropdownWidget->top }, dropdownWidget->height() + 1,
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
w->colours[1], 0, Dropdown::Flag::StayOpen, rideEntry->max_cars_in_train > 1 ? 3 : 2,
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
widget->right - dropdownWidget->left);
clang-format UI windows
2018-06-22 23:21:44 +02:00
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetChecked(ride->colour_scheme_type & 3, true);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_VEHICLE_COLOUR_INDEX_DROPDOWN:
numItems = ride->num_vehicles;
if ((ride->colour_scheme_type & 3) != VEHICLE_COLOUR_SCHEME_PER_TRAIN)
numItems = ride->num_cars_per_train;
stringId = (ride->colour_scheme_type & 3) == VEHICLE_COLOUR_SCHEME_PER_TRAIN ? STR_RIDE_COLOUR_TRAIN_OPTION
: STR_RIDE_COLOUR_VEHICLE_OPTION;
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
for (i = 0; i < std::min(numItems, Dropdown::ItemsMaxSize); i++)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
Use named casts on openrct2-ui/windows (#11136)
2020-04-18 13:32:48 +02:00
gDropdownItemsArgs[i] = (static_cast<int64_t>(i + 1) << 32)
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor()
2021-02-24 14:02:58 +01:00
| ((GetRideComponentName(ride->GetRideTypeDescriptor().NameConvention.vehicle).capitalised) << 16)
Move naming convention to RTD (#11319)
2020-04-18 12:12:07 +02:00
| stringId;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowTextCustomWidth(
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
{ w->windowPos.x + dropdownWidget->left, w->windowPos.y + dropdownWidget->top }, dropdownWidget->height() + 1,
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
w->colours[1], 0, Dropdown::Flag::StayOpen, numItems, widget->right - dropdownWidget->left);
clang-format UI windows
2018-06-22 23:21:44 +02:00
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetChecked(w->vehicleIndex, true);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_VEHICLE_MAIN_COLOUR:
vehicleColour = ride_get_vehicle_colour(ride, w->vehicleIndex);
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowColour(w, widget, w->colours[1], vehicleColour.main);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_VEHICLE_ADDITIONAL_COLOUR_1:
vehicleColour = ride_get_vehicle_colour(ride, w->vehicleIndex);
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowColour(w, widget, w->colours[1], vehicleColour.additional_1);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_VEHICLE_ADDITIONAL_COLOUR_2:
vehicleColour = ride_get_vehicle_colour(ride, w->vehicleIndex);
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowColour(w, widget, w->colours[1], vehicleColour.additional_2);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement dropdowns for window ride colour tab
2014-09-14 19:43:36 +02:00
}
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B0331
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_colour_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
implement dropdowns for window ride colour tab
2014-09-14 19:43:36 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (dropdownIndex == -1)
return;
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_TRACK_COLOUR_SCHEME_DROPDOWN:
Use named casts on openrct2-ui/windows (#11136)
2020-04-18 13:32:48 +02:00
w->ride_colour = static_cast<uint16_t>(dropdownIndex);
Refactor window_invalidate to use rct_window::Invalidate
2019-06-15 17:20:16 +02:00
w->Invalidate();
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_TRACK_MAIN_COLOUR:
Move Ride Set Appearance into action framework
2019-02-06 12:56:08 +01:00
{
Small refactor to use enum class
2019-02-06 16:05:35 +01:00
auto rideSetAppearanceAction = RideSetAppearanceAction(
w->number, RideSetAppearanceType::TrackColourMain, dropdownIndex, w->ride_colour);
Move Ride Set Appearance into action framework
2019-02-06 12:56:08 +01:00
GameActions::Execute(&rideSetAppearanceAction);
}
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_TRACK_ADDITIONAL_COLOUR:
Move Ride Set Appearance into action framework
2019-02-06 12:56:08 +01:00
{
Small refactor to use enum class
2019-02-06 16:05:35 +01:00
auto rideSetAppearanceAction = RideSetAppearanceAction(
w->number, RideSetAppearanceType::TrackColourAdditional, dropdownIndex, w->ride_colour);
Move Ride Set Appearance into action framework
2019-02-06 12:56:08 +01:00
GameActions::Execute(&rideSetAppearanceAction);
}
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_TRACK_SUPPORT_COLOUR:
Move Ride Set Appearance into action framework
2019-02-06 12:56:08 +01:00
{
Small refactor to use enum class
2019-02-06 16:05:35 +01:00
auto rideSetAppearanceAction = RideSetAppearanceAction(
w->number, RideSetAppearanceType::TrackColourSupports, dropdownIndex, w->ride_colour);
Move Ride Set Appearance into action framework
2019-02-06 12:56:08 +01:00
GameActions::Execute(&rideSetAppearanceAction);
}
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_MAZE_STYLE_DROPDOWN:
Move Ride Set Appearance into action framework
2019-02-06 12:56:08 +01:00
{
Small refactor to use enum class
2019-02-06 16:05:35 +01:00
auto rideSetAppearanceAction = RideSetAppearanceAction(
w->number, RideSetAppearanceType::MazeStyle, dropdownIndex, w->ride_colour);
Move Ride Set Appearance into action framework
2019-02-06 12:56:08 +01:00
GameActions::Execute(&rideSetAppearanceAction);
}
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_ENTRANCE_STYLE_DROPDOWN:
Implement surfaces, edges and stations as objects
2018-12-05 21:33:45 +01:00
{
auto ddIndex = 0;
auto& objManager = GetContext()->GetObjectManager();
for (auto i = 0; i < MAX_STATION_OBJECTS; i++)
{
refactor: ObjectType to use strong enum enum renaming complete
2020-11-09 10:36:37 +01:00
auto stationObj = static_cast<StationObject*>(objManager.GetLoadedObject(ObjectType::Station, i));
Implement surfaces, edges and stations as objects
2018-12-05 21:33:45 +01:00
if (stationObj != nullptr)
{
if (ddIndex == dropdownIndex)
{
Small refactor to use enum class
2019-02-06 16:05:35 +01:00
auto rideSetAppearanceAction = RideSetAppearanceAction(
w->number, RideSetAppearanceType::EntranceStyle, ddIndex, 0);
Move Ride Set Appearance into action framework
2019-02-06 12:56:08 +01:00
GameActions::Execute(&rideSetAppearanceAction);
Implement surfaces, edges and stations as objects
2018-12-05 21:33:45 +01:00
break;
}
ddIndex++;
}
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Implement surfaces, edges and stations as objects
2018-12-05 21:33:45 +01:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_VEHICLE_COLOUR_SCHEME_DROPDOWN:
Move Ride Set Appearance into action framework
2019-02-06 12:56:08 +01:00
{
Small refactor to use enum class
2019-02-06 16:05:35 +01:00
auto rideSetAppearanceAction = RideSetAppearanceAction(
w->number, RideSetAppearanceType::VehicleColourScheme, dropdownIndex, 0);
Move Ride Set Appearance into action framework
2019-02-06 12:56:08 +01:00
GameActions::Execute(&rideSetAppearanceAction);
clang-format UI windows
2018-06-22 23:21:44 +02:00
w->vehicleIndex = 0;
Move Ride Set Appearance into action framework
2019-02-06 12:56:08 +01:00
}
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_VEHICLE_COLOUR_INDEX_DROPDOWN:
w->vehicleIndex = dropdownIndex;
Refactor window_invalidate to use rct_window::Invalidate
2019-06-15 17:20:16 +02:00
w->Invalidate();
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_VEHICLE_MAIN_COLOUR:
Move Ride Set Appearance into action framework
2019-02-06 12:56:08 +01:00
{
Small refactor to use enum class
2019-02-06 16:05:35 +01:00
auto rideSetAppearanceAction = RideSetAppearanceAction(
w->number, RideSetAppearanceType::VehicleColourBody, dropdownIndex, w->vehicleIndex);
Move Ride Set Appearance into action framework
2019-02-06 12:56:08 +01:00
GameActions::Execute(&rideSetAppearanceAction);
}
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_VEHICLE_ADDITIONAL_COLOUR_1:
Move Ride Set Appearance into action framework
2019-02-06 12:56:08 +01:00
{
Small refactor to use enum class
2019-02-06 16:05:35 +01:00
auto rideSetAppearanceAction = RideSetAppearanceAction(
w->number, RideSetAppearanceType::VehicleColourTrim, dropdownIndex, w->vehicleIndex);
Move Ride Set Appearance into action framework
2019-02-06 12:56:08 +01:00
GameActions::Execute(&rideSetAppearanceAction);
}
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_VEHICLE_ADDITIONAL_COLOUR_2:
Move Ride Set Appearance into action framework
2019-02-06 12:56:08 +01:00
{
Small refactor to use enum class
2019-02-06 16:05:35 +01:00
auto rideSetAppearanceAction = RideSetAppearanceAction(
w->number, RideSetAppearanceType::VehicleColourTernary, dropdownIndex, w->vehicleIndex);
Move Ride Set Appearance into action framework
2019-02-06 12:56:08 +01:00
GameActions::Execute(&rideSetAppearanceAction);
}
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement dropdowns for window ride colour tab
2014-09-14 19:43:36 +02:00
}
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B0A8F
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_colour_update(rct_window* w)
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->frame_no++;
window_event_invalidate_call(w);
widget_invalidate(w, WIDX_TAB_5);
widget_invalidate(w, WIDX_VEHICLE_PREVIEW);
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B04EC
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
*/
Prefer const ref to send ScreenCoordsXY over
2020-02-29 03:43:29 +01:00
static void window_ride_colour_tooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
Strip all whitespace
2015-10-20 20:16:30 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (widgetIndex == WIDX_PAINT_INDIVIDUAL_AREA)
Use ScreenCoordsXY on windows/Ride.cpp
2020-05-01 17:58:10 +02:00
window_ride_set_track_colour_scheme(w, screenCoords);
finish colour tab for ride window
2014-09-18 01:31:20 +02:00
}
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B04F3
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
*/
Prefer const ref to send ScreenCoordsXY over
2020-02-29 03:43:29 +01:00
static void window_ride_colour_tooldrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
Strip all whitespace
2015-10-20 20:16:30 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (widgetIndex == WIDX_PAINT_INDIVIDUAL_AREA)
Use ScreenCoordsXY on windows/Ride.cpp
2020-05-01 17:58:10 +02:00
window_ride_set_track_colour_scheme(w, screenCoords);
finish colour tab for ride window
2014-09-18 01:31:20 +02:00
}
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AFB36
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_colour_invalidate(rct_window* w)
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
{
Merge ride track colour arrays into one
2019-01-01 21:33:59 +01:00
TrackColour trackColour;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
vehicle_colour vehicleColour;
Add nullptr checks for more instances of get_ride (#9819)
2019-08-09 15:20:59 +02:00
auto widgets = window_ride_page_widgets[w->page];
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->widgets != widgets)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->widgets = widgets;
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowInitScrollWidgets(w);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
window_ride_set_pressed_tab(w);
Add nullptr checks for more instances of get_ride (#9819)
2019-08-09 15:20:59 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
auto rideEntry = ride->GetRideEntry();
if (rideEntry == nullptr)
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Fix a few more bugs
2019-07-21 13:09:23 +02:00
w->widgets[WIDX_TITLE].text = STR_ARG_16_STRINGID;
Part of #11389: Use formatter class for Ride::FormatNameTo (#12041)
2020-06-25 02:02:08 +02:00
auto ft = Formatter::Common();
ft.Increment(16);
ride->FormatNameTo(ft);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Track colours
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t colourScheme = w->ride_colour;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
trackColour = ride_get_track_colour(ride, colourScheme);
// Maze style
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (ride->type == RIDE_TYPE_MAZE)
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_MAZE_STYLE].type = WindowWidgetType::DropdownMenu;
window_ride_colour_widgets[WIDX_MAZE_STYLE_DROPDOWN].type = WindowWidgetType::Button;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_colour_widgets[WIDX_MAZE_STYLE].text = MazeOptions[trackColour.supports].text;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_MAZE_STYLE].type = WindowWidgetType::Empty;
window_ride_colour_widgets[WIDX_MAZE_STYLE_DROPDOWN].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Track, multiple colour schemes
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_SUPPORTS_MULTIPLE_TRACK_COLOUR))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_TRACK_COLOUR_SCHEME].type = WindowWidgetType::DropdownMenu;
window_ride_colour_widgets[WIDX_TRACK_COLOUR_SCHEME_DROPDOWN].type = WindowWidgetType::Button;
window_ride_colour_widgets[WIDX_PAINT_INDIVIDUAL_AREA].type = WindowWidgetType::FlatBtn;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_TRACK_COLOUR_SCHEME].type = WindowWidgetType::Empty;
window_ride_colour_widgets[WIDX_TRACK_COLOUR_SCHEME_DROPDOWN].type = WindowWidgetType::Empty;
window_ride_colour_widgets[WIDX_PAINT_INDIVIDUAL_AREA].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Track main colour
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (window_ride_has_track_colour(ride, 0))
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_TRACK_MAIN_COLOUR].type = WindowWidgetType::ColourBtn;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_colour_widgets[WIDX_TRACK_MAIN_COLOUR].image = window_ride_get_colour_button_image(trackColour.main);
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_TRACK_MAIN_COLOUR].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Track additional colour
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (window_ride_has_track_colour(ride, 1))
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_TRACK_ADDITIONAL_COLOUR].type = WindowWidgetType::ColourBtn;
Enforce not breaking before assignments and function names Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-21 11:50:45 +02:00
window_ride_colour_widgets[WIDX_TRACK_ADDITIONAL_COLOUR].image = window_ride_get_colour_button_image(
trackColour.additional);
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_TRACK_ADDITIONAL_COLOUR].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Track supports colour
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (window_ride_has_track_colour(ride, 2) && ride->type != RIDE_TYPE_MAZE)
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_TRACK_SUPPORT_COLOUR].type = WindowWidgetType::ColourBtn;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_colour_widgets[WIDX_TRACK_SUPPORT_COLOUR].image = window_ride_get_colour_button_image(trackColour.supports);
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_TRACK_SUPPORT_COLOUR].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Track preview
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
if (ride->GetRideTypeDescriptor().HasFlag(
clang-format UI windows
2018-06-22 23:21:44 +02:00
RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN | RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_ADDITIONAL
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
| RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_SUPPORTS))
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_TRACK_PREVIEW].type = WindowWidgetType::Spinner;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
else
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_TRACK_PREVIEW].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Entrance style
Replace loose flag checking with helper function
2021-02-25 22:55:06 +01:00
if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_HAS_ENTRANCE_EXIT))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_ENTRANCE_PREVIEW].type = WindowWidgetType::Spinner;
window_ride_colour_widgets[WIDX_ENTRANCE_STYLE].type = WindowWidgetType::DropdownMenu;
window_ride_colour_widgets[WIDX_ENTRANCE_STYLE_DROPDOWN].type = WindowWidgetType::Button;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Implement surfaces, edges and stations as objects
2018-12-05 21:33:45 +01:00
auto stringId = STR_NONE;
auto stationObj = ride_get_station_object(ride);
if (stationObj != nullptr)
{
stringId = stationObj->NameStringId;
}
window_ride_colour_widgets[WIDX_ENTRANCE_STYLE].text = stringId;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_ENTRANCE_PREVIEW].type = WindowWidgetType::Empty;
window_ride_colour_widgets[WIDX_ENTRANCE_STYLE].type = WindowWidgetType::Empty;
window_ride_colour_widgets[WIDX_ENTRANCE_STYLE_DROPDOWN].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Vehicle colours
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
if (!ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_NO_VEHICLES)
&& ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_HAS_VEHICLE_COLOURS))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t vehicleColourSchemeType = ride->colour_scheme_type & 3;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (vehicleColourSchemeType == 0)
Name some window flag aliases
2017-07-28 12:31:49 +02:00
w->vehicleIndex = 0;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Name some window flag aliases
2017-07-28 12:31:49 +02:00
vehicleColour = ride_get_vehicle_colour(ride, w->vehicleIndex);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_VEHICLE_PREVIEW].type = WindowWidgetType::Scroll;
window_ride_colour_widgets[WIDX_VEHICLE_MAIN_COLOUR].type = WindowWidgetType::ColourBtn;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_colour_widgets[WIDX_VEHICLE_MAIN_COLOUR].image = window_ride_get_colour_button_image(vehicleColour.main);
Name and fix vehicle entry and tertiary colour flags
2017-07-20 12:57:37 +02:00
bool allowChangingAdditionalColour1 = false;
bool allowChangingAdditionalColour2 = false;
clang-format UI windows
2018-06-22 23:21:44 +02:00
for (int32_t i = 0; i < ride->num_cars_per_train; i++)
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint8_t vehicleTypeIndex = ride_entry_get_vehicle_at_position(ride->subtype, ride->num_cars_per_train, i);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Clean up vehicle flags (#6058)
2017-07-31 12:27:04 +02:00
if (rideEntry->vehicles[vehicleTypeIndex].flags & VEHICLE_ENTRY_FLAG_ENABLE_ADDITIONAL_COLOUR_1)
Name and fix vehicle entry and tertiary colour flags
2017-07-20 12:57:37 +02:00
{
allowChangingAdditionalColour1 = true;
}
Clean up vehicle flags (#6058)
2017-07-31 12:27:04 +02:00
if (rideEntry->vehicles[vehicleTypeIndex].flags & VEHICLE_ENTRY_FLAG_ENABLE_ADDITIONAL_COLOUR_2)
Name and fix vehicle entry and tertiary colour flags
2017-07-20 12:57:37 +02:00
{
allowChangingAdditionalColour2 = true;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Additional colours
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (allowChangingAdditionalColour1)
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_VEHICLE_ADDITIONAL_COLOUR_1].type = WindowWidgetType::ColourBtn;
Enforce not breaking before assignments and function names Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-21 11:50:45 +02:00
window_ride_colour_widgets[WIDX_VEHICLE_ADDITIONAL_COLOUR_1].image = window_ride_get_colour_button_image(
vehicleColour.additional_1);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (allowChangingAdditionalColour2)
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_VEHICLE_ADDITIONAL_COLOUR_2].type = WindowWidgetType::ColourBtn;
Enforce not breaking before assignments and function names Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-21 11:50:45 +02:00
window_ride_colour_widgets[WIDX_VEHICLE_ADDITIONAL_COLOUR_2].image = window_ride_get_colour_button_image(
vehicleColour.additional_2);
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_VEHICLE_ADDITIONAL_COLOUR_2].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_VEHICLE_ADDITIONAL_COLOUR_1].type = WindowWidgetType::Empty;
window_ride_colour_widgets[WIDX_VEHICLE_ADDITIONAL_COLOUR_2].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Vehicle colour scheme type
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
if (!ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_VEHICLE_IS_INTEGRAL)
Name remaining ride type flags (#10947)
2020-03-16 22:52:06 +01:00
&& (ride->num_cars_per_train | ride->num_vehicles) > 1)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_VEHICLE_COLOUR_SCHEME].type = WindowWidgetType::DropdownMenu;
window_ride_colour_widgets[WIDX_VEHICLE_COLOUR_SCHEME_DROPDOWN].type = WindowWidgetType::Button;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_VEHICLE_COLOUR_SCHEME].type = WindowWidgetType::Empty;
window_ride_colour_widgets[WIDX_VEHICLE_COLOUR_SCHEME_DROPDOWN].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Part of #11389: Use formatter class for Ride::FormatNameTo (#12041)
2020-06-25 02:02:08 +02:00
ft.Rewind();
Migrate 50 more calls to set_format_arg()
2020-06-03 11:20:29 +02:00
ft.Increment(6);
ft.Add<rct_string_id>(VehicleColourSchemeNames[vehicleColourSchemeType]);
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor()
2021-02-24 14:02:58 +01:00
ft.Add<rct_string_id>(GetRideComponentName(ride->GetRideTypeDescriptor().NameConvention.vehicle).singular);
ft.Add<rct_string_id>(GetRideComponentName(ride->GetRideTypeDescriptor().NameConvention.vehicle).capitalised);
Migrate 50 more calls to set_format_arg()
2020-06-03 11:20:29 +02:00
ft.Add<uint16_t>(w->vehicleIndex + 1);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Vehicle index
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (vehicleColourSchemeType != 0)
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_VEHICLE_COLOUR_INDEX].type = WindowWidgetType::DropdownMenu;
window_ride_colour_widgets[WIDX_VEHICLE_COLOUR_INDEX_DROPDOWN].type = WindowWidgetType::Button;
Enforce not breaking before assignments and function names Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-21 11:50:45 +02:00
window_ride_colour_widgets[WIDX_VEHICLE_COLOUR_INDEX].text = vehicleColourSchemeType == 1
? STR_RIDE_COLOUR_TRAIN_VALUE
: STR_RIDE_COLOUR_VEHICLE_VALUE;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_VEHICLE_COLOUR_INDEX].type = WindowWidgetType::Empty;
window_ride_colour_widgets[WIDX_VEHICLE_COLOUR_INDEX_DROPDOWN].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_colour_widgets[WIDX_VEHICLE_PREVIEW].type = WindowWidgetType::Empty;
window_ride_colour_widgets[WIDX_VEHICLE_COLOUR_SCHEME].type = WindowWidgetType::Empty;
window_ride_colour_widgets[WIDX_VEHICLE_COLOUR_SCHEME_DROPDOWN].type = WindowWidgetType::Empty;
window_ride_colour_widgets[WIDX_VEHICLE_COLOUR_INDEX].type = WindowWidgetType::Empty;
window_ride_colour_widgets[WIDX_VEHICLE_COLOUR_INDEX_DROPDOWN].type = WindowWidgetType::Empty;
window_ride_colour_widgets[WIDX_VEHICLE_MAIN_COLOUR].type = WindowWidgetType::Empty;
window_ride_colour_widgets[WIDX_VEHICLE_ADDITIONAL_COLOUR_1].type = WindowWidgetType::Empty;
window_ride_colour_widgets[WIDX_VEHICLE_ADDITIONAL_COLOUR_2].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Part of #11389: Use formatter class for Ride::FormatNameTo (#12041)
2020-06-25 02:02:08 +02:00
ft.Rewind();
Migrate 50 more calls to set_format_arg()
2020-06-03 11:20:29 +02:00
ft.Increment(14);
ft.Add<rct_string_id>(ColourSchemeNames[colourScheme]);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_anchor_border_widgets(w);
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_10);
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AFF3E
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_colour_paint(rct_window* w, rct_drawpixelinfo* dpi)
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// TODO: This should use lists and identified sprites
rct_drawpixelinfo clippedDpi;
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_widget* widget;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowDrawWidgets(w, dpi);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_draw_tab_images(dpi, w);
// Track / shop item preview
widget = &window_ride_colour_widgets[WIDX_TRACK_PREVIEW];
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
if (widget->type != WindowWidgetType::Empty)
clang-format UI windows
2018-06-22 23:21:44 +02:00
gfx_fill_rect(
Part of #12096: ScreenRect on gfx_fill_rect in windows/Ride.cpp (#12239)
2020-07-13 22:49:12 +02:00
dpi,
{ { w->windowPos + ScreenCoordsXY{ widget->left + 1, widget->top + 1 } },
{ w->windowPos + ScreenCoordsXY{ widget->right - 1, widget->bottom - 1 } } },
PALETTE_INDEX_12);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Merge ride track colour arrays into one
2019-01-01 21:33:59 +01:00
auto trackColour = ride_get_track_colour(ride, w->ride_colour);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
//
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto rideEntry = ride->GetRideEntry();
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
if (rideEntry == nullptr || rideEntry->shop_item[0] == ShopItem::None)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
auto screenCoords = w->windowPos + ScreenCoordsXY{ widget->left, widget->top };
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Track
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (ride->type == RIDE_TYPE_MAZE)
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t spriteIndex = MazeOptions[trackColour.supports].sprite;
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
gfx_draw_sprite(dpi, spriteIndex, screenCoords, 0);
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12112: Move TrackColourPreviews to RideTypeDescriptors (#12114)
2020-07-03 22:15:11 +02:00
auto typeDescriptor = ride->GetRideTypeDescriptor();
int32_t spriteIndex = typeDescriptor.ColourPreview.Track;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (spriteIndex != 0)
{
Use remap flags, SPRITE_ID_PALETTE_COLOUR_1 and _2 in many more places
2017-07-20 20:56:29 +02:00
spriteIndex |= SPRITE_ID_PALETTE_COLOUR_2(trackColour.main, trackColour.additional);
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
gfx_draw_sprite(dpi, spriteIndex, screenCoords, 0);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Supports
Fix #12112: Move TrackColourPreviews to RideTypeDescriptors (#12114)
2020-07-03 22:15:11 +02:00
spriteIndex = typeDescriptor.ColourPreview.Supports;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (spriteIndex != 0)
{
Use remap flags, SPRITE_ID_PALETTE_COLOUR_1 and _2 in many more places
2017-07-20 20:56:29 +02:00
spriteIndex |= SPRITE_ID_PALETTE_COLOUR_1(trackColour.supports);
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
gfx_draw_sprite(dpi, spriteIndex, screenCoords, 0);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
auto screenCoords = w->windowPos
+ ScreenCoordsXY{ (widget->left + widget->right) / 2 - 8, (widget->bottom + widget->top) / 2 - 6 };
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
ShopItem shopItem = rideEntry->shop_item[1] == ShopItem::None ? rideEntry->shop_item[0] : rideEntry->shop_item[1];
int32_t spriteIndex = GetShopItemDescriptor(shopItem).Image;
Merge ride track colour arrays into one
2019-01-01 21:33:59 +01:00
spriteIndex |= SPRITE_ID_PALETTE_COLOUR_1(ride->track_colour[0].main);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
gfx_draw_sprite(dpi, spriteIndex, screenCoords, 0);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Entrance preview
trackColour = ride_get_track_colour(ride, 0);
widget = &w->widgets[WIDX_ENTRANCE_PREVIEW];
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
if (widget->type != WindowWidgetType::Empty)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (clip_drawpixelinfo(
Fix #12085: Use ScreenCoordsXY on clip_drawpixelinfo (#12105)
2020-07-02 19:06:28 +02:00
&clippedDpi, dpi, w->windowPos + ScreenCoordsXY{ widget->left + 1, widget->top + 1 }, widget->width(),
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
widget->height()))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_clear(&clippedDpi, PALETTE_INDEX_12);
Implement surfaces, edges and stations as objects
2018-12-05 21:33:45 +01:00
auto stationObj = ride_get_station_object(ride);
if (stationObj != nullptr && stationObj->BaseImageId != 0)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t terniaryColour = 0;
Implement surfaces, edges and stations as objects
2018-12-05 21:33:45 +01:00
if (stationObj->Flags & STATION_OBJECT_FLAGS::IS_TRANSPARENT)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Close #12403: Refactor FILTER_PALETTE_ID to use strong enum (#13273)
2020-12-05 19:13:59 +01:00
terniaryColour = IMAGE_TYPE_TRANSPARENT | (EnumValue(GlassPaletteIds[trackColour.main]) << 19);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t spriteIndex = SPRITE_ID_PALETTE_COLOUR_2(trackColour.main, trackColour.additional);
Implement surfaces, edges and stations as objects
2018-12-05 21:33:45 +01:00
spriteIndex += stationObj->BaseImageId;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Back
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
gfx_draw_sprite(&clippedDpi, spriteIndex, { 34, 20 }, terniaryColour);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Front
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
gfx_draw_sprite(&clippedDpi, spriteIndex + 4, { 34, 20 }, terniaryColour);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Glass
if (terniaryColour != 0)
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
gfx_draw_sprite(&clippedDpi, ((spriteIndex + 20) & 0x7FFFF) + terniaryColour, { 34, 20 }, terniaryColour);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
Fix #8406: Add 'Entrance style:' label to Ride window
2018-12-15 19:00:37 +01:00
Remove common format formatter where possible (#13034) * Remove common format formatter where possible Eventually should have it limited to tooltips, window titles and widget args * Remove remaining paint functions using common * Remove misuse of gCommonFormatArgs
2020-09-30 23:42:04 +02:00
DrawTextEllipsised(dpi, { w->windowPos.x + 3, w->windowPos.y + 103 }, 97, STR_STATION_STYLE, {}, COLOUR_BLACK);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B0192
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_colour_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
implement ride window colour paint and scroll paint
2014-09-14 02:21:33 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
implement ride window colour paint and scroll paint
2014-09-14 02:21:33 +02:00
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto rideEntry = ride->GetRideEntry();
if (rideEntry == nullptr)
return;
auto vehiclePreviewWidget = &window_ride_colour_widgets[WIDX_VEHICLE_PREVIEW];
auto vehicleColour = ride_get_vehicle_colour(ride, w->vehicleIndex);
implement ride window colour paint and scroll paint
2014-09-14 02:21:33 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Background colour
Part of #12096: ScreenRect on gfx_fill_rect in windows/Ride.cpp (#12239)
2020-07-13 22:49:12 +02:00
gfx_fill_rect(dpi, { { dpi->x, dpi->y }, { dpi->x + dpi->width - 1, dpi->y + dpi->height - 1 } }, PALETTE_INDEX_12);
implement ride window colour paint and scroll paint
2014-09-14 02:21:33 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// ?
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
auto screenCoords = ScreenCoordsXY{ vehiclePreviewWidget->width() / 2, vehiclePreviewWidget->height() - 15 };
implement ride_entry_get_train_layout
2015-06-29 02:24:07 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// ?
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto trainCarIndex = (ride->colour_scheme_type & 3) == RIDE_COLOUR_SCHEME_DIFFERENT_PER_CAR ? w->vehicleIndex
: rideEntry->tab_vehicle;
implement ride window colour paint and scroll paint
2014-09-14 02:21:33 +02:00
Enforce not breaking before assignments and function names Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-21 11:50:45 +02:00
rct_ride_entry_vehicle* rideVehicleEntry = &rideEntry->vehicles[ride_entry_get_vehicle_at_position(
ride->subtype, ride->num_cars_per_train, trainCarIndex)];
Refactor of object_paint_ride.
2015-03-01 15:24:05 +01:00
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
screenCoords.y += rideVehicleEntry->tab_height;
implement ride window colour paint and scroll paint
2014-09-14 02:21:33 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Draw the coloured spinning vehicle
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
uint32_t spriteIndex = (rideVehicleEntry->flags & VEHICLE_ENTRY_FLAG_11) ? w->frame_no / 4 : w->frame_no / 2;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
spriteIndex &= rideVehicleEntry->rotation_frame_mask;
Name some rct_ride_entry_vehicle properties
2017-09-15 17:50:38 +02:00
spriteIndex *= rideVehicleEntry->base_num_frames;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
spriteIndex += rideVehicleEntry->base_image_id;
spriteIndex |= (vehicleColour.additional_1 << 24) | (vehicleColour.main << 19);
Name and fix vehicle entry and tertiary colour flags
2017-07-20 12:57:37 +02:00
spriteIndex |= IMAGE_TYPE_REMAP_2_PLUS;
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
gfx_draw_sprite(dpi, spriteIndex, screenCoords, vehicleColour.additional_2);
implement ride window colour paint and scroll paint
2014-09-14 02:21:33 +02:00
}
begin colour tab for ride window
2014-09-10 19:13:07 +02:00
#pragma endregion
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
#pragma region Music
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static constexpr const uint8_t MusicStyleOrder[] = {
Implement ride music objects and refactor
2021-01-09 21:54:02 +01:00
MUSIC_STYLE_GENTLE, MUSIC_STYLE_SUMMER, MUSIC_STYLE_WATER,
MUSIC_STYLE_RAGTIME, MUSIC_STYLE_TECHNO, MUSIC_STYLE_MECHANICAL,
MUSIC_STYLE_MODERN, MUSIC_STYLE_WILD_WEST, MUSIC_STYLE_PIRATES,
MUSIC_STYLE_ROCK, MUSIC_STYLE_ROCK_STYLE_2, MUSIC_STYLE_ROCK_STYLE_3,
MUSIC_STYLE_FANTASY, MUSIC_STYLE_HORROR, MUSIC_STYLE_TOYLAND,
MUSIC_STYLE_CANDY_STYLE, MUSIC_STYLE_ROMAN_FANFARE, MUSIC_STYLE_ORIENTAL,
MUSIC_STYLE_MARTIAN, MUSIC_STYLE_SPACE, MUSIC_STYLE_JUNGLE_DRUMS,
MUSIC_STYLE_JURASSIC, MUSIC_STYLE_EGYPTIAN, MUSIC_STYLE_DODGEMS_BEAT,
MUSIC_STYLE_SNOW, MUSIC_STYLE_ICE, MUSIC_STYLE_MEDIEVAL,
MUSIC_STYLE_URBAN, MUSIC_STYLE_ORGAN, MUSIC_STYLE_CUSTOM_MUSIC_1,
MUSIC_STYLE_CUSTOM_MUSIC_2
implement music tab for ride window
2014-09-04 16:42:36 +02:00
};
Implement ride music objects and refactor
2021-01-09 21:54:02 +01:00
static std::vector<ObjectEntryIndex> window_ride_current_music_style_order;
implement music tab for ride window
2014-09-04 16:42:36 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B215D
implement music tab for ride window
2014-09-04 16:42:36 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_toggle_music(rct_window* w)
implement music tab for ride window
2014-09-04 16:42:36 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride != nullptr)
{
int32_t activateMusic = (ride->lifecycle_flags & RIDE_LIFECYCLE_MUSIC) ? 0 : 1;
set_operating_setting(w->number, RideSetSetting::Music, activateMusic);
}
implement music tab for ride window
2014-09-04 16:42:36 +02:00
}
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B1ED7
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_music_mouseup(rct_window* w, rct_widgetindex widgetIndex)
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_CLOSE:
window_close(w);
break;
case WIDX_TAB_1:
case WIDX_TAB_2:
case WIDX_TAB_3:
case WIDX_TAB_4:
case WIDX_TAB_5:
case WIDX_TAB_6:
case WIDX_TAB_7:
case WIDX_TAB_8:
case WIDX_TAB_9:
case WIDX_TAB_10:
window_ride_set_page(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_PLAY_MUSIC:
window_ride_toggle_music(w);
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement music tab for ride window
2014-09-04 16:42:36 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AF4A2
implement music tab for ride window
2014-09-04 16:42:36 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_music_resize(rct_window* w)
implement music tab for ride window
2014-09-04 16:42:36 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->flags |= WF_RESIZABLE;
window_set_resize(w, 316, 81, 316, 81);
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
}
Implement code review suggestions
2021-01-20 22:04:49 +01:00
static std::optional<size_t> GetMusicStyleOrder(ObjectEntryIndex musicObjectIndex)
Implement ride music objects and refactor
2021-01-09 21:54:02 +01:00
{
auto& objManager = GetContext()->GetObjectManager();
auto musicObj = static_cast<MusicObject*>(objManager.GetLoadedObject(ObjectType::Music, musicObjectIndex));
// Get the index in the order list
auto originalStyleId = musicObj->GetOriginalStyleId();
if (originalStyleId)
{
auto it = std::find(std::begin(MusicStyleOrder), std::end(MusicStyleOrder), *originalStyleId);
if (it != std::end(MusicStyleOrder))
{
return std::distance(std::begin(MusicStyleOrder), it);
}
}
Implement code review suggestions
2021-01-20 22:04:49 +01:00
return std::nullopt;
Implement ride music objects and refactor
2021-01-09 21:54:02 +01:00
}
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B1EFC
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_music_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (widgetIndex != WIDX_MUSIC_DROPDOWN)
return;
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto dropdownWidget = widget - 1;
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Implement ride music objects and refactor
2021-01-09 21:54:02 +01:00
// Construct list of available music
auto& musicOrder = window_ride_current_music_style_order;
musicOrder.clear();
auto& objManager = GetContext()->GetObjectManager();
for (ObjectEntryIndex i = 0; i < MAX_MUSIC_OBJECTS; i++)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Implement ride music objects and refactor
2021-01-09 21:54:02 +01:00
auto musicObj = static_cast<MusicObject*>(objManager.GetLoadedObject(ObjectType::Music, i));
if (musicObj != nullptr)
{
// Hide custom music if the WAV file does not exist
auto originalStyleId = musicObj->GetOriginalStyleId();
if (originalStyleId == MUSIC_STYLE_CUSTOM_MUSIC_1 || originalStyleId == MUSIC_STYLE_CUSTOM_MUSIC_2)
{
auto numTracks = musicObj->GetTrackCount();
Implement code review suggestions
2021-01-20 22:04:49 +01:00
if (numTracks != 0)
Implement ride music objects and refactor
2021-01-09 21:54:02 +01:00
{
auto track0 = musicObj->GetTrack(0);
if (!track0->Asset.IsAvailable())
{
continue;
}
}
else
{
continue;
}
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Implement ride music objects and refactor
2021-01-09 21:54:02 +01:00
if (musicObj->SupportsRideType(ride->type))
{
musicOrder.push_back(i);
}
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Implement ride music objects and refactor
2021-01-09 21:54:02 +01:00
// Sort available music by the original RCT2 list order
std::stable_sort(musicOrder.begin(), musicOrder.end(), [](const ObjectEntryIndex& a, const ObjectEntryIndex& b) {
auto orderA = GetMusicStyleOrder(a);
auto orderB = GetMusicStyleOrder(b);
return orderA < orderB;
});
// Setup dropdown list
auto numItems = musicOrder.size();
for (size_t i = 0; i < numItems; i++)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Implement ride music objects and refactor
2021-01-09 21:54:02 +01:00
auto musicObj = static_cast<MusicObject*>(objManager.GetLoadedObject(ObjectType::Music, musicOrder[i]));
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
Implement ride music objects and refactor
2021-01-09 21:54:02 +01:00
gDropdownItemsArgs[i] = musicObj->NameStringId;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowTextCustomWidth(
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
{ w->windowPos.x + dropdownWidget->left, w->windowPos.y + dropdownWidget->top }, dropdownWidget->height() + 1,
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
w->colours[1], 0, Dropdown::Flag::StayOpen, numItems, widget->right - dropdownWidget->left);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Implement ride music objects and refactor
2021-01-09 21:54:02 +01:00
// Set currently checked item
for (size_t i = 0; i < numItems; i++)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Implement ride music objects and refactor
2021-01-09 21:54:02 +01:00
if (musicOrder[i] == ride->music)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Implement ride music objects and refactor
2021-01-09 21:54:02 +01:00
Dropdown::SetChecked(static_cast<int32_t>(i), true);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B1F03
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_music_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
{
Implement ride music objects and refactor
2021-01-09 21:54:02 +01:00
if (widgetIndex == WIDX_MUSIC_DROPDOWN && dropdownIndex >= 0
&& static_cast<size_t>(dropdownIndex) < window_ride_current_music_style_order.size())
{
auto musicStyle = window_ride_current_music_style_order[dropdownIndex];
set_operating_setting(w->number, RideSetSetting::MusicType, musicStyle);
}
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B2198
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_music_update(rct_window* w)
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->frame_no++;
window_event_invalidate_call(w);
widget_invalidate(w, WIDX_TAB_6);
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B1DEA
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_music_invalidate(rct_window* w)
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto widgets = window_ride_page_widgets[w->page];
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->widgets != widgets)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->widgets = widgets;
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowInitScrollWidgets(w);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement music tab for ride window
2014-09-04 16:42:36 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_set_pressed_tab(w);
implement music tab for ride window
2014-09-04 16:42:36 +02:00
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Part of #11389: Use formatter class for Ride::FormatNameTo (#12041)
2020-06-25 02:02:08 +02:00
auto ft = Formatter::Common();
ride->FormatNameTo(ft);
implement music tab for ride window
2014-09-04 16:42:36 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Set selected music
Implement ride music objects and refactor
2021-01-09 21:54:02 +01:00
rct_string_id musicName = STR_NONE;
auto& objManager = GetContext()->GetObjectManager();
auto musicObj = static_cast<MusicObject*>(objManager.GetLoadedObject(ObjectType::Music, ride->music));
if (musicObj != nullptr)
{
musicName = musicObj->NameStringId;
}
window_ride_music_widgets[WIDX_MUSIC].text = musicName;
implement music tab for ride window
2014-09-04 16:42:36 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Set music activated
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto isMusicActivated = (ride->lifecycle_flags & RIDE_LIFECYCLE_MUSIC) != 0;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (isMusicActivated)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->pressed_widgets |= (1 << WIDX_PLAY_MUSIC);
w->disabled_widgets &= ~(1 << WIDX_MUSIC);
w->disabled_widgets &= ~(1 << WIDX_MUSIC_DROPDOWN);
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->pressed_widgets &= ~(1 << WIDX_PLAY_MUSIC);
w->disabled_widgets |= (1 << WIDX_MUSIC);
w->disabled_widgets |= (1 << WIDX_MUSIC_DROPDOWN);
}
implement music tab for ride window
2014-09-04 16:42:36 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_anchor_border_widgets(w);
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_10);
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006B1ECC
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_music_paint(rct_window* w, rct_drawpixelinfo* dpi)
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
{
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowDrawWidgets(w, dpi);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_draw_tab_images(dpi, w);
start implementing the first page for ride window
2014-08-25 19:28:56 +02:00
}
Merge branch 'master' into ride-window
2014-08-31 13:28:23 +02:00
#pragma endregion
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
#pragma region Measurements
Protect ride rating names from extreme numbers
2017-01-09 19:47:25 +01:00
static rct_string_id get_rating_name(ride_rating rating)
{
openrct2-ui cast fixes (#11348)
2020-04-19 14:08:22 +02:00
int32_t index = std::clamp<int32_t>(rating >> 8, 0, static_cast<int32_t>(std::size(RatingNames)) - 1);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return RatingNames[index];
Protect ride rating names from extreme numbers
2017-01-09 19:47:25 +01:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x006D2804
when al == 0*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void cancel_scenery_selection()
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gGamePaused &= ~GAME_PAUSED_SAVING_TRACK;
gTrackDesignSaveMode = false;
Move the audio code into OpenRCT2 namespace
2020-10-06 23:34:42 +02:00
OpenRCT2::Audio::Resume();
Refactor. Now uses same code for scenery_tracks and just tracks
2015-02-27 14:03:40 +01:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_window* main_w = window_get_main();
Refactor. Now uses same code for scenery_tracks and just tracks
2015-02-27 14:03:40 +01:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (main_w)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
main_w->viewport->flags &= ~(VIEWPORT_FLAG_HIDE_VERTICAL | VIEWPORT_FLAG_HIDE_BASE);
}
Refactor. Now uses same code for scenery_tracks and just tracks
2015-02-27 14:03:40 +01:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_invalidate_screen();
tool_cancel();
Refactor. Now uses same code for scenery_tracks and just tracks
2015-02-27 14:03:40 +01:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x006D27A3
*/
integrate some unknown variables
2016-05-02 03:40:56 +02:00
static void setup_scenery_selection(rct_window* w)
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gTrackDesignSaveMode)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
cancel_scenery_selection();
}
Refactor. Now uses same code for scenery_tracks and just tracks
2015-02-27 14:03:40 +01:00
Close #13625: Refactor TOOL_IDX to use strong enum
2020-12-23 05:11:15 +01:00
while (tool_set(w, WIDX_BACKGROUND, Tool::Crosshair))
clang-format UI windows
2018-06-22 23:21:44 +02:00
;
Refactor. Now uses same code for scenery_tracks and just tracks
2015-02-27 14:03:40 +01:00
Use 16 bits for gTrackDesignSaveRideIndex throughout
2020-10-27 22:02:39 +01:00
gTrackDesignSaveRideIndex = w->number;
Refactor. Now uses same code for scenery_tracks and just tracks
2015-02-27 14:03:40 +01:00
Creating t6 exporter
2019-04-16 20:36:00 +02:00
track_design_save_init();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gGamePaused |= GAME_PAUSED_SAVING_TRACK;
gTrackDesignSaveMode = true;
Refactor. Now uses same code for scenery_tracks and just tracks
2015-02-27 14:03:40 +01:00
Move the audio code into OpenRCT2 namespace
2020-10-06 23:34:42 +02:00
OpenRCT2::Audio::StopAll();
Refactor. Now uses same code for scenery_tracks and just tracks
2015-02-27 14:03:40 +01:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_window* w_main = window_get_main();
Refactor. Now uses same code for scenery_tracks and just tracks
2015-02-27 14:03:40 +01:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w_main)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w_main->viewport->flags |= (VIEWPORT_FLAG_HIDE_VERTICAL | VIEWPORT_FLAG_HIDE_BASE);
}
Refactor. Now uses same code for scenery_tracks and just tracks
2015-02-27 14:03:40 +01:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_invalidate_screen();
Refactor. Now uses same code for scenery_tracks and just tracks
2015-02-27 14:03:40 +01:00
}
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006D3026
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
*/
static void window_ride_measurements_design_reset()
{
Creating t6 exporter
2019-04-16 20:36:00 +02:00
track_design_save_reset_scenery();
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006D303D
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
*/
static void window_ride_measurements_design_select_nearby_scenery()
{
Creating t6 exporter
2019-04-16 20:36:00 +02:00
track_design_save_select_nearby_scenery(gTrackDesignSaveRideIndex);
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AD4DA
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
*/
Exit scenery selection mode when done saving
2016-07-11 16:00:40 +02:00
void window_ride_measurements_design_cancel()
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gTrackDesignSaveMode)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
cancel_scenery_selection();
}
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
}
Fix code and clang format. Delete dead code. Use correct TD4 checksum for vanilla TD4's. Simplified the code for version detection since checksum numbers do not match up to a version Fix TD4 imports. Oh yeah TD4 doesn't have scenery or entrances Move track related structs to correct files
2019-07-07 19:40:58 +02:00
static void TrackDesignCallback(int32_t result, [[maybe_unused]] const utf8* path)
Link everything together
2019-06-30 12:23:06 +02:00
{
if (result == MODAL_RESULT_OK)
{
track_repository_scan();
}
gfx_invalidate_screen();
};
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AD4CD
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_measurements_design_save(rct_window* w)
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
{
Link everything together
2019-06-30 12:23:06 +02:00
Ride* ride = get_ride(w->number);
_trackDesign = ride->SaveToTrackDesign();
if (!_trackDesign)
{
return;
}
if (gTrackDesignSaveMode)
{
auto errMessage = _trackDesign->CreateTrackDesignScenery();
if (errMessage != STR_NONE)
{
Explicitly pass formatter arguments to ShowError and family
2020-08-27 00:01:15 +02:00
context_show_error(STR_CANT_SAVE_TRACK_DESIGN, errMessage, {});
Link everything together
2019-06-30 12:23:06 +02:00
return;
}
}
Fix code and clang format. Delete dead code. Use correct TD4 checksum for vanilla TD4's. Simplified the code for version detection since checksum numbers do not match up to a version Fix TD4 imports. Oh yeah TD4 doesn't have scenery or entrances Move track related structs to correct files
2019-07-07 19:40:58 +02:00
auto trackName = ride->GetName();
Link everything together
2019-06-30 12:23:06 +02:00
auto intent = Intent(WC_LOADSAVE);
intent.putExtra(INTENT_EXTRA_LOADSAVE_TYPE, LOADSAVETYPE_SAVE | LOADSAVETYPE_TRACK);
intent.putExtra(INTENT_EXTRA_TRACK_DESIGN, _trackDesign.get());
Fix code and clang format. Delete dead code. Use correct TD4 checksum for vanilla TD4's. Simplified the code for version detection since checksum numbers do not match up to a version Fix TD4 imports. Oh yeah TD4 doesn't have scenery or entrances Move track related structs to correct files
2019-07-07 19:40:58 +02:00
intent.putExtra(INTENT_EXTRA_PATH, trackName);
intent.putExtra(INTENT_EXTRA_CALLBACK, reinterpret_cast<void*>(&TrackDesignCallback));
Link everything together
2019-06-30 12:23:06 +02:00
context_open_intent(&intent);
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AD4DA
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_measurements_close(rct_window* w)
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_measurements_design_cancel();
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AD478
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_measurements_mouseup(rct_window* w, rct_widgetindex widgetIndex)
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_CLOSE:
window_close(w);
break;
case WIDX_TAB_1:
case WIDX_TAB_2:
case WIDX_TAB_3:
case WIDX_TAB_4:
case WIDX_TAB_5:
case WIDX_TAB_6:
case WIDX_TAB_7:
case WIDX_TAB_8:
case WIDX_TAB_9:
case WIDX_TAB_10:
window_ride_set_page(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_SELECT_NEARBY_SCENERY:
window_ride_measurements_design_select_nearby_scenery();
break;
case WIDX_RESET_SELECTION:
window_ride_measurements_design_reset();
break;
case WIDX_SAVE_DESIGN:
window_ride_measurements_design_save(w);
break;
case WIDX_CANCEL_DESIGN:
window_ride_measurements_design_cancel();
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AD564
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_measurements_resize(rct_window* w)
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
{
Add extra padding to the listings in the ride window.
2017-10-21 15:51:20 +02:00
window_set_resize(w, 316, 234, 316, 234);
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AD4AB
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_measurements_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (widgetIndex != WIDX_SAVE_TRACK_DESIGN)
return;
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Disable saving without scenery for flat rides
2018-01-14 01:48:13 +01:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gDropdownItemsFormat[0] = STR_SAVE_TRACK_DESIGN_ITEM;
gDropdownItemsFormat[1] = STR_SAVE_TRACK_DESIGN_WITH_SCENERY_ITEM;
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowText(
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
{ w->windowPos.x + widget->left, w->windowPos.y + widget->top }, widget->height() + 1, w->colours[1],
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::Flag::StayOpen, 2);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gDropdownDefaultIndex = 0;
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
if (!ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_HAS_TRACK))
Disable saving without scenery for flat rides
2018-01-14 01:48:13 +01:00
{
// Disable saving without scenery if we're a flat ride
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetDisabled(0, true);
Keep "Save track design" dropdown open (#7531)
2018-05-19 14:13:08 +02:00
gDropdownDefaultIndex = 1;
Disable saving without scenery for flat rides
2018-01-14 01:48:13 +01:00
}
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AD4B2
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_measurements_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (widgetIndex != WIDX_SAVE_TRACK_DESIGN)
return;
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (dropdownIndex == -1)
dropdownIndex = gDropdownHighlightedIndex;
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (dropdownIndex == 0)
Create new TrackDesign format
2019-04-08 20:34:24 +02:00
{
Link everything together
2019-06-30 12:23:06 +02:00
window_ride_measurements_design_save(w);
Create new TrackDesign format
2019-04-08 20:34:24 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
else
setup_scenery_selection(w);
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AD5DD
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_measurements_update(rct_window* w)
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->frame_no++;
window_event_invalidate_call(w);
widget_invalidate(w, WIDX_TAB_7);
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006D2AE7
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
*/
Prefer const ref to send ScreenCoordsXY over
2020-02-29 03:43:29 +01:00
static void window_ride_measurements_tooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
{
Use ScreenCoordsXY for tool_* functions
2019-10-21 14:13:08 +02:00
_lastSceneryX = screenCoords.x;
_lastSceneryY = screenCoords.y;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
_collectTrackDesignScenery = true; // Default to true in case user does not select anything valid
Support mouse dragging when selecting ride design scenery Define nearby scenery distance, support mouse dragging when selecting/deselecting ride design scenery
2017-05-29 22:34:33 +02:00
Refactor viewport interaction flags and add plugin API
2021-02-10 02:06:18 +01:00
auto flags = EnumsToFlags(
ViewportInteractionItem::Scenery, ViewportInteractionItem::Footpath, ViewportInteractionItem::Wall,
ViewportInteractionItem::LargeScenery);
auto info = get_map_coordinates_from_pos(screenCoords, flags);
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
switch (info.SpriteType)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Close #13624: Refactor ViewportInteractionItem to use strong enum (#13657) * Closes #13624: Refactor ViewportInteractionItem to use strong enum
2020-12-29 19:09:15 +01:00
case ViewportInteractionItem::Scenery:
case ViewportInteractionItem::LargeScenery:
case ViewportInteractionItem::Wall:
case ViewportInteractionItem::Footpath:
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
_collectTrackDesignScenery = !track_design_save_contains_tile_element(info.Element);
track_design_save_select_tile_element(info.SpriteType, info.Loc, info.Element, _collectTrackDesignScenery);
break;
default:
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Support mouse dragging when selecting ride design scenery Define nearby scenery distance, support mouse dragging when selecting/deselecting ride design scenery
2017-05-29 22:34:33 +02:00
}
Prefer const ref to send ScreenCoordsXY over
2020-02-29 03:43:29 +01:00
static void window_ride_measurements_tooldrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
Support mouse dragging when selecting ride design scenery Define nearby scenery distance, support mouse dragging when selecting/deselecting ride design scenery
2017-05-29 22:34:33 +02:00
{
Use ScreenCoordsXY for tool_* functions
2019-10-21 14:13:08 +02:00
if (screenCoords.x == _lastSceneryX && screenCoords.y == _lastSceneryY)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
Use ScreenCoordsXY for tool_* functions
2019-10-21 14:13:08 +02:00
_lastSceneryX = screenCoords.x;
_lastSceneryY = screenCoords.y;
Support mouse dragging when selecting ride design scenery Define nearby scenery distance, support mouse dragging when selecting/deselecting ride design scenery
2017-05-29 22:34:33 +02:00
Refactor viewport interaction flags and add plugin API
2021-02-10 02:06:18 +01:00
auto flags = EnumsToFlags(
ViewportInteractionItem::Scenery, ViewportInteractionItem::Footpath, ViewportInteractionItem::Wall,
ViewportInteractionItem::LargeScenery);
auto info = get_map_coordinates_from_pos(screenCoords, flags);
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
switch (info.SpriteType)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Close #13624: Refactor ViewportInteractionItem to use strong enum (#13657) * Closes #13624: Refactor ViewportInteractionItem to use strong enum
2020-12-29 19:09:15 +01:00
case ViewportInteractionItem::Scenery:
case ViewportInteractionItem::LargeScenery:
case ViewportInteractionItem::Wall:
case ViewportInteractionItem::Footpath:
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
track_design_save_select_tile_element(info.SpriteType, info.Loc, info.Element, _collectTrackDesignScenery);
break;
default:
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AD4DA
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_measurements_toolabort(rct_window* w, rct_widgetindex widgetIndex)
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_measurements_design_cancel();
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006ACDBC
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_measurements_invalidate(rct_window* w)
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto widgets = window_ride_page_widgets[w->page];
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->widgets != widgets)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->widgets = widgets;
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowInitScrollWidgets(w);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
window_ride_set_pressed_tab(w);
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Part of #11389: Use formatter class for Ride::FormatNameTo (#12041)
2020-06-25 02:02:08 +02:00
auto ft = Formatter::Common();
ride->FormatNameTo(ft);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_measurements_widgets[WIDX_SAVE_TRACK_DESIGN].tooltip = STR_SAVE_TRACK_DESIGN_NOT_POSSIBLE;
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_measurements_widgets[WIDX_SAVE_TRACK_DESIGN].type = WindowWidgetType::Empty;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gTrackDesignSaveMode && gTrackDesignSaveRideIndex == w->number)
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_measurements_widgets[WIDX_SELECT_NEARBY_SCENERY].type = WindowWidgetType::Button;
window_ride_measurements_widgets[WIDX_RESET_SELECTION].type = WindowWidgetType::Button;
window_ride_measurements_widgets[WIDX_SAVE_DESIGN].type = WindowWidgetType::Button;
window_ride_measurements_widgets[WIDX_CANCEL_DESIGN].type = WindowWidgetType::Button;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_measurements_widgets[WIDX_SELECT_NEARBY_SCENERY].type = WindowWidgetType::Empty;
window_ride_measurements_widgets[WIDX_RESET_SELECTION].type = WindowWidgetType::Empty;
window_ride_measurements_widgets[WIDX_SAVE_DESIGN].type = WindowWidgetType::Empty;
window_ride_measurements_widgets[WIDX_CANCEL_DESIGN].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_measurements_widgets[WIDX_SAVE_TRACK_DESIGN].type = WindowWidgetType::FlatBtn;
Initial implementation of track saving for flat rides
2017-12-29 21:50:43 +01:00
w->disabled_widgets |= (1 << WIDX_SAVE_TRACK_DESIGN);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED)
{
if (ride->excitement != RIDE_RATING_UNDEFINED)
{
Initial implementation of track saving for flat rides
2017-12-29 21:50:43 +01:00
w->disabled_widgets &= ~(1 << WIDX_SAVE_TRACK_DESIGN);
window_ride_measurements_widgets[WIDX_SAVE_TRACK_DESIGN].tooltip = STR_SAVE_TRACK_DESIGN;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
}
window_ride_anchor_border_widgets(w);
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_10);
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006ACF07
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_measurements_paint(rct_window* w, rct_drawpixelinfo* dpi)
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int16_t holes, maxSpeed, averageSpeed, drops, highestDropHeight, inversions, time;
int32_t maxPositiveVerticalGs, maxNegativeVerticalGs, maxLateralGs, totalAirTime, length;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowDrawWidgets(w, dpi);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_draw_tab_images(dpi, w);
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
if (window_ride_measurements_widgets[WIDX_SAVE_DESIGN].type == WindowWidgetType::Button)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
rct_widget* widget = &window_ride_measurements_widgets[WIDX_PAGE_BACKGROUND];
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
ScreenCoordsXY widgetCoords(w->windowPos.x + widget->width() / 2, w->windowPos.y + widget->top + 40);
Close #11561: Use ScreenCoordsXY in gfx_draw_string_centred_wrapped() * Add gfx_draw_string_centred_wrapped overload using ScreenCoordsXY * Update calls to gfx_draw_string_centred_wrapped * Remove old signature of gfx_draw_string_centred_wrapped * Meaningful coordinate variable names and constructor calls
2020-05-10 06:00:26 +02:00
gfx_draw_string_centred_wrapped(
dpi, nullptr, widgetCoords, w->width - 8, STR_CLICK_ITEMS_OF_SCENERY_TO_SELECT, COLOUR_BLACK);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Close #11561: Use ScreenCoordsXY in gfx_draw_string_centred_wrapped() * Add gfx_draw_string_centred_wrapped overload using ScreenCoordsXY * Update calls to gfx_draw_string_centred_wrapped * Remove old signature of gfx_draw_string_centred_wrapped * Meaningful coordinate variable names and constructor calls
2020-05-10 06:00:26 +02:00
widgetCoords.x = w->windowPos.x + 4;
widgetCoords.y = w->windowPos.y + window_ride_measurements_widgets[WIDX_SELECT_NEARBY_SCENERY].bottom + 17;
gfx_fill_rect_inset(
Part of #12097: Use ScreenRect on gfx_fill_rect_inset (1) (#12938) * Part of #12097: Use ScreenRect on gfx_fill_rect_inset (1) Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-09-16 05:02:22 +02:00
dpi, { widgetCoords, { w->windowPos.x + 312, widgetCoords.y + 1 } }, w->colours[1], INSET_RECT_FLAG_BORDER_INSET);
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Add nullptr checks for more instances of get_ride (#9819)
2019-08-09 15:20:59 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
auto screenCoords = w->windowPos
+ ScreenCoordsXY{ window_ride_measurements_widgets[WIDX_PAGE_BACKGROUND].left + 4,
window_ride_measurements_widgets[WIDX_PAGE_BACKGROUND].top + 4 };
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Excitement
rct_string_id ratingName = get_rating_name(ride->excitement);
Remove common format formatter where possible (#13034) * Remove common format formatter where possible Eventually should have it limited to tooltips, window titles and widget args * Remove remaining paint functions using common * Remove misuse of gCommonFormatArgs
2020-09-30 23:42:04 +02:00
auto ft = Formatter();
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Add<uint32_t>(ride->excitement);
ft.Add<rct_string_id>(ratingName);
Enforce not breaking before assignments and function names Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-21 11:50:45 +02:00
rct_string_id stringId = ride->excitement == RIDE_RATING_UNDEFINED ? STR_EXCITEMENT_RATING_NOT_YET_AVAILABLE
: STR_EXCITEMENT_RATING;
Remove common format formatter where possible (#13034) * Remove common format formatter where possible Eventually should have it limited to tooltips, window titles and widget args * Remove remaining paint functions using common * Remove misuse of gCommonFormatArgs
2020-09-30 23:42:04 +02:00
gfx_draw_string_left(dpi, stringId, ft.Data(), COLOUR_BLACK, screenCoords);
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Intensity
ratingName = get_rating_name(ride->intensity);
Remove common format formatter where possible (#13034) * Remove common format formatter where possible Eventually should have it limited to tooltips, window titles and widget args * Remove remaining paint functions using common * Remove misuse of gCommonFormatArgs
2020-09-30 23:42:04 +02:00
ft = Formatter();
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Add<uint32_t>(ride->intensity);
ft.Add<rct_string_id>(ratingName);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
stringId = STR_INTENSITY_RATING;
if (ride->excitement == RIDE_RATING_UNDEFINED)
stringId = STR_INTENSITY_RATING_NOT_YET_AVAILABLE;
clang-format UI windows
2018-06-22 23:21:44 +02:00
else if (ride->intensity >= RIDE_RATING(10, 00))
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
stringId = STR_INTENSITY_RATING_RED;
Remove common format formatter where possible (#13034) * Remove common format formatter where possible Eventually should have it limited to tooltips, window titles and widget args * Remove remaining paint functions using common * Remove misuse of gCommonFormatArgs
2020-09-30 23:42:04 +02:00
gfx_draw_string_left(dpi, stringId, ft.Data(), COLOUR_BLACK, screenCoords);
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Nausea
ratingName = get_rating_name(ride->nausea);
Remove common format formatter where possible (#13034) * Remove common format formatter where possible Eventually should have it limited to tooltips, window titles and widget args * Remove remaining paint functions using common * Remove misuse of gCommonFormatArgs
2020-09-30 23:42:04 +02:00
ft = Formatter();
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Add<uint32_t>(ride->nausea);
ft.Add<rct_string_id>(ratingName);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
stringId = ride->excitement == RIDE_RATING_UNDEFINED ? STR_NAUSEA_RATING_NOT_YET_AVAILABLE : STR_NAUSEA_RATING;
Remove common format formatter where possible (#13034) * Remove common format formatter where possible Eventually should have it limited to tooltips, window titles and widget args * Remove remaining paint functions using common * Remove misuse of gCommonFormatArgs
2020-09-30 23:42:04 +02:00
gfx_draw_string_left(dpi, stringId, ft.Data(), COLOUR_BLACK, screenCoords);
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
screenCoords.y += 2 * LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Horizontal rule
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_fill_rect_inset(
Part of #12097: Use ScreenRect on gfx_fill_rect_inset (1) (#12938) * Part of #12097: Use ScreenRect on gfx_fill_rect_inset (1) Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-09-16 05:02:22 +02:00
dpi, { screenCoords - ScreenCoordsXY{ 0, 6 }, screenCoords + ScreenCoordsXY{ 303, -5 } }, w->colours[1],
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
INSET_RECT_FLAG_BORDER_INSET);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_NO_RAW_STATS))
{
if (ride->type == RIDE_TYPE_MINI_GOLF)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Holes
Close #8965: Refactor ride->inversions
2019-03-27 11:30:18 +01:00
holes = ride->holes;
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, STR_HOLES, &holes, COLOUR_BLACK, screenCoords);
screenCoords.y += LIST_ROW_HEIGHT;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Max speed
maxSpeed = (ride->max_speed * 9) >> 18;
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, STR_MAX_SPEED, &maxSpeed, COLOUR_BLACK, screenCoords);
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Average speed
averageSpeed = (ride->average_speed * 9) >> 18;
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, STR_AVERAGE_SPEED, &averageSpeed, COLOUR_BLACK, screenCoords);
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Ride time
Remove common format formatter where possible (#13034) * Remove common format formatter where possible Eventually should have it limited to tooltips, window titles and widget args * Remove remaining paint functions using common * Remove misuse of gCommonFormatArgs
2020-09-30 23:42:04 +02:00
ft = Formatter();
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t numTimes = 0;
clang-format UI windows
2018-06-22 23:21:44 +02:00
for (int32_t i = 0; i < ride->num_stations; i++)
{
Move station fields into new station struct
2019-01-01 02:14:19 +01:00
time = ride->stations[numTimes].SegmentTime;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (time != 0)
{
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Add<uint16_t>(STR_RIDE_TIME_ENTRY_WITH_SEPARATOR);
ft.Add<uint16_t>(time);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
numTimes++;
}
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (numTimes == 0)
{
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Add<uint16_t>(STR_RIDE_TIME_ENTRY);
ft.Add<uint16_t>(0);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
numTimes++;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
// sadly, STR_RIDE_TIME_ENTRY_WITH_SEPARATOR are defined with the separator AFTER an entry
// therefore we set the last entry to use the no-separator format now, post-format
Create Rewind method on Formatter
2020-06-03 12:54:39 +02:00
ft.Rewind();
ft.Increment((numTimes - 1) * 4);
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Add<uint16_t>(STR_RIDE_TIME_ENTRY);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Create Rewind method on Formatter
2020-06-03 12:54:39 +02:00
ft.Rewind();
ft.Increment(numTimes * 4);
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Add<uint16_t>(0);
ft.Add<uint16_t>(0);
ft.Add<uint16_t>(0);
ft.Add<uint16_t>(0);
Replace gfx_draw_string_clipped() calls with DrawTextEllipsised
2020-08-28 18:03:51 +02:00
DrawTextEllipsised(dpi, screenCoords, 308, STR_RIDE_TIME, ft, COLOUR_BLACK);
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Ride length
Remove common format formatter where possible (#13034) * Remove common format formatter where possible Eventually should have it limited to tooltips, window titles and widget args * Remove remaining paint functions using common * Remove misuse of gCommonFormatArgs
2020-09-30 23:42:04 +02:00
ft = Formatter();
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t numLengths = 0;
clang-format UI windows
2018-06-22 23:21:44 +02:00
for (int32_t i = 0; i < ride->num_stations; i++)
{
Fix #1013: negative length in Ride window (#11651)
2020-05-06 11:32:10 +02:00
length = ride->stations[i].SegmentLength;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (length != 0)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
length >>= 16;
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Add<rct_string_id>(STR_RIDE_LENGTH_ENTRY_WITH_SEPARATOR);
ft.Add<uint16_t>(length & 0xFFFF);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
numLengths++;
}
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (numLengths == 0)
{
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Add<rct_string_id>(STR_RIDE_LENGTH_ENTRY);
ft.Add<uint16_t>(0);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
numLengths++;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
// sadly, STR_RIDE_LENGTH_ENTRY_WITH_SEPARATOR are defined with the separator AFTER an entry
// therefore we set the last entry to use the no-separator format now, post-format
Create Rewind method on Formatter
2020-06-03 12:54:39 +02:00
ft.Rewind();
ft.Increment((numLengths - 1) * 4);
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Add<rct_string_id>(STR_RIDE_LENGTH_ENTRY);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Create Rewind method on Formatter
2020-06-03 12:54:39 +02:00
ft.Rewind();
ft.Increment(numLengths * 4);
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Add<uint16_t>(0);
ft.Add<uint16_t>(0);
ft.Add<uint16_t>(0);
ft.Add<uint16_t>(0);
Replace gfx_draw_string_clipped() calls with DrawTextEllipsised
2020-08-28 18:03:51 +02:00
DrawTextEllipsised(dpi, screenCoords, 308, STR_RIDE_LENGTH, ft, COLOUR_BLACK);
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_HAS_G_FORCES))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Max. positive vertical G's
maxPositiveVerticalGs = ride->max_positive_vertical_g;
Draw dangerous G forces on graph in red
2018-06-22 19:20:27 +02:00
stringId = maxPositiveVerticalGs >= RIDE_G_FORCES_RED_POS_VERTICAL ? STR_MAX_POSITIVE_VERTICAL_G_RED
: STR_MAX_POSITIVE_VERTICAL_G;
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, stringId, &maxPositiveVerticalGs, COLOUR_BLACK, screenCoords);
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Max. negative vertical G's
maxNegativeVerticalGs = ride->max_negative_vertical_g;
Draw dangerous G forces on graph in red
2018-06-22 19:20:27 +02:00
stringId = maxNegativeVerticalGs <= RIDE_G_FORCES_RED_NEG_VERTICAL ? STR_MAX_NEGATIVE_VERTICAL_G_RED
: STR_MAX_NEGATIVE_VERTICAL_G;
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, stringId, &maxNegativeVerticalGs, COLOUR_BLACK, screenCoords);
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Max lateral G's
maxLateralGs = ride->max_lateral_g;
Draw dangerous G forces on graph in red
2018-06-22 19:20:27 +02:00
stringId = maxLateralGs >= RIDE_G_FORCES_RED_LATERAL ? STR_MAX_LATERAL_G_RED : STR_MAX_LATERAL_G;
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, stringId, &maxLateralGs, COLOUR_BLACK, screenCoords);
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Total 'air' time
totalAirTime = ride->total_air_time * 3;
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, STR_TOTAL_AIR_TIME, &totalAirTime, COLOUR_BLACK, screenCoords);
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_HAS_DROPS))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Drops
drops = ride->drops & 0x3F;
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, STR_DROPS, &drops, COLOUR_BLACK, screenCoords);
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Highest drop height
highestDropHeight = (ride->highest_drop_height * 3) / 4;
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, STR_HIGHEST_DROP_HEIGHT, &highestDropHeight, COLOUR_BLACK, screenCoords);
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (ride->type != RIDE_TYPE_MINI_GOLF)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Inversions
Close #8965: Refactor ride->inversions
2019-03-27 11:30:18 +01:00
inversions = ride->inversions;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (inversions != 0)
{
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, STR_INVERSIONS, &inversions, COLOUR_BLACK, screenCoords);
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, STR_NO_TEST_RESULTS_YET, nullptr, COLOUR_BLACK, screenCoords);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
implement measurements tab on ride window
2014-09-05 19:10:30 +02:00
}
#pragma endregion
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
#pragma region Graphs
clang-format UI windows
2018-06-22 23:21:44 +02:00
enum
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
GRAPH_VELOCITY,
GRAPH_ALTITUDE,
GRAPH_VERTICAL,
GRAPH_LATERAL
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
};
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AE8A6
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_set_graph(rct_window* w, int32_t type)
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
if ((w->list_information_type & 0xFF) == type)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->list_information_type ^= 0x8000;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->list_information_type &= 0xFF00;
w->list_information_type |= type;
}
Refactor window_invalidate to use rct_window::Invalidate
2019-06-15 17:20:16 +02:00
w->Invalidate();
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AE85D
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_graphs_mouseup(rct_window* w, rct_widgetindex widgetIndex)
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_CLOSE:
window_close(w);
break;
case WIDX_TAB_1:
case WIDX_TAB_2:
case WIDX_TAB_3:
case WIDX_TAB_4:
case WIDX_TAB_5:
case WIDX_TAB_6:
case WIDX_TAB_7:
case WIDX_TAB_8:
case WIDX_TAB_9:
case WIDX_TAB_10:
window_ride_set_page(w, widgetIndex - WIDX_TAB_1);
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AE8DA
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_graphs_resize(rct_window* w)
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
{
Ride window: position graph buttons properly
2020-10-14 17:51:58 +02:00
window_set_resize(w, 316, 182, 500, 450);
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AE878
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_graphs_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_GRAPH_VELOCITY:
window_ride_set_graph(w, GRAPH_VELOCITY);
break;
case WIDX_GRAPH_ALTITUDE:
window_ride_set_graph(w, GRAPH_ALTITUDE);
break;
case WIDX_GRAPH_VERTICAL:
window_ride_set_graph(w, GRAPH_VERTICAL);
break;
case WIDX_GRAPH_LATERAL:
window_ride_set_graph(w, GRAPH_LATERAL);
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AE95D
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_graphs_update(rct_window* w)
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_widget* widget;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t x;
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->frame_no++;
window_event_invalidate_call(w);
widget_invalidate(w, WIDX_TAB_8);
window_event_invalidate_call(w);
widget_invalidate(w, WIDX_GRAPH);
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
widget = &window_ride_graphs_widgets[WIDX_GRAPH];
x = w->scrolls[0].h_left;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (!(w->list_information_type & 0x8000))
{
Pass Ride* instead of ride_id_t
2019-02-13 00:58:45 +01:00
auto ride = get_ride(w->number);
if (ride != nullptr)
{
Refactor ride measurement storage
2019-06-09 11:55:41 +02:00
RideMeasurement* measurement{};
Move formatter to separate file. Rework GetMeasurement (#13131) * Move formatter to seperate file. Rework GetMeasurement * Add Formatter source files to Xcode project Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2020-10-09 13:02:07 +02:00
std::tie(measurement, std::ignore) = ride->GetMeasurement();
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
x = measurement == nullptr ? 0 : measurement->current_item - ((widget->width() / 4) * 3);
Pass Ride* instead of ride_id_t
2019-02-13 00:58:45 +01:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
w->scrolls[0].h_left = std::clamp(x, 0, w->scrolls[0].h_right - (widget->width() - 2));
Refactor Widget to TitleCase (#13355)
2020-11-03 22:29:22 +01:00
WidgetScrollUpdateThumbs(w, WIDX_GRAPH);
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AEA75
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_graphs_scrollgetheight(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_event_invalidate_call(w);
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Set minimum size
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
*width = window_ride_graphs_widgets[WIDX_GRAPH].width() - 2;
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Get measurement size
Pass Ride* instead of ride_id_t
2019-02-13 00:58:45 +01:00
auto ride = get_ride(w->number);
if (ride != nullptr)
{
Refactor ride measurement storage
2019-06-09 11:55:41 +02:00
RideMeasurement* measurement{};
Move formatter to separate file. Rework GetMeasurement (#13131) * Move formatter to seperate file. Rework GetMeasurement * Add Formatter source files to Xcode project Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2020-10-09 13:02:07 +02:00
std::tie(measurement, std::ignore) = ride->GetMeasurement();
Pass Ride* instead of ride_id_t
2019-02-13 00:58:45 +01:00
if (measurement != nullptr)
{
*width = std::max<int32_t>(*width, measurement->num_items);
}
}
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AE953
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_graphs_15(rct_window* w, int32_t scrollIndex, int32_t scrollAreaType)
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->list_information_type |= 0x8000;
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AEA05
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
*/
Rework tooltip to be more logical (#13137)
2020-10-10 15:49:56 +02:00
static OpenRCT2String window_ride_graphs_tooltip(rct_window* w, const rct_widgetindex widgetIndex, const rct_string_id fallback)
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (widgetIndex == WIDX_GRAPH)
{
Pass Ride* instead of ride_id_t
2019-02-13 00:58:45 +01:00
auto ride = get_ride(w->number);
if (ride != nullptr)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Move formatter to separate file. Rework GetMeasurement (#13131) * Move formatter to seperate file. Rework GetMeasurement * Add Formatter source files to Xcode project Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2020-10-09 13:02:07 +02:00
auto [measurement, message] = ride->GetMeasurement();
Pass Ride* instead of ride_id_t
2019-02-13 00:58:45 +01:00
if (measurement != nullptr && (measurement->flags & RIDE_MEASUREMENT_FLAG_RUNNING))
{
Rework tooltip to be more logical (#13137)
2020-10-10 15:49:56 +02:00
auto ft = Formatter();
Migrate 50 more calls to set_format_arg()
2020-06-03 11:20:29 +02:00
ft.Increment(2);
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor()
2021-02-24 14:02:58 +01:00
ft.Add<rct_string_id>(GetRideComponentName(ride->GetRideTypeDescriptor().NameConvention.vehicle).number);
Migrate 50 more calls to set_format_arg()
2020-06-03 11:20:29 +02:00
ft.Add<uint16_t>(measurement->vehicle_index + 1);
Rework tooltip to be more logical (#13137)
2020-10-10 15:49:56 +02:00
return { fallback, ft };
Pass Ride* instead of ride_id_t
2019-02-13 00:58:45 +01:00
}
else
{
Rework tooltip to be more logical (#13137)
2020-10-10 15:49:56 +02:00
return message;
Pass Ride* instead of ride_id_t
2019-02-13 00:58:45 +01:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Rework tooltip to be more logical (#13137)
2020-10-10 15:49:56 +02:00
return { STR_NONE, {} };
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Rework tooltip to be more logical (#13137)
2020-10-10 15:49:56 +02:00
return { fallback, {} };
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AE372
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_graphs_invalidate(rct_window* w)
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto widgets = window_ride_page_widgets[w->page];
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->widgets != widgets)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->widgets = widgets;
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowInitScrollWidgets(w);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
window_ride_set_pressed_tab(w);
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Part of #11389: Use formatter class for Ride::FormatNameTo (#12041)
2020-06-25 02:02:08 +02:00
auto ft = Formatter::Common();
ride->FormatNameTo(ft);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Set pressed graph button type
w->pressed_widgets &= ~(1 << WIDX_GRAPH_VELOCITY);
w->pressed_widgets &= ~(1 << WIDX_GRAPH_ALTITUDE);
w->pressed_widgets &= ~(1 << WIDX_GRAPH_VERTICAL);
w->pressed_widgets &= ~(1 << WIDX_GRAPH_LATERAL);
w->pressed_widgets |= (1LL << (WIDX_GRAPH_VELOCITY + (w->list_information_type & 0xFF)));
// Hide graph buttons that are not applicable
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_HAS_G_FORCES))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_graphs_widgets[WIDX_GRAPH_VERTICAL].type = WindowWidgetType::Button;
window_ride_graphs_widgets[WIDX_GRAPH_LATERAL].type = WindowWidgetType::Button;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_graphs_widgets[WIDX_GRAPH_VERTICAL].type = WindowWidgetType::Empty;
window_ride_graphs_widgets[WIDX_GRAPH_LATERAL].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Anchor graph widget
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto x = w->width - 4;
Ride window: position graph buttons properly
2020-10-14 17:51:58 +02:00
auto y = w->height - BUTTON_FACE_HEIGHT - 8;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_graphs_widgets[WIDX_GRAPH].right = x;
window_ride_graphs_widgets[WIDX_GRAPH].bottom = y;
y += 3;
window_ride_graphs_widgets[WIDX_GRAPH_VELOCITY].top = y;
window_ride_graphs_widgets[WIDX_GRAPH_ALTITUDE].top = y;
window_ride_graphs_widgets[WIDX_GRAPH_VERTICAL].top = y;
window_ride_graphs_widgets[WIDX_GRAPH_LATERAL].top = y;
Ride window: position graph buttons properly
2020-10-14 17:51:58 +02:00
y += BUTTON_FACE_HEIGHT + 1;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_graphs_widgets[WIDX_GRAPH_VELOCITY].bottom = y;
window_ride_graphs_widgets[WIDX_GRAPH_ALTITUDE].bottom = y;
window_ride_graphs_widgets[WIDX_GRAPH_VERTICAL].bottom = y;
window_ride_graphs_widgets[WIDX_GRAPH_LATERAL].bottom = y;
window_ride_anchor_border_widgets(w);
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_10);
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AE4BC
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_graphs_paint(rct_window* w, rct_drawpixelinfo* dpi)
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
{
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowDrawWidgets(w, dpi);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_draw_tab_images(dpi, w);
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AE4C7
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_graphs_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_clear(dpi, ColourMapA[COLOUR_SATURATED_GREEN].darker);
Pass Ride* instead of ride_id_t
2019-02-13 00:58:45 +01:00
auto widget = &window_ride_graphs_widgets[WIDX_GRAPH];
auto ride = get_ride(w->number);
Move formatter to separate file. Rework GetMeasurement (#13131) * Move formatter to seperate file. Rework GetMeasurement * Add Formatter source files to Xcode project Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2020-10-09 13:02:07 +02:00
if (ride == nullptr)
Pass Ride* instead of ride_id_t
2019-02-13 00:58:45 +01:00
{
Move formatter to separate file. Rework GetMeasurement (#13131) * Move formatter to seperate file. Rework GetMeasurement * Add Formatter source files to Xcode project Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2020-10-09 13:02:07 +02:00
return;
Pass Ride* instead of ride_id_t
2019-02-13 00:58:45 +01:00
}
Move formatter to separate file. Rework GetMeasurement (#13131) * Move formatter to seperate file. Rework GetMeasurement * Add Formatter source files to Xcode project Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2020-10-09 13:02:07 +02:00
auto [measurement, message] = ride->GetMeasurement();
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (measurement == nullptr)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// No measurement message
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
ScreenCoordsXY stringCoords(widget->width() / 2, widget->height() / 2 - 5);
int32_t width = widget->width() - 2;
Move formatter to separate file. Rework GetMeasurement (#13131) * Move formatter to seperate file. Rework GetMeasurement * Add Formatter source files to Xcode project Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2020-10-09 13:02:07 +02:00
gfx_draw_string_centred_wrapped(dpi, message.args.Data(), stringCoords, width, message.str, COLOUR_BLACK);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
}
// Vertical grid lines
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
const uint8_t lightColour = ColourMapA[COLOUR_SATURATED_GREEN].mid_light;
const uint8_t darkColour = ColourMapA[COLOUR_SATURATED_GREEN].mid_dark;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t time = 0;
clang-format UI windows
2018-06-22 23:21:44 +02:00
for (int32_t x = 0; x < dpi->x + dpi->width; x += 80)
{
if (x + 80 >= dpi->x)
{
Part of #12096: ScreenRect on gfx_fill_rect in windows/Ride.cpp (#12239)
2020-07-13 22:49:12 +02:00
auto coord1 = ScreenCoordsXY{ x, dpi->y };
auto coord2 = ScreenCoordsXY{ x, dpi->y + dpi->height - 1 };
gfx_fill_rect(dpi, { coord1, coord2 }, lightColour);
gfx_fill_rect(dpi, { coord1 + ScreenCoordsXY{ 16, 0 }, coord2 + ScreenCoordsXY{ 16, 0 } }, darkColour);
gfx_fill_rect(dpi, { coord1 + ScreenCoordsXY{ 32, 0 }, coord2 + ScreenCoordsXY{ 32, 0 } }, darkColour);
gfx_fill_rect(dpi, { coord1 + ScreenCoordsXY{ 48, 0 }, coord2 + ScreenCoordsXY{ 48, 0 } }, darkColour);
gfx_fill_rect(dpi, { coord1 + ScreenCoordsXY{ 64, 0 }, coord2 + ScreenCoordsXY{ 64, 0 } }, darkColour);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
time += 5;
}
// Horizontal grid lines
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t listType = w->list_information_type & 0xFF;
int16_t yUnit = window_graphs_y_axi[listType].unit;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_string_id stringID = window_graphs_y_axi[listType].label;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int16_t yUnitInterval = window_graphs_y_axi[listType].unit_interval;
int16_t yInterval = window_graphs_y_axi[listType].interval;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Scale modifier
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (listType == GRAPH_ALTITUDE)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
yUnit -= gMapBaseZ * 3;
}
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
for (int32_t y = widget->height() - 13; y >= 8; y -= yInterval, yUnit += yUnitInterval)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Minor / major line
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t colour = yUnit == 0 ? lightColour : darkColour;
Part of #12096: ScreenRect on gfx_fill_rect in windows/Ride.cpp (#12239)
2020-07-13 22:49:12 +02:00
gfx_fill_rect(dpi, { { dpi->x, y }, { dpi->x + dpi->width - 1, y } }, colour);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int16_t scaled_yUnit = yUnit;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Scale modifier
if (listType == GRAPH_ALTITUDE)
scaled_yUnit /= 2;
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, stringID, &scaled_yUnit, COLOUR_BLACK, { w->scrolls[0].h_left + 1, y - 4 });
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Time marks
time = 0;
clang-format UI windows
2018-06-22 23:21:44 +02:00
for (int32_t x = 0; x < dpi->x + dpi->width; x += 80)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (x + 80 >= dpi->x)
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, STR_RIDE_STATS_TIME, &time, COLOUR_BLACK, { x + 2, 1 });
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
time += 5;
}
// Plot
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t x = dpi->x;
int32_t top, bottom;
Improve readability
2018-09-08 23:34:05 +02:00
// Uses the force limits (used to draw extreme G's in red on measurement tab) to determine if line should be drawn red.
int32_t intensityThresholdPositive = 0;
int32_t intensityThresholdNegative = 0;
clang-format UI windows
2018-06-22 23:21:44 +02:00
for (int32_t width = 0; width < dpi->width; width++, x++)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (x < 0 || x >= measurement->num_items - 1)
continue;
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (listType)
{
case GRAPH_VELOCITY:
top = measurement->velocity[x] / 2;
bottom = measurement->velocity[x + 1] / 2;
break;
case GRAPH_ALTITUDE:
top = measurement->altitude[x];
bottom = measurement->altitude[x + 1];
break;
case GRAPH_VERTICAL:
top = measurement->vertical[x] + 39;
bottom = measurement->vertical[x + 1] + 39;
Draw dangerous G forces on graph in red
2018-06-22 19:20:27 +02:00
intensityThresholdPositive = (RIDE_G_FORCES_RED_POS_VERTICAL / 8) + 39;
intensityThresholdNegative = (RIDE_G_FORCES_RED_NEG_VERTICAL / 8) + 39;
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case GRAPH_LATERAL:
top = measurement->lateral[x] + 52;
bottom = measurement->lateral[x + 1] + 52;
Draw dangerous G forces on graph in red
2018-06-22 19:20:27 +02:00
intensityThresholdPositive = (RIDE_G_FORCES_RED_LATERAL / 8) + 52;
intensityThresholdNegative = -(RIDE_G_FORCES_RED_LATERAL / 8) + 52;
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
default:
log_error("Wrong graph type %d", listType);
top = bottom = 0;
Improve readability
2018-09-08 23:34:05 +02:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Draw dangerous G forces on graph in red
2018-06-22 19:20:27 +02:00
// Adjust line to match graph widget position.
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
top = widget->height() - top - 13;
bottom = widget->height() - bottom - 13;
Improve readability
2018-09-08 23:34:05 +02:00
if (top > bottom)
{
std::swap(top, bottom);
}
Draw dangerous G forces on graph in red
2018-06-22 19:20:27 +02:00
Improve readability
2018-09-08 23:34:05 +02:00
// Adjust threshold line position as well
if (listType == GRAPH_VERTICAL || listType == GRAPH_LATERAL)
Draw dangerous G forces on graph in red
2018-06-22 19:20:27 +02:00
{
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
intensityThresholdPositive = widget->height() - intensityThresholdPositive - 13;
intensityThresholdNegative = widget->height() - intensityThresholdNegative - 13;
Draw dangerous G forces on graph in red
2018-06-22 19:20:27 +02:00
}
Improve readability
2018-09-08 23:34:05 +02:00
const bool previousMeasurement = x > measurement->current_item;
Draw dangerous G forces on graph in red
2018-06-22 19:20:27 +02:00
// Draw the current line in gray.
Part of #12096: ScreenRect on gfx_fill_rect in windows/Ride.cpp (#12239)
2020-07-13 22:49:12 +02:00
gfx_fill_rect(dpi, { { x, top }, { x, bottom } }, previousMeasurement ? PALETTE_INDEX_17 : PALETTE_INDEX_21);
Draw dangerous G forces on graph in red
2018-06-22 19:20:27 +02:00
// Draw red over extreme values (if supported by graph type).
Improve readability
2018-09-08 23:34:05 +02:00
if (listType == GRAPH_VERTICAL || listType == GRAPH_LATERAL)
Draw dangerous G forces on graph in red
2018-06-22 19:20:27 +02:00
{
Improve readability
2018-09-08 23:34:05 +02:00
const auto redLineColour = previousMeasurement ? PALETTE_INDEX_171 : PALETTE_INDEX_173;
// Line exceeds negative threshold (at bottom of graph).
if (bottom >= intensityThresholdNegative)
Draw dangerous G forces on graph in red
2018-06-22 19:20:27 +02:00
{
Part of #12096: ScreenRect on gfx_fill_rect in windows/Ride.cpp (#12239)
2020-07-13 22:49:12 +02:00
const auto redLineTop = ScreenCoordsXY{ x, std::max(top, intensityThresholdNegative) };
const auto redLineBottom = ScreenCoordsXY{ x, std::max(bottom, intensityThresholdNegative) };
gfx_fill_rect(dpi, { redLineTop, redLineBottom }, redLineColour);
Draw dangerous G forces on graph in red
2018-06-22 19:20:27 +02:00
}
Improve readability
2018-09-08 23:34:05 +02:00
// Line exceeds positive threshold (at top of graph).
if (top <= intensityThresholdPositive)
Draw dangerous G forces on graph in red
2018-06-22 19:20:27 +02:00
{
Part of #12096: ScreenRect on gfx_fill_rect in windows/Ride.cpp (#12239)
2020-07-13 22:49:12 +02:00
const auto redLineTop = ScreenCoordsXY{ x, std::min(top, intensityThresholdPositive) };
const auto redLineBottom = ScreenCoordsXY{ x, std::min(bottom, intensityThresholdPositive) };
gfx_fill_rect(dpi, { redLineTop, redLineBottom }, redLineColour);
Draw dangerous G forces on graph in red
2018-06-22 19:20:27 +02:00
}
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement most of graphs tab on ride window except drawing
2014-09-20 20:41:03 +02:00
}
#pragma endregion
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
#pragma region Income
Make ride window prices allow text input
2017-07-24 10:56:08 +02:00
static utf8 _moneyInputText[MONEY_STRING_MAXLENGTH];
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
static void update_same_price_throughout_flags(ShopItem shop_item)
Clean up some magic values and refactor a bit
2016-05-02 21:06:14 +02:00
{
Use 64bit values to simplify code
2019-03-16 08:33:21 +01:00
uint64_t newFlags;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
if (GetShopItemDescriptor(shop_item).IsPhoto())
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Use 64bit values to simplify code
2019-03-16 08:33:21 +01:00
newFlags = gSamePriceThroughoutPark;
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
newFlags ^= EnumsToFlags(ShopItem::Photo, ShopItem::Photo2, ShopItem::Photo3, ShopItem::Photo4);
Fix #8941: Price sync is not able to check
2019-03-23 10:31:39 +01:00
auto parkSetParameter = ParkSetParameterAction(ParkParameter::SamePriceInPark, newFlags);
Use 64bit values to simplify code
2019-03-16 08:33:21 +01:00
GameActions::Execute(&parkSetParameter);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
else
{
Use 64bit values to simplify code
2019-03-16 08:33:21 +01:00
newFlags = gSamePriceThroughoutPark;
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
newFlags ^= EnumToFlag(shop_item);
Fix #8941: Price sync is not able to check
2019-03-23 10:31:39 +01:00
auto parkSetParameter = ParkSetParameterAction(ParkParameter::SamePriceInPark, newFlags);
Use 64bit values to simplify code
2019-03-16 08:33:21 +01:00
GameActions::Execute(&parkSetParameter);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Clean up some magic values and refactor a bit
2016-05-02 21:06:14 +02:00
}
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006ADEFD
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_income_toggle_primary_price(rct_window* w)
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Strip all whitespace
2015-10-20 20:16:30 +02:00
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
ShopItem shop_item;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (ride->type == RIDE_TYPE_TOILETS)
{
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
shop_item = ShopItem::Admission;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
else
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto rideEntry = get_ride_entry(ride->subtype);
if (rideEntry != nullptr)
{
Refactor shop items
2020-05-11 17:50:30 +02:00
shop_item = rideEntry->shop_item[0];
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
if (shop_item == ShopItem::None)
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
return;
}
else
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Decompiled toggle ride price
2015-06-09 23:00:11 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
update_same_price_throughout_flags(shop_item);
Clean up some magic values and refactor a bit
2016-05-02 21:06:14 +02:00
Refactor shop items
2020-05-11 17:50:30 +02:00
auto rideSetPriceAction = RideSetPriceAction(w->number, ride->price[0], true);
Replace game command references with new game action.
2019-02-07 22:02:49 +01:00
GameActions::Execute(&rideSetPriceAction);
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AE06E
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_income_toggle_secondary_price(rct_window* w)
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Decompiled toggle ride price
2015-06-09 23:00:11 +02:00
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto rideEntry = get_ride_entry(ride->subtype);
if (rideEntry == nullptr)
return;
Strip all whitespace
2015-10-20 20:16:30 +02:00
Refactor shop items
2020-05-11 17:50:30 +02:00
auto shop_item = rideEntry->shop_item[1];
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
if (shop_item == ShopItem::None)
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor()
2021-02-24 14:02:58 +01:00
shop_item = ride->GetRideTypeDescriptor().PhotoItem;
Decompiled toggle ride price
2015-06-09 23:00:11 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
update_same_price_throughout_flags(shop_item);
Decompiled toggle ride price
2015-06-09 23:00:11 +02:00
Refactor shop items
2020-05-11 17:50:30 +02:00
auto rideSetPriceAction = RideSetPriceAction(w->number, ride->price[1], false);
Replace game command references with new game action.
2019-02-07 22:02:49 +01:00
GameActions::Execute(&rideSetPriceAction);
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_income_set_primary_price(rct_window* w, money16 price)
Make ride window prices allow text input
2017-07-24 10:56:08 +02:00
{
Replace game command references with new game action.
2019-02-07 22:02:49 +01:00
auto rideSetPriceAction = RideSetPriceAction(w->number, price, true);
GameActions::Execute(&rideSetPriceAction);
Make ride window prices allow text input
2017-07-24 10:56:08 +02:00
}
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AE1E4
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_income_increase_primary_price(rct_window* w)
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
{
Small cleanup to ride window price box
2018-06-01 14:23:46 +02:00
if (!window_ride_income_can_modify_primary_price(w))
return;
Strip all whitespace
2015-10-20 20:16:30 +02:00
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Refactor shop items
2020-05-11 17:50:30 +02:00
money16 price = ride->price[0];
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (price < MONEY(20, 00))
price++;
Decompiled Ride Prices
2015-06-09 03:28:07 +02:00
Make ride window prices allow text input
2017-07-24 10:56:08 +02:00
window_ride_income_set_primary_price(w, price);
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AE237
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_income_decrease_primary_price(rct_window* w)
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
{
Small cleanup to ride window price box
2018-06-01 14:23:46 +02:00
if (!window_ride_income_can_modify_primary_price(w))
return;
Decompiled Ride Prices
2015-06-09 03:28:07 +02:00
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Refactor shop items
2020-05-11 17:50:30 +02:00
money16 price = ride->price[0];
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (price > MONEY(0, 00))
price--;
Decompiled Ride Prices
2015-06-09 03:28:07 +02:00
Make ride window prices allow text input
2017-07-24 10:56:08 +02:00
window_ride_income_set_primary_price(w, price);
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
static money16 window_ride_income_get_secondary_price(rct_window* w)
Make ride window prices allow text input
2017-07-24 10:56:08 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return 0;
Refactor shop items
2020-05-11 17:50:30 +02:00
money16 price = ride->price[1];
Make ride window prices allow text input
2017-07-24 10:56:08 +02:00
return price;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_income_set_secondary_price(rct_window* w, money16 price)
Make ride window prices allow text input
2017-07-24 10:56:08 +02:00
{
Replace old game command reference.
2019-02-08 16:38:16 +01:00
auto rideSetPriceAction = RideSetPriceAction((w->number & 0x00FF), price, false);
GameActions::Execute(&rideSetPriceAction);
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
}
Small cleanup to ride window price box
2018-06-01 14:23:46 +02:00
static bool window_ride_income_can_modify_primary_price(rct_window* w)
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return false;
Small cleanup to ride window price box
2018-06-01 14:23:46 +02:00
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto rideEntry = ride->GetRideEntry();
return park_ride_prices_unlocked() || ride->type == RIDE_TYPE_TOILETS
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
|| (rideEntry != nullptr && rideEntry->shop_item[0] != ShopItem::None);
Small cleanup to ride window price box
2018-06-01 14:23:46 +02:00
}
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AE269
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_income_increase_secondary_price(rct_window* w)
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
{
Make ride window prices allow text input
2017-07-24 10:56:08 +02:00
money16 price = window_ride_income_get_secondary_price(w);
Strip all whitespace
2015-10-20 20:16:30 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (price < MONEY(20, 00))
price++;
Decompiled Ride Prices
2015-06-09 03:28:07 +02:00
Make ride window prices allow text input
2017-07-24 10:56:08 +02:00
window_ride_income_set_secondary_price(w, price);
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AE28D
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_income_decrease_secondary_price(rct_window* w)
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
{
Make ride window prices allow text input
2017-07-24 10:56:08 +02:00
money16 price = window_ride_income_get_secondary_price(w);
clang-format UI windows
2018-06-22 23:21:44 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (price > MONEY(0, 00))
price--;
Decompiled Ride Prices
2015-06-09 03:28:07 +02:00
Make ride window prices allow text input
2017-07-24 10:56:08 +02:00
window_ride_income_set_secondary_price(w, price);
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006ADEA9
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_income_mouseup(rct_window* w, rct_widgetindex widgetIndex)
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
{
Make ride window prices allow text input
2017-07-24 10:56:08 +02:00
switch (widgetIndex)
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_CLOSE:
window_close(w);
break;
case WIDX_TAB_1:
case WIDX_TAB_2:
case WIDX_TAB_3:
case WIDX_TAB_4:
case WIDX_TAB_5:
case WIDX_TAB_6:
case WIDX_TAB_7:
case WIDX_TAB_8:
case WIDX_TAB_9:
case WIDX_TAB_10:
window_ride_set_page(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_PRIMARY_PRICE:
Make ride window prices allow text input
2017-07-24 10:56:08 +02:00
{
if (!window_ride_income_can_modify_primary_price(w))
return;
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride != nullptr)
{
Refactor shop items
2020-05-11 17:50:30 +02:00
money_to_string(static_cast<money32>(ride->price[0]), _moneyInputText, MONEY_STRING_MAXLENGTH, true);
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
window_text_input_raw_open(
w, WIDX_PRIMARY_PRICE, STR_ENTER_NEW_VALUE, STR_ENTER_NEW_VALUE, _moneyInputText, MONEY_STRING_MAXLENGTH);
}
Make ride window prices allow text input
2017-07-24 10:56:08 +02:00
break;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK:
window_ride_income_toggle_primary_price(w);
break;
case WIDX_SECONDARY_PRICE:
{
Use named casts on openrct2-ui/windows (#11136)
2020-04-18 13:32:48 +02:00
money32 price32 = static_cast<money32>(window_ride_income_get_secondary_price(w));
clang-format UI windows
2018-06-22 23:21:44 +02:00
money_to_string(price32, _moneyInputText, MONEY_STRING_MAXLENGTH, true);
window_text_input_raw_open(
w, WIDX_SECONDARY_PRICE, STR_ENTER_NEW_VALUE, STR_ENTER_NEW_VALUE, _moneyInputText, MONEY_STRING_MAXLENGTH);
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_SECONDARY_PRICE_SAME_THROUGHOUT_PARK:
window_ride_income_toggle_secondary_price(w);
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AE2F8
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_income_resize(rct_window* w)
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
{
Fix #7578: Clicking same price throughout park on accident.
2018-05-31 22:53:04 +02:00
window_set_resize(w, 316, 194, 316, 194);
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006ADED4
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_income_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_PRIMARY_PRICE_INCREASE:
window_ride_income_increase_primary_price(w);
break;
case WIDX_PRIMARY_PRICE_DECREASE:
window_ride_income_decrease_primary_price(w);
break;
case WIDX_SECONDARY_PRICE_INCREASE:
window_ride_income_increase_secondary_price(w);
break;
case WIDX_SECONDARY_PRICE_DECREASE:
window_ride_income_decrease_secondary_price(w);
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AE2BF
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_income_update(rct_window* w)
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->frame_no++;
window_event_invalidate_call(w);
widget_invalidate(w, WIDX_TAB_9);
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride != nullptr && ride->window_invalidate_flags & RIDE_INVALIDATE_RIDE_INCOME)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
ride->window_invalidate_flags &= ~RIDE_INVALIDATE_RIDE_INCOME;
Refactor window_invalidate to use rct_window::Invalidate
2019-06-15 17:20:16 +02:00
w->Invalidate();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
}
Make ride window prices allow text input
2017-07-24 10:56:08 +02:00
static void window_ride_income_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
if ((widgetIndex != WIDX_PRIMARY_PRICE && widgetIndex != WIDX_SECONDARY_PRICE) || text == nullptr)
return;
money32 price = string_to_money(text);
if (price == MONEY32_UNDEFINED)
{
return;
}
Remove Math::Clamp in favour of std::clamp
2018-08-12 13:50:40 +02:00
price = std::clamp(price, MONEY(0, 00), MONEY(20, 00));
Use named casts on openrct2-ui/windows (#11136)
2020-04-18 13:32:48 +02:00
money16 price16 = static_cast<money16>(price);
Make ride window prices allow text input
2017-07-24 10:56:08 +02:00
if (widgetIndex == WIDX_PRIMARY_PRICE)
{
window_ride_income_set_primary_price(w, price16);
}
else
{
window_ride_income_set_secondary_price(w, price16);
}
}
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006ADAA3
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_income_invalidate(rct_window* w)
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto widgets = window_ride_page_widgets[w->page];
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->widgets != widgets)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->widgets = widgets;
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowInitScrollWidgets(w);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
window_ride_set_pressed_tab(w);
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Fix a few more bugs
2019-07-21 13:09:23 +02:00
w->widgets[WIDX_TITLE].text = STR_ARG_14_STRINGID;
Part of #11389: Use formatter class for Ride::FormatNameTo (#12041)
2020-06-25 02:02:08 +02:00
auto ft = Formatter::Common();
ft.Increment(14);
ride->FormatNameTo(ft);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto rideEntry = ride->GetRideEntry();
if (rideEntry == nullptr)
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Primary item
w->pressed_widgets &= ~(1 << WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK);
w->disabled_widgets &= ~(1 << WIDX_PRIMARY_PRICE);
window_ride_income_widgets[WIDX_PRIMARY_PRICE_LABEL].tooltip = STR_NONE;
window_ride_income_widgets[WIDX_PRIMARY_PRICE].tooltip = STR_NONE;
Turn 'unlock all prices' into a regular option This uses a previously unused S6 flag to save this option persistently. This should not make S6 import much harder, but should reduce the amount of questions about S4 import. Also refactor the checks whether the user can ask money for rides or entry. This should make it a lot easier when our own save format comes around.
2017-10-10 11:57:25 +02:00
// If ride prices are locked, do not allow setting the price, unless we're dealing with a shop or toilet.
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
if (!park_ride_prices_unlocked() && rideEntry->shop_item[0] == ShopItem::None && ride->type != RIDE_TYPE_TOILETS)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{
w->disabled_widgets |= (1 << WIDX_PRIMARY_PRICE);
window_ride_income_widgets[WIDX_PRIMARY_PRICE_LABEL].tooltip = STR_RIDE_INCOME_ADMISSION_PAY_FOR_ENTRY_TIP;
window_ride_income_widgets[WIDX_PRIMARY_PRICE].tooltip = STR_RIDE_INCOME_ADMISSION_PAY_FOR_ENTRY_TIP;
}
window_ride_income_widgets[WIDX_PRIMARY_PRICE_LABEL].text = STR_RIDE_INCOME_ADMISSION_PRICE;
window_ride_income_widgets[WIDX_SECONDARY_PRICE_LABEL].text = STR_SHOP_ITEM_PRICE_LABEL_ON_RIDE_PHOTO;
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_income_widgets[WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_income_widgets[WIDX_PRIMARY_PRICE].text = STR_ARG_6_CURRENCY2DP;
money16 ridePrimaryPrice = ride_get_price(ride);
Part of #11389: Use formatter class for Ride::FormatNameTo (#12041)
2020-06-25 02:02:08 +02:00
ft.Rewind();
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Increment(6);
ft.Add<money32>(ridePrimaryPrice);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (ridePrimaryPrice == 0)
window_ride_income_widgets[WIDX_PRIMARY_PRICE].text = STR_FREE;
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
ShopItem primaryItem = ShopItem::Admission;
if (ride->type == RIDE_TYPE_TOILETS || ((primaryItem = rideEntry->shop_item[0]) != ShopItem::None))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_income_widgets[WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK].type = WindowWidgetType::Checkbox;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (shop_item_has_common_price(primaryItem))
w->pressed_widgets |= (1 << WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK);
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
window_ride_income_widgets[WIDX_PRIMARY_PRICE_LABEL].text = GetShopItemDescriptor(primaryItem).Naming.PriceLabel;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Get secondary item
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor()
2021-02-24 14:02:58 +01:00
auto secondaryItem = ride->GetRideTypeDescriptor().PhotoItem;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_ON_RIDE_PHOTO))
{
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
if ((secondaryItem = rideEntry->shop_item[1]) != ShopItem::None)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
window_ride_income_widgets[WIDX_SECONDARY_PRICE_LABEL].text = GetShopItemDescriptor(secondaryItem)
.Naming.PriceLabel;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
if (secondaryItem == ShopItem::None)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Hide secondary item widgets
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_income_widgets[WIDX_SECONDARY_PRICE_LABEL].type = WindowWidgetType::Empty;
window_ride_income_widgets[WIDX_SECONDARY_PRICE].type = WindowWidgetType::Empty;
window_ride_income_widgets[WIDX_SECONDARY_PRICE_INCREASE].type = WindowWidgetType::Empty;
window_ride_income_widgets[WIDX_SECONDARY_PRICE_DECREASE].type = WindowWidgetType::Empty;
window_ride_income_widgets[WIDX_SECONDARY_PRICE_SAME_THROUGHOUT_PARK].type = WindowWidgetType::Empty;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Set same price throughout park checkbox
w->pressed_widgets &= ~(1 << WIDX_SECONDARY_PRICE_SAME_THROUGHOUT_PARK);
if (shop_item_has_common_price(secondaryItem))
w->pressed_widgets |= (1 << WIDX_SECONDARY_PRICE_SAME_THROUGHOUT_PARK);
// Show widgets
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_income_widgets[WIDX_SECONDARY_PRICE_LABEL].type = WindowWidgetType::Label;
window_ride_income_widgets[WIDX_SECONDARY_PRICE].type = WindowWidgetType::Spinner;
window_ride_income_widgets[WIDX_SECONDARY_PRICE_INCREASE].type = WindowWidgetType::Button;
window_ride_income_widgets[WIDX_SECONDARY_PRICE_DECREASE].type = WindowWidgetType::Button;
window_ride_income_widgets[WIDX_SECONDARY_PRICE_SAME_THROUGHOUT_PARK].type = WindowWidgetType::Checkbox;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Set secondary item price
window_ride_income_widgets[WIDX_SECONDARY_PRICE].text = STR_RIDE_SECONDARY_PRICE_VALUE;
Move remaining calls to set_format_arg()
2020-06-03 12:03:12 +02:00
ft.Add<money32>(ride->price[1]);
Refactor shop items
2020-05-11 17:50:30 +02:00
if (ride->price[1] == 0)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_income_widgets[WIDX_SECONDARY_PRICE].text = STR_FREE;
}
window_ride_anchor_border_widgets(w);
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_10);
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006ADCE5
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_income_paint(rct_window* w, rct_drawpixelinfo* dpi)
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_string_id stringId;
money32 profit, costPerHour;
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
ShopItem primaryItem, secondaryItem;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowDrawWidgets(w, dpi);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_draw_tab_images(dpi, w);
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
auto rideEntry = ride->GetRideEntry();
if (rideEntry == nullptr)
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
auto screenCoords = w->windowPos
+ ScreenCoordsXY{ window_ride_income_widgets[WIDX_PAGE_BACKGROUND].left + 4,
window_ride_income_widgets[WIDX_PAGE_BACKGROUND].top + 33 };
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Primary item profit / loss per item sold
Refactor shop items
2020-05-11 17:50:30 +02:00
primaryItem = rideEntry->shop_item[0];
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
if (primaryItem != ShopItem::None)
Fix #7578: Clicking same price throughout park on accident.
2018-05-31 22:53:04 +02:00
{
Refactor shop items
2020-05-11 17:50:30 +02:00
profit = ride->price[0];
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
stringId = STR_PROFIT_PER_ITEM_SOLD;
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
profit -= GetShopItemDescriptor(primaryItem).Cost;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (profit < 0)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
profit *= -1;
stringId = STR_LOSS_PER_ITEM_SOLD;
}
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, stringId, &profit, COLOUR_BLACK, screenCoords);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
screenCoords.y += 44;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Secondary item profit / loss per item sold
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor()
2021-02-24 14:02:58 +01:00
secondaryItem = ride->GetRideTypeDescriptor().PhotoItem;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_ON_RIDE_PHOTO))
Refactor shop items
2020-05-11 17:50:30 +02:00
secondaryItem = rideEntry->shop_item[1];
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
if (secondaryItem != ShopItem::None)
Fix #7578: Clicking same price throughout park on accident.
2018-05-31 22:53:04 +02:00
{
Refactor shop items
2020-05-11 17:50:30 +02:00
profit = ride->price[1];
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
stringId = STR_PROFIT_PER_ITEM_SOLD;
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
profit -= GetShopItemDescriptor(secondaryItem).Cost;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (profit < 0)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
profit *= -1;
stringId = STR_LOSS_PER_ITEM_SOLD;
}
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, stringId, &profit, COLOUR_BLACK, screenCoords);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
screenCoords.y += 18;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Income per hour
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (ride->income_per_hour != MONEY32_UNDEFINED)
{
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, STR_INCOME_PER_HOUR, &ride->income_per_hour, COLOUR_BLACK, screenCoords);
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Running cost per hour
costPerHour = ride->upkeep_cost * 16;
Create define for MONEY16_UNDEFINED
2017-10-17 17:12:49 +02:00
stringId = ride->upkeep_cost == MONEY16_UNDEFINED ? STR_RUNNING_COST_UNKNOWN : STR_RUNNING_COST_PER_HOUR;
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, stringId, &costPerHour, COLOUR_BLACK, screenCoords);
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Profit per hour
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (ride->profit != MONEY32_UNDEFINED)
{
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, STR_PROFIT_PER_HOUR, &ride->profit, COLOUR_BLACK, screenCoords);
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
screenCoords.y += 5;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Total profit
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, STR_TOTAL_PROFIT, &ride->total_profit, COLOUR_BLACK, screenCoords);
implement most of income tab for ride window
2014-09-06 00:44:02 +02:00
}
#pragma endregion
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
#pragma region Customer
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AD986
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_customer_mouseup(rct_window* w, rct_widgetindex widgetIndex)
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
{
WIP window moving
2017-09-10 11:02:16 +02:00
switch (widgetIndex)
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_CLOSE:
window_close(w);
break;
case WIDX_TAB_1:
case WIDX_TAB_2:
case WIDX_TAB_3:
case WIDX_TAB_4:
case WIDX_TAB_5:
case WIDX_TAB_6:
case WIDX_TAB_7:
case WIDX_TAB_8:
case WIDX_TAB_9:
case WIDX_TAB_10:
window_ride_set_page(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_SHOW_GUESTS_THOUGHTS:
{
auto intent = Intent(WC_GUEST_LIST);
Close #12414: Refactor GUEST_LIST_FILTER_TYPE to use strong enum (#12830)
2020-09-02 17:50:16 +02:00
intent.putExtra(INTENT_EXTRA_GUEST_LIST_FILTER, static_cast<int32_t>(GuestListFilterType::GuestsThinkingAboutRide));
clang-format UI windows
2018-06-22 23:21:44 +02:00
intent.putExtra(INTENT_EXTRA_RIDE_ID, w->number);
context_open_intent(&intent);
break;
}
case WIDX_SHOW_GUESTS_ON_RIDE:
{
auto intent = Intent(WC_GUEST_LIST);
Close #12414: Refactor GUEST_LIST_FILTER_TYPE to use strong enum (#12830)
2020-09-02 17:50:16 +02:00
intent.putExtra(INTENT_EXTRA_GUEST_LIST_FILTER, static_cast<int32_t>(GuestListFilterType::GuestsOnRide));
clang-format UI windows
2018-06-22 23:21:44 +02:00
intent.putExtra(INTENT_EXTRA_RIDE_ID, w->number);
context_open_intent(&intent);
break;
}
case WIDX_SHOW_GUESTS_QUEUING:
{
auto intent = Intent(WC_GUEST_LIST);
Close #12414: Refactor GUEST_LIST_FILTER_TYPE to use strong enum (#12830)
2020-09-02 17:50:16 +02:00
intent.putExtra(INTENT_EXTRA_GUEST_LIST_FILTER, static_cast<int32_t>(GuestListFilterType::GuestsInQueue));
clang-format UI windows
2018-06-22 23:21:44 +02:00
intent.putExtra(INTENT_EXTRA_RIDE_ID, w->number);
context_open_intent(&intent);
break;
}
WIP window moving
2017-09-10 11:02:16 +02:00
}
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006ADA29
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_customer_resize(rct_window* w)
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->flags |= WF_RESIZABLE;
Add extra padding to the listings in the ride window.
2017-10-21 15:51:20 +02:00
window_set_resize(w, 316, 163, 316, 163);
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AD9DD
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_customer_update(rct_window* w)
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
{
Clean up window vars
2020-03-01 21:51:29 +01:00
w->picked_peep_frame++;
if (w->picked_peep_frame >= 24)
w->picked_peep_frame = 0;
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_event_invalidate_call(w);
widget_invalidate(w, WIDX_TAB_10);
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride != nullptr && ride->window_invalidate_flags & RIDE_INVALIDATE_RIDE_CUSTOMER)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
ride->window_invalidate_flags &= ~RIDE_INVALIDATE_RIDE_CUSTOMER;
Refactor window_invalidate to use rct_window::Invalidate
2019-06-15 17:20:16 +02:00
w->Invalidate();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AD5F8
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_customer_invalidate(rct_window* w)
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
{
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto widgets = window_ride_page_widgets[w->page];
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->widgets != widgets)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->widgets = widgets;
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowInitScrollWidgets(w);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_set_pressed_tab(w);
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
auto ride = get_ride(w->number);
if (ride != nullptr)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Part of #11389: Use formatter class for Ride::FormatNameTo (#12041)
2020-06-25 02:02:08 +02:00
auto ft = Formatter::Common();
ride->FormatNameTo(ft);
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_customer_widgets[WIDX_SHOW_GUESTS_THOUGHTS].type = WindowWidgetType::FlatBtn;
Use the RTD instead of ride_type_has_flag()
2021-02-24 13:53:01 +01:00
if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP))
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_customer_widgets[WIDX_SHOW_GUESTS_ON_RIDE].type = WindowWidgetType::Empty;
window_ride_customer_widgets[WIDX_SHOW_GUESTS_QUEUING].type = WindowWidgetType::Empty;
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
}
else
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_ride_customer_widgets[WIDX_SHOW_GUESTS_ON_RIDE].type = WindowWidgetType::FlatBtn;
window_ride_customer_widgets[WIDX_SHOW_GUESTS_QUEUING].type = WindowWidgetType::FlatBtn;
Add nullptr checks for get_ride in libopenrct2ui (#9795)
2019-08-09 09:06:25 +02:00
}
window_ride_anchor_border_widgets(w);
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_10);
}
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006AD6CD
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_ride_customer_paint(rct_window* w, rct_drawpixelinfo* dpi)
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
{
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
ShopItem shopItem;
Add built_date to ScRide and add GetAge()
2020-05-12 20:11:29 +02:00
int16_t popularity, satisfaction, queueTime;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t customersPerHour;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_string_id stringId;
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowDrawWidgets(w, dpi);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_ride_draw_tab_images(dpi, w);
Add nullptr checks for more instances of get_ride (#9819)
2019-08-09 15:20:59 +02:00
auto ride = get_ride(w->number);
if (ride == nullptr)
return;
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
auto screenCoords = w->windowPos
+ ScreenCoordsXY{ window_ride_customer_widgets[WIDX_PAGE_BACKGROUND].left + 4,
window_ride_customer_widgets[WIDX_PAGE_BACKGROUND].top + 4 };
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Customers currently on ride
Remove ride classifications
2019-08-03 19:11:30 +02:00
if (ride->IsRide())
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int16_t customersOnRide = ride->num_riders;
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, STR_CUSTOMERS_ON_RIDE, &customersOnRide, COLOUR_BLACK, screenCoords);
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Customers per hour
customersPerHour = ride_customers_per_hour(ride);
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, STR_CUSTOMERS_PER_HOUR, &customersPerHour, COLOUR_BLACK, screenCoords);
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Popularity
popularity = ride->popularity;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (popularity == 255)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
stringId = STR_POPULARITY_UNKNOWN;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
stringId = STR_POPULARITY_PERCENT;
popularity *= 4;
}
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, stringId, &popularity, COLOUR_BLACK, screenCoords);
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Satisfaction
satisfaction = ride->satisfaction;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (satisfaction == 255)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
stringId = STR_SATISFACTION_UNKNOWN;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
stringId = STR_SATISFACTION_PERCENT;
satisfaction *= 5;
}
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, stringId, &satisfaction, COLOUR_BLACK, screenCoords);
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Queue time
Remove ride classifications
2019-08-03 19:11:30 +02:00
if (ride->IsRide())
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Port more functions to Ride struct (#9119)
2019-04-20 22:22:39 +02:00
queueTime = ride->GetMaxQueueTime();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
stringId = queueTime == 1 ? STR_QUEUE_TIME_MINUTE : STR_QUEUE_TIME_MINUTES;
Fix #11562 - gfx_draw_string_left_wrapped overload (#12015) I created the overload, replaced remaining calls with the new function and removed the old function.
2020-06-21 11:25:31 +02:00
screenCoords.y += gfx_draw_string_left_wrapped(dpi, &queueTime, screenCoords, 308, stringId, COLOUR_BLACK);
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
screenCoords.y += 5;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Primary shop items sold
Refactor shop items
2020-05-11 17:50:30 +02:00
shopItem = ride->GetRideEntry()->shop_item[0];
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
if (shopItem != ShopItem::None)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Remove common format formatter where possible (#13034) * Remove common format formatter where possible Eventually should have it limited to tooltips, window titles and widget args * Remove remaining paint functions using common * Remove misuse of gCommonFormatArgs
2020-09-30 23:42:04 +02:00
auto ft = Formatter();
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
ft.Add<rct_string_id>(GetShopItemDescriptor(shopItem).Naming.Plural);
Migrate 50 more calls to set_format_arg()
2020-06-03 11:20:29 +02:00
ft.Add<uint32_t>(ride->no_primary_items_sold);
Remove common format formatter where possible (#13034) * Remove common format formatter where possible Eventually should have it limited to tooltips, window titles and widget args * Remove remaining paint functions using common * Remove misuse of gCommonFormatArgs
2020-09-30 23:42:04 +02:00
gfx_draw_string_left(dpi, STR_ITEMS_SOLD, ft.Data(), COLOUR_BLACK, screenCoords);
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Secondary shop items sold / on-ride photos sold
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor()
2021-02-24 14:02:58 +01:00
shopItem = (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_RIDE_PHOTO) ? ride->GetRideTypeDescriptor().PhotoItem
Refactor shop items
2020-05-11 17:50:30 +02:00
: ride->GetRideEntry()->shop_item[1];
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
if (shopItem != ShopItem::None)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Remove common format formatter where possible (#13034) * Remove common format formatter where possible Eventually should have it limited to tooltips, window titles and widget args * Remove remaining paint functions using common * Remove misuse of gCommonFormatArgs
2020-09-30 23:42:04 +02:00
auto ft = Formatter();
Close #12395: Refactor PeepItem to use strong enum (#13311) * refactor: integrated PEEP_ITEM into SHOP_ITEM * refactor: converted merged enum to flag Only former occurrences of PEEP_ITEM * cleanUp: code cleaned after merging * refactor: converted ShopItem to strong enum code reformatting * refactor: ShopItem enum items renamed code formatted * refactor: new getter and setter functions for Item...Flags * refactor: replaced all occurrences of ItemStandardFlags with appropriate getter and setter functions. COMPARE_FIELD macro needs to be commented out or the flag has to stay public. * refactor: all occurrences of ItemExtraFlags replaced with proper function calls. COMPARE_FIELD macro issue not resolved. * refactor: introduced new variable for unified item flags * refactor: adapted accessor functions accessor functions were modified to accommodate both standard and extra ShopItem flags * refactor: ItemExtraFlags accessor functions are replaced with general functions * refactor: reverted to original uint32_t flag variables * refactor: implemented suggested changes * refactor: integrate additional comments * refactor: incorporated requested changes * refactor: incorporated requested changes added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-04 01:15:59 +01:00
ft.Add<rct_string_id>(GetShopItemDescriptor(shopItem).Naming.Plural);
Migrate 50 more calls to set_format_arg()
2020-06-03 11:20:29 +02:00
ft.Add<uint32_t>(ride->no_secondary_items_sold);
Remove common format formatter where possible (#13034) * Remove common format formatter where possible Eventually should have it limited to tooltips, window titles and widget args * Remove remaining paint functions using common * Remove misuse of gCommonFormatArgs
2020-09-30 23:42:04 +02:00
gfx_draw_string_left(dpi, STR_ITEMS_SOLD, ft.Data(), COLOUR_BLACK, screenCoords);
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Total customers
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, STR_TOTAL_CUSTOMERS, &ride->total_customers, COLOUR_BLACK, screenCoords);
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Guests favourite
Remove ride classifications
2019-08-03 19:11:30 +02:00
if (ride->IsRide())
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
stringId = ride->guests_favourite == 1 ? STR_FAVOURITE_RIDE_OF_GUEST : STR_FAVOURITE_RIDE_OF_GUESTS;
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, stringId, &ride->guests_favourite, COLOUR_BLACK, screenCoords);
screenCoords.y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
screenCoords.y += 2;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Age
clang-format UI windows
2018-06-22 23:21:44 +02:00
// If the ride has a build date that is in the future, show it as built this year.
Add built_date to ScRide and add GetAge()
2020-05-12 20:11:29 +02:00
int16_t age = std::max(date_get_year(ride->GetAge()), 0);
clang-format UI windows
2018-06-22 23:21:44 +02:00
stringId = age == 0 ? STR_BUILT_THIS_YEAR : age == 1 ? STR_BUILT_LAST_YEAR : STR_BUILT_YEARS_AGO;
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 21:09:45 +02:00
gfx_draw_string_left(dpi, stringId, &age, COLOUR_BLACK, screenCoords);
implement customer tab on ride window
2014-09-04 20:59:42 +02:00
}
Allow changing subtype
2015-03-14 16:52:48 +01:00
#pragma endregion