From b2bc974fe7d760a8e8ab2bfaf67d2f5b804d5603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Thu, 4 Jan 2018 06:58:44 +0100 Subject: [PATCH] Use nullptr where possible --- src/openrct2-ui/audio/AudioMixer.cpp | 2 +- .../engines/HardwareDisplayDrawingEngine.cpp | 2 +- .../engines/opengl/OpenGLDrawingEngine.cpp | 2 +- src/openrct2-ui/input/Input.cpp | 8 +- src/openrct2-ui/input/KeyboardShortcut.cpp | 44 +- src/openrct2-ui/input/MouseInput.cpp | 58 +- .../windows/EditorBottomToolbar.cpp | 2 +- src/openrct2-ui/windows/InstallTrack.cpp | 2 +- src/openrct2-ui/windows/Map.cpp | 2 +- src/openrct2-ui/windows/Sign.cpp | 2 +- .../windows/TitleCommandEditor.cpp | 2 +- src/openrct2-ui/windows/TrackDesignPlace.cpp | 2 +- src/openrct2-ui/windows/TrackList.cpp | 2 +- src/openrct2/Cheats.cpp | 2 +- src/openrct2/CmdlineSprite.cpp | 22 +- src/openrct2/Intro.cpp | 14 +- src/openrct2/drawing/Image.cpp | 2 +- src/openrct2/drawing/Sprite.cpp | 2 +- src/openrct2/network/Network.cpp | 2 +- src/openrct2/object/ObjectList.cpp | 6 +- src/openrct2/paint/Supports.cpp | 42 +- src/openrct2/paint/tile_element/Banner.cpp | 2 +- src/openrct2/paint/tile_element/Entrance.cpp | 10 +- src/openrct2/paint/tile_element/Fence.cpp | 12 +- .../paint/tile_element/LargeScenery.cpp | 10 +- src/openrct2/paint/tile_element/Path.cpp | 8 +- .../paint/tile_element/SmallScenery.cpp | 6 +- src/openrct2/paint/tile_element/Surface.cpp | 8 +- .../paint/tile_element/TileElement.cpp | 6 +- src/openrct2/peep/Peep.cpp | 140 +- src/openrct2/peep/Staff.cpp | 14 +- src/openrct2/ride/Ride.cpp | 4 +- src/openrct2/ride/Vehicle.cpp | 96 +- .../coaster/AirPoweredVerticalCoaster.cpp | 24 +- .../ride/coaster/BobsleighCoaster.cpp | 2 +- .../ride/coaster/CompactInvertedCoaster.cpp | 2 +- .../ride/coaster/CorkscrewRollerCoaster.cpp | 2 +- .../ride/coaster/FlyingRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/GigaCoaster.cpp | 2 +- .../ride/coaster/HeartlineTwisterCoaster.cpp | 254 +-- .../ride/coaster/InvertedHairpinCoaster.cpp | 2 +- .../ride/coaster/InvertedImpulseCoaster.cpp | 2 +- .../ride/coaster/InvertedRollerCoaster.cpp | 2 +- .../ride/coaster/JuniorRollerCoaster.cpp | 20 +- .../ride/coaster/LayDownRollerCoaster.cpp | 2 +- .../ride/coaster/LimLaunchedRollerCoaster.cpp | 2 +- .../ride/coaster/LoopingRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/MineRide.cpp | 2 +- .../ride/coaster/MineTrainCoaster.cpp | 1422 ++++++++-------- .../ride/coaster/MiniRollerCoaster.cpp | 2 +- .../ride/coaster/MiniSuspendedCoaster.cpp | 2 +- .../coaster/MultiDimensionRollerCoaster.cpp | 2 +- .../ride/coaster/ReverseFreefallCoaster.cpp | 14 +- .../ride/coaster/ReverserRollerCoaster.cpp | 280 ++-- .../coaster/SideFrictionRollerCoaster.cpp | 476 +++--- .../ride/coaster/StandUpRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/Steeplechase.cpp | 2 +- .../ride/coaster/SuspendedSwingingCoaster.cpp | 2 +- .../ride/coaster/TwisterRollerCoaster.cpp | 2 +- .../coaster/VerticalDropRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/VirginiaReel.cpp | 40 +- src/openrct2/ride/coaster/WildMouse.cpp | 2 +- .../ride/coaster/WoodenRollerCoaster.cpp | 1476 ++++++++--------- src/openrct2/ride/coaster/WoodenWildMouse.cpp | 26 +- src/openrct2/ride/gentle/CarRide.cpp | 6 +- src/openrct2/ride/gentle/CircusShow.cpp | 4 +- src/openrct2/ride/gentle/CrookedHouse.cpp | 4 +- src/openrct2/ride/gentle/Dodgems.cpp | 4 +- src/openrct2/ride/gentle/FerrisWheel.cpp | 8 +- src/openrct2/ride/gentle/FlyingSaucers.cpp | 4 +- src/openrct2/ride/gentle/GhostTrain.cpp | 6 +- src/openrct2/ride/gentle/HauntedHouse.cpp | 4 +- src/openrct2/ride/gentle/Maze.cpp | 4 +- src/openrct2/ride/gentle/MerryGoRound.cpp | 10 +- src/openrct2/ride/gentle/MiniGolf.cpp | 12 +- src/openrct2/ride/gentle/MiniHelicopters.cpp | 2 +- src/openrct2/ride/gentle/MonorailCycles.cpp | 4 +- src/openrct2/ride/gentle/ObservationTower.cpp | 8 +- src/openrct2/ride/gentle/SpaceRings.cpp | 8 +- src/openrct2/ride/gentle/SpiralSlide.cpp | 4 +- src/openrct2/ride/shops/Facility.cpp | 4 +- src/openrct2/ride/shops/Shop.cpp | 6 +- src/openrct2/ride/thrill/3dCinema.cpp | 4 +- src/openrct2/ride/thrill/Enterprise.cpp | 10 +- src/openrct2/ride/thrill/GoKarts.cpp | 32 +- src/openrct2/ride/thrill/LaunchedFreefall.cpp | 4 +- src/openrct2/ride/thrill/MagicCarpet.cpp | 8 +- src/openrct2/ride/thrill/MotionSimulator.cpp | 8 +- src/openrct2/ride/thrill/PirateShip.cpp | 10 +- src/openrct2/ride/thrill/RotoDrop.cpp | 4 +- .../ride/thrill/SwingingInverterShip.cpp | 6 +- src/openrct2/ride/thrill/TopSpin.cpp | 10 +- src/openrct2/ride/thrill/Twist.cpp | 10 +- src/openrct2/ride/transport/Chairlift.cpp | 16 +- src/openrct2/ride/transport/Lift.cpp | 2 +- .../ride/transport/MiniatureRailway.cpp | 46 +- src/openrct2/ride/transport/Monorail.cpp | 6 +- .../ride/transport/SuspendedMonorail.cpp | 2 +- src/openrct2/ride/water/BoatHire.cpp | 2 +- src/openrct2/ride/water/DingySlide.cpp | 2 +- src/openrct2/ride/water/LogFlume.cpp | 2 +- src/openrct2/ride/water/RiverRapids.cpp | 38 +- src/openrct2/ride/water/SplashBoats.cpp | 44 +- src/openrct2/ride/water/SubmarineRide.cpp | 6 +- src/openrct2/ride/water/WaterCoaster.cpp | 2 +- src/openrct2/scenario/Scenario.cpp | 28 +- src/openrct2/util/Util.cpp | 18 +- src/openrct2/world/Entrance.cpp | 2 +- src/openrct2/world/Map.cpp | 156 +- src/openrct2/world/Park.cpp | 12 +- 110 files changed, 2602 insertions(+), 2602 deletions(-) diff --git a/src/openrct2-ui/audio/AudioMixer.cpp b/src/openrct2-ui/audio/AudioMixer.cpp index b762a63b43..4bfd751c55 100644 --- a/src/openrct2-ui/audio/AudioMixer.cpp +++ b/src/openrct2-ui/audio/AudioMixer.cpp @@ -380,7 +380,7 @@ namespace OpenRCT2 { namespace Audio SpeexResamplerState * resampler = channel->GetResampler(); if (resampler == nullptr) { - resampler = speex_resampler_init(_format.channels, _format.freq, _format.freq, 0, 0); + resampler = speex_resampler_init(_format.channels, _format.freq, _format.freq, 0, nullptr); channel->SetResampler(resampler); } speex_resampler_set_rate(resampler, inRate, outRate); diff --git a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp index 74f1f64cd2..7fabb9cce5 100644 --- a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp @@ -146,7 +146,7 @@ public: } uint32 format; - SDL_QueryTexture(_screenTexture, &format, 0, 0, 0); + SDL_QueryTexture(_screenTexture, &format, nullptr, nullptr, nullptr); _screenTextureFormat = SDL_AllocFormat(format); ConfigureBits(width, height, width); diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp index 5fbb3ed07f..8de27007f7 100644 --- a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp @@ -136,7 +136,7 @@ private: size_t _bitsSize = 0; uint8 * _bits = nullptr; - rct_drawpixelinfo _bitsDPI = { 0 }; + rct_drawpixelinfo _bitsDPI = { nullptr }; OpenGLDrawingContext * _drawingContext; diff --git a/src/openrct2-ui/input/Input.cpp b/src/openrct2-ui/input/Input.cpp index ad2b0a73fc..5157fd1590 100644 --- a/src/openrct2-ui/input/Input.cpp +++ b/src/openrct2-ui/input/Input.cpp @@ -81,11 +81,11 @@ static void game_handle_key_scroll() sint32 scrollX, scrollY; mainWindow = window_get_main(); - if (mainWindow == NULL) + if (mainWindow == nullptr) return; if ((mainWindow->flags & WF_NO_SCROLLING) || (gScreenFlags & (SCREEN_FLAGS_TRACK_MANAGER | SCREEN_FLAGS_TITLE_DEMO))) return; - if (mainWindow->viewport == NULL) + if (mainWindow->viewport == nullptr) return; rct_window * textWindow; @@ -200,7 +200,7 @@ void input_handle_keyboard(bool isTitle) key |= gInputPlaceObjectModifier << 8; rct_window * w = window_find_by_class(WC_TEXTINPUT); - if (w != NULL) + if (w != nullptr) { char keychar = input_scancode_to_rct_keycode(key & 0xFF); window_text_input_key(w, keychar); @@ -208,7 +208,7 @@ void input_handle_keyboard(bool isTitle) else if (!gUsingWidgetTextBox) { w = window_find_by_class(WC_CHANGE_KEYBOARD_SHORTCUT); - if (w != NULL) + if (w != nullptr) { keyboard_shortcuts_set(key); window_close_by_class(WC_CHANGE_KEYBOARD_SHORTCUT); diff --git a/src/openrct2-ui/input/KeyboardShortcut.cpp b/src/openrct2-ui/input/KeyboardShortcut.cpp index d0de23af73..08f82ea177 100644 --- a/src/openrct2-ui/input/KeyboardShortcut.cpp +++ b/src/openrct2-ui/input/KeyboardShortcut.cpp @@ -64,7 +64,7 @@ void keyboard_shortcut_handle_command(sint32 shortcutIndex) if (shortcutIndex >= 0 && static_cast(shortcutIndex) < Util::CountOf(shortcut_table)) { shortcut_action action = shortcut_table[shortcutIndex]; - if (action != NULL) + if (action != nullptr) { action(); } @@ -78,7 +78,7 @@ static void toggle_view_flag(sint32 viewportFlag) rct_window * window; window = window_get_main(); - if (window != NULL) + if (window != nullptr) { window->viewport->flags ^= viewportFlag; window_invalidate(window); @@ -104,7 +104,7 @@ static void shortcut_cancel_construction_mode() return; rct_window * window = window_find_by_class(WC_ERROR); - if (window != NULL) + if (window != nullptr) window_close(window); else if (input_test_flag(INPUT_FLAG_TOOL_ACTIVE)) tool_cancel(); @@ -115,7 +115,7 @@ static void shortcut_pause_game() if (!(gScreenFlags & (SCREEN_FLAGS_TITLE_DEMO | SCREEN_FLAGS_SCENARIO_EDITOR | SCREEN_FLAGS_TRACK_MANAGER))) { rct_window * window = window_find_by_class(WC_TOP_TOOLBAR); - if (window != NULL) + if (window != nullptr) { window_invalidate(window); window_event_mouse_up_call(window, WC_TOP_TOOLBAR__WIDX_PAUSE); @@ -158,7 +158,7 @@ static void shortcut_rotate_construction_object() // Rotate scenery rct_window * w = window_find_by_class(WC_SCENERY); - if (w != NULL && !widget_is_disabled(w, WC_SCENERY__WIDX_SCENERY_ROTATE_OBJECTS_BUTTON) && + if (w != nullptr && !widget_is_disabled(w, WC_SCENERY__WIDX_SCENERY_ROTATE_OBJECTS_BUTTON) && w->widgets[WC_SCENERY__WIDX_SCENERY_ROTATE_OBJECTS_BUTTON].type != WWT_EMPTY) { window_event_mouse_up_call(w, WC_SCENERY__WIDX_SCENERY_ROTATE_OBJECTS_BUTTON); @@ -167,7 +167,7 @@ static void shortcut_rotate_construction_object() // Rotate construction track piece w = window_find_by_class(WC_RIDE_CONSTRUCTION); - if (w != NULL && !widget_is_disabled(w, WC_RIDE_CONSTRUCTION__WIDX_ROTATE) && + if (w != nullptr && !widget_is_disabled(w, WC_RIDE_CONSTRUCTION__WIDX_ROTATE) && w->widgets[WC_RIDE_CONSTRUCTION__WIDX_ROTATE].type != WWT_EMPTY) { // Check if building a maze... @@ -180,7 +180,7 @@ static void shortcut_rotate_construction_object() // Rotate track design preview w = window_find_by_class(WC_TRACK_DESIGN_LIST); - if (w != NULL && !widget_is_disabled(w, WC_TRACK_DESIGN_LIST__WIDX_ROTATE) && + if (w != nullptr && !widget_is_disabled(w, WC_TRACK_DESIGN_LIST__WIDX_ROTATE) && w->widgets[WC_TRACK_DESIGN_LIST__WIDX_ROTATE].type != WWT_EMPTY) { window_event_mouse_up_call(w, WC_TRACK_DESIGN_LIST__WIDX_ROTATE); @@ -189,7 +189,7 @@ static void shortcut_rotate_construction_object() // Rotate track design placement w = window_find_by_class(WC_TRACK_DESIGN_PLACE); - if (w != NULL && !widget_is_disabled(w, WC_TRACK_DESIGN_PLACE__WIDX_ROTATE) && + if (w != nullptr && !widget_is_disabled(w, WC_TRACK_DESIGN_PLACE__WIDX_ROTATE) && w->widgets[WC_TRACK_DESIGN_PLACE__WIDX_ROTATE].type != WWT_EMPTY) { window_event_mouse_up_call(w, WC_TRACK_DESIGN_PLACE__WIDX_ROTATE); @@ -198,7 +198,7 @@ static void shortcut_rotate_construction_object() // Rotate park entrance w = window_find_by_class(WC_MAP); - if (w != NULL && !widget_is_disabled(w, WC_MAP__WIDX_ROTATE_90) && w->widgets[WC_MAP__WIDX_ROTATE_90].type != WWT_EMPTY) + if (w != nullptr && !widget_is_disabled(w, WC_MAP__WIDX_ROTATE_90) && w->widgets[WC_MAP__WIDX_ROTATE_90].type != WWT_EMPTY) { window_event_mouse_up_call(w, WC_MAP__WIDX_ROTATE_90); return; @@ -233,7 +233,7 @@ static void shortcut_remove_top_bottom_toolbar_toggle() { if (gScreenFlags & SCREEN_FLAGS_TITLE_DEMO) { - if (window_find_by_class(WC_TITLE_LOGO) != NULL) + if (window_find_by_class(WC_TITLE_LOGO) != nullptr) { window_close(window_find_by_class(WC_TITLE_LOGO)); window_close(window_find_by_class(WC_TITLE_OPTIONS)); @@ -248,7 +248,7 @@ static void shortcut_remove_top_bottom_toolbar_toggle() } else { - if (window_find_by_class(WC_TOP_TOOLBAR) != NULL) + if (window_find_by_class(WC_TOP_TOOLBAR) != nullptr) { window_close(window_find_by_class(WC_DROPDOWN)); window_close(window_find_by_class(WC_TOP_TOOLBAR)); @@ -353,7 +353,7 @@ static void shortcut_adjust_land() if (!(gScreenFlags & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER))) { rct_window * window = window_find_by_class(WC_TOP_TOOLBAR); - if (window != NULL) + if (window != nullptr) { window_invalidate(window); window_event_mouse_up_call(window, WC_TOP_TOOLBAR__WIDX_LAND); @@ -372,7 +372,7 @@ static void shortcut_adjust_water() if (!(gScreenFlags & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER))) { rct_window * window = window_find_by_class(WC_TOP_TOOLBAR); - if (window != NULL) + if (window != nullptr) { window_invalidate(window); window_event_mouse_up_call(window, WC_TOP_TOOLBAR__WIDX_WATER); @@ -391,7 +391,7 @@ static void shortcut_build_scenery() if (!(gScreenFlags & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER))) { rct_window * window = window_find_by_class(WC_TOP_TOOLBAR); - if (window != NULL) + if (window != nullptr) { window_invalidate(window); window_event_mouse_up_call(window, WC_TOP_TOOLBAR__WIDX_SCENERY); @@ -410,7 +410,7 @@ static void shortcut_build_paths() if (!(gScreenFlags & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER))) { rct_window * window = window_find_by_class(WC_TOP_TOOLBAR); - if (window != NULL) + if (window != nullptr) { window_invalidate(window); window_event_mouse_up_call(window, WC_TOP_TOOLBAR__WIDX_PATH); @@ -547,7 +547,7 @@ static void shortcut_open_cheat_window() // Check if window is already open rct_window * window = window_find_by_class(WC_CHEATS); - if (window != NULL) + if (window != nullptr) { window_close(window); return; @@ -565,7 +565,7 @@ static void shortcut_clear_scenery() if (!(gScreenFlags & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER))) { rct_window * window = window_find_by_class(WC_TOP_TOOLBAR); - if (window != NULL) + if (window != nullptr) { window_invalidate(window); window_event_mouse_up_call(window, WC_TOP_TOOLBAR__WIDX_CLEAR_SCENERY); @@ -631,7 +631,7 @@ static void shortcut_orginal_painting_toggle() static void shortcut_debug_paint_toggle() { rct_window * window = window_find_by_class(WC_DEBUG_PAINT); - if (window != NULL) + if (window != nullptr) { window_close(window); } @@ -788,10 +788,10 @@ namespace shortcut_increase_game_speed, shortcut_open_cheat_window, shortcut_remove_top_bottom_toolbar_toggle, - NULL, - NULL, - NULL, - NULL, + nullptr, + nullptr, + nullptr, + nullptr, shortcut_open_chat_window, shortcut_quick_save_game, shortcut_show_options, diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index 004640f711..ab20a1736c 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -153,7 +153,7 @@ void game_handle_input() static sint32 game_get_next_input(sint32 * x, sint32 * y) { rct_mouse_data * input = get_mouse_input(); - if (input == NULL) + if (input == nullptr) { const CursorState * cursorState = context_get_cursor_state(); *x = cursorState->x; @@ -177,7 +177,7 @@ static rct_mouse_data * get_mouse_input() // Check if that location has been written to yet if (_mouseInputQueueReadIndex == _mouseInputQueueWriteIndex) { - return NULL; + return nullptr; } else { @@ -255,7 +255,7 @@ static void input_scroll_drag_continue(sint32 x, sint32 y, rct_window * w) static void input_scroll_right(sint32 x, sint32 y, sint32 state) { rct_window * w = window_find_by_number(_dragWidget.window_classification, _dragWidget.window_number); - if (w == NULL) + if (w == nullptr) { context_show_cursor(); _inputState = INPUT_STATE_RESET; @@ -291,8 +291,8 @@ static void game_handle_input_mouse(sint32 x, sint32 y, sint32 state) // Get window and widget under cursor position w = window_find_from_point(x, y); - widgetIndex = w == NULL ? -1 : window_find_widget_from_point(w, x, y); - widget = widgetIndex == -1 ? 0 : &w->widgets[widgetIndex]; + widgetIndex = w == nullptr ? -1 : window_find_widget_from_point(w, x, y); + widget = widgetIndex == -1 ? nullptr : &w->widgets[widgetIndex]; switch (_inputState) { @@ -311,7 +311,7 @@ static void game_handle_input_mouse(sint32 x, sint32 y, sint32 state) case MOUSE_STATE_RIGHT_PRESS: window_close_by_class(WC_TOOLTIP); - if (w != NULL) + if (w != nullptr) { w = window_bring_to_front(w); } @@ -339,7 +339,7 @@ static void game_handle_input_mouse(sint32 x, sint32 y, sint32 state) break; case INPUT_STATE_POSITIONING_WINDOW: w = window_find_by_number(_dragWidget.window_classification, _dragWidget.window_number); - if (w == NULL) + if (w == nullptr) { _inputState = INPUT_STATE_RESET; } @@ -372,7 +372,7 @@ static void game_handle_input_mouse(sint32 x, sint32 y, sint32 state) break; case INPUT_STATE_VIEWPORT_LEFT: w = window_find_by_number(_dragWidget.window_classification, _dragWidget.window_number); - if (w == NULL) + if (w == nullptr) { _inputState = INPUT_STATE_RESET; break; @@ -381,7 +381,7 @@ static void game_handle_input_mouse(sint32 x, sint32 y, sint32 state) switch (state) { case MOUSE_STATE_RELEASED: - if (w->viewport == NULL) + if (w->viewport == nullptr) { _inputState = INPUT_STATE_RESET; break; @@ -394,7 +394,7 @@ static void game_handle_input_mouse(sint32 x, sint32 y, sint32 state) } w = window_find_by_number(gCurrentToolWidget.window_classification, gCurrentToolWidget.window_number); - if (w == NULL) + if (w == nullptr) { break; } @@ -408,7 +408,7 @@ static void game_handle_input_mouse(sint32 x, sint32 y, sint32 state) if ((_inputFlags & INPUT_FLAG_TOOL_ACTIVE)) { w = window_find_by_number(gCurrentToolWidget.window_classification, gCurrentToolWidget.window_number); - if (w != NULL) + if (w != nullptr) { window_event_tool_up_call(w, gCurrentToolWidget.widget_index, x, y); } @@ -434,7 +434,7 @@ static void game_handle_input_mouse(sint32 x, sint32 y, sint32 state) break; case INPUT_STATE_RESIZING: w = window_find_by_number(_dragWidget.window_classification, _dragWidget.window_number); - if (w == NULL) + if (w == nullptr) { _inputState = INPUT_STATE_RESET; } @@ -549,7 +549,7 @@ static void input_viewport_drag_continue() // #3294: Window can be closed during a drag session, so just finish // the session if the window no longer exists - if (w == NULL) + if (w == nullptr) { input_viewport_drag_end(); return; @@ -557,7 +557,7 @@ static void input_viewport_drag_continue() viewport = w->viewport; _ticksSinceDragStart += gTicksSinceLastUpdate; - if (viewport == NULL) + if (viewport == nullptr) { context_show_cursor(); _inputState = INPUT_STATE_RESET; @@ -916,9 +916,9 @@ static void input_widget_over(sint32 x, sint32 y, rct_window * w, rct_widgetinde { rct_windowclass windowClass = WC_NULL; rct_windownumber windowNumber = 0; - rct_widget * widget = NULL; + rct_widget * widget = nullptr; - if (w != NULL) + if (w != nullptr) { windowClass = w->classification; windowNumber = w->number; @@ -927,7 +927,7 @@ static void input_widget_over(sint32 x, sint32 y, rct_window * w, rct_widgetinde input_widget_over_change_check(windowClass, windowNumber, widgetIndex); - if (w != NULL && widgetIndex != -1 && widget->type == WWT_SCROLL) + if (w != nullptr && widgetIndex != -1 && widget->type == WWT_SCROLL) { sint32 eax, ebx, scroll_part, edx; widget_scroll_get_part(w, widget, x, y, &eax, &ebx, &scroll_part, &edx); @@ -986,7 +986,7 @@ static void input_widget_over_change_check(rct_windowclass windowClass, rct_wind static void input_widget_over_flatbutton_invalidate() { rct_window * w = window_find_by_number(gHoverWidget.window_classification, gHoverWidget.window_number); - if (w != NULL) + if (w != nullptr) { window_event_invalidate_call(w); if (w->widgets[gHoverWidget.widget_index].type == WWT_FLATBTN) @@ -1007,7 +1007,7 @@ static void input_widget_left(sint32 x, sint32 y, rct_window * w, rct_widgetinde rct_windownumber windowNumber = 0; rct_widget * widget; - if (w != NULL) + if (w != nullptr) { windowClass = w->classification; windowNumber = w->number; @@ -1018,7 +1018,7 @@ static void input_widget_left(sint32 x, sint32 y, rct_window * w, rct_widgetinde // Window might have changed position in the list, therefore find it again w = window_find_by_number(windowClass, windowNumber); - if (w == NULL) + if (w == nullptr) return; w = window_bring_to_front(w); @@ -1049,7 +1049,7 @@ static void input_widget_left(sint32 x, sint32 y, rct_window * w, rct_widgetinde if (_inputFlags & INPUT_FLAG_TOOL_ACTIVE) { w = window_find_by_number(gCurrentToolWidget.window_classification, gCurrentToolWidget.window_number); - if (w != NULL) + if (w != nullptr) { window_event_tool_down_call(w, gCurrentToolWidget.widget_index, x, y); _inputFlags |= INPUT_FLAG_4; @@ -1098,7 +1098,7 @@ void process_mouse_over(sint32 x, sint32 y) set_map_tooltip_format_arg(0, rct_string_id, STR_NONE); window = window_find_from_point(x, y); - if (window != NULL) + if (window != nullptr) { sint32 ebx, edi; rct_window * subWindow; @@ -1120,7 +1120,7 @@ void process_mouse_over(sint32 x, sint32 y) } cursorId = gCurrentToolId; subWindow = window_find_by_number(gCurrentToolWidget.window_classification, gCurrentToolWidget.window_number); - if (subWindow == NULL) + if (subWindow == nullptr) break; ebx = 0; @@ -1214,7 +1214,7 @@ void input_state_widget_pressed(sint32 x, sint32 y, sint32 state, rct_widgetinde rct_widgetindex cursor_widgetIndex = gPressedWidget.widget_index; rct_window * cursor_w = window_find_by_number(cursor_w_class, cursor_w_number); - if (cursor_w == NULL) + if (cursor_w == nullptr) { _inputState = INPUT_STATE_RESET; return; @@ -1371,7 +1371,7 @@ void input_state_widget_pressed(sint32 x, sint32 y, sint32 state, rct_widgetinde gDropdownHighlightedIndex = -1; window_invalidate_by_class(WC_DROPDOWN); - if (w == NULL) + if (w == nullptr) { return; } @@ -1465,7 +1465,7 @@ static void input_update_tooltip(rct_window * w, rct_widgetindex widgetIndex, si { reset_tooltip_not_shown(); - if (w == NULL || gTooltipWidget.window_classification != w->classification || + if (w == nullptr || gTooltipWidget.window_classification != w->classification || gTooltipWidget.window_number != w->number || gTooltipWidget.widget_index != widgetIndex) { window_tooltip_close(); @@ -1524,7 +1524,7 @@ void set_cursor(uint8 cursor_id) void invalidate_scroll() { rct_window * w = window_find_by_number(gPressedWidget.window_classification, gPressedWidget.window_number); - if (w != NULL) + if (w != nullptr) { // Reset to basic scroll w->scrolls[_currentScrollIndex].flags &= 0xFF11; @@ -1558,11 +1558,11 @@ void game_handle_edge_scroll() sint32 scrollX, scrollY; mainWindow = window_get_main(); - if (mainWindow == NULL) + if (mainWindow == nullptr) return; if ((mainWindow->flags & WF_NO_SCROLLING) || (gScreenFlags & (SCREEN_FLAGS_TRACK_MANAGER | SCREEN_FLAGS_TITLE_DEMO))) return; - if (mainWindow->viewport == NULL) + if (mainWindow->viewport == nullptr) return; if (!context_has_focus()) return; diff --git a/src/openrct2-ui/windows/EditorBottomToolbar.cpp b/src/openrct2-ui/windows/EditorBottomToolbar.cpp index 7738866745..9e443f5f81 100644 --- a/src/openrct2-ui/windows/EditorBottomToolbar.cpp +++ b/src/openrct2-ui/windows/EditorBottomToolbar.cpp @@ -435,7 +435,7 @@ void window_editor_bottom_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi) window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].left) / 2 + w->x; sint16 stateY = w->height - 0x0C + w->y; gfx_draw_string_centred(dpi, EditorStepNames[gS6Info.editor_step], - stateX, stateY, NOT_TRANSLUCENT(w->colours[2]) | COLOUR_FLAG_OUTLINE, 0); + stateX, stateY, NOT_TRANSLUCENT(w->colours[2]) | COLOUR_FLAG_OUTLINE, nullptr); if (drawPreviousButton) { gfx_draw_sprite(dpi, SPR_PREVIOUS, diff --git a/src/openrct2-ui/windows/InstallTrack.cpp b/src/openrct2-ui/windows/InstallTrack.cpp index c222470eba..7ac63c1b03 100644 --- a/src/openrct2-ui/windows/InstallTrack.cpp +++ b/src/openrct2-ui/windows/InstallTrack.cpp @@ -228,7 +228,7 @@ static void window_install_track_paint(rct_window *w, rct_drawpixelinfo *dpi) sint32 colour = ColourMapA[w->colours[0]].darkest; gfx_fill_rect(dpi, x, y, x + 369, y + 216, colour); - rct_g1_element g1temp = { 0 }; + rct_g1_element g1temp = { nullptr }; g1temp.offset = _trackDesignPreviewPixels + (_currentTrackPieceDirection * TRACK_PREVIEW_IMAGE_SIZE); g1temp.width = 370; g1temp.height = 217; diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 9f6fd5df31..326d16a4ab 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -888,7 +888,7 @@ static void window_map_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 { gfx_clear(dpi, PALETTE_INDEX_10); - rct_g1_element g1temp = { 0 }; + rct_g1_element g1temp = { nullptr }; g1temp.offset = (uint8 *)_mapImageData; g1temp.width = MAP_WINDOW_MAP_SIZE; g1temp.height = MAP_WINDOW_MAP_SIZE; diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp index d93d80e45d..d89ba224be 100644 --- a/src/openrct2-ui/windows/Sign.cpp +++ b/src/openrct2-ui/windows/Sign.cpp @@ -368,7 +368,7 @@ static void window_sign_paint(rct_window *w, rct_drawpixelinfo *dpi) static void window_sign_viewport_rotate(rct_window *w) { rct_viewport* view = w->viewport; - w->viewport = 0; + w->viewport = nullptr; view->width = 0; viewport_update_pointers(); diff --git a/src/openrct2-ui/windows/TitleCommandEditor.cpp b/src/openrct2-ui/windows/TitleCommandEditor.cpp index 72c33454e0..d919044eca 100644 --- a/src/openrct2-ui/windows/TitleCommandEditor.cpp +++ b/src/openrct2-ui/windows/TitleCommandEditor.cpp @@ -775,7 +775,7 @@ static void window_title_command_editor_paint(rct_window * w, rct_drawpixelinfo w->widgets[WIDX_COMMAND_DROPDOWN].left - w->widgets[WIDX_COMMAND].left - 4); // Label (e.g. "Location:") - gfx_draw_string_left(dpi, command_info.descStringId, NULL, w->colours[1], w->x + WS, w->y + BY2 - 14); + gfx_draw_string_left(dpi, command_info.descStringId, nullptr, w->colours[1], w->x + WS, w->y + BY2 - 14); if (command.Type == TITLE_SCRIPT_SPEED) { diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index 72dab83bda..3e52c5a457 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -467,7 +467,7 @@ static void window_track_place_paint(rct_window *w, rct_drawpixelinfo *dpi) // Draw mini tile preview rct_drawpixelinfo clippedDpi; if (clip_drawpixelinfo(&clippedDpi, dpi, w->x + 4, w->y + 18, 168, 78)) { - rct_g1_element g1temp = { 0 }; + rct_g1_element g1temp = { nullptr }; g1temp.offset = _window_track_place_mini_preview; g1temp.width = TRACK_MINI_PREVIEW_WIDTH; g1temp.height = TRACK_MINI_PREVIEW_HEIGHT; diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp index 7197b6ded2..7cd3844110 100644 --- a/src/openrct2-ui/windows/TrackList.cpp +++ b/src/openrct2-ui/windows/TrackList.cpp @@ -537,7 +537,7 @@ static void window_track_list_paint(rct_window *w, rct_drawpixelinfo *dpi) return; } - rct_g1_element g1temp = { 0 }; + rct_g1_element g1temp = { nullptr }; g1temp.offset = _trackDesignPreviewPixels + (_currentTrackPieceDirection * TRACK_PREVIEW_IMAGE_SIZE); g1temp.width = 370; g1temp.height = 217; diff --git a/src/openrct2/Cheats.cpp b/src/openrct2/Cheats.cpp index 27afd7cdaa..d4aa33bb25 100644 --- a/src/openrct2/Cheats.cpp +++ b/src/openrct2/Cheats.cpp @@ -156,7 +156,7 @@ static void cheat_fix_rides() { mechanic = ride_get_assigned_mechanic(ride); - if (mechanic != NULL){ + if (mechanic != nullptr){ remove_peep_from_ride(mechanic); } diff --git a/src/openrct2/CmdlineSprite.cpp b/src/openrct2/CmdlineSprite.cpp index b616964f88..76ec7f450a 100644 --- a/src/openrct2/CmdlineSprite.cpp +++ b/src/openrct2/CmdlineSprite.cpp @@ -97,7 +97,7 @@ static void sprite_entries_make_relative() static bool sprite_file_open(const utf8 *path) { FILE * file = fopen(path, "rb"); - if (file == NULL) + if (file == nullptr) return false; if (fread(&spriteFileHeader, sizeof(rct_sprite_file_header), 1, file) != 1) { @@ -108,7 +108,7 @@ static bool sprite_file_open(const utf8 *path) if (spriteFileHeader.num_entries > 0) { sint32 openEntryTableSize = spriteFileHeader.num_entries * sizeof(rct_g1_element_32bit); rct_g1_element_32bit * openElements = (rct_g1_element_32bit *)malloc(openEntryTableSize); - if (openElements == NULL) { + if (openElements == nullptr) { fclose(file); return false; } @@ -152,7 +152,7 @@ static bool sprite_file_open(const utf8 *path) static bool sprite_file_save(const char *path) { FILE * file = fopen(path, "wb"); - if (file == NULL) + if (file == nullptr) return false; if (fwrite(&spriteFileHeader, sizeof(rct_sprite_file_header), 1, file) != 1) { @@ -163,7 +163,7 @@ static bool sprite_file_save(const char *path) if (spriteFileHeader.num_entries > 0) { sint32 saveEntryTableSize = spriteFileHeader.num_entries * sizeof(rct_g1_element_32bit); rct_g1_element_32bit * saveElements = (rct_g1_element_32bit *)malloc(saveEntryTableSize); - if (saveElements == NULL) { + if (saveElements == nullptr) { fclose(file); return false; } @@ -229,7 +229,7 @@ static bool sprite_file_export(sint32 spriteIndex, const char *outPath) if (spriteHeader->flags & G1_FLAG_RLE_COMPRESSION) { gfx_rle_sprite_to_buffer(spriteHeader->offset, pixels, (uint8*)spriteFilePalette, &dpi, IMAGE_TYPE_DEFAULT, 0, spriteHeader->height, 0, spriteHeader->width); } else { - gfx_bmp_sprite_to_buffer((uint8*)spriteFilePalette, NULL, spriteHeader->offset, pixels, spriteHeader, &dpi, spriteHeader->height, spriteHeader->width, IMAGE_TYPE_DEFAULT); + gfx_bmp_sprite_to_buffer((uint8*)spriteFilePalette, nullptr, spriteHeader->offset, pixels, spriteHeader, &dpi, spriteHeader->height, spriteHeader->width, IMAGE_TYPE_DEFAULT); } if (image_io_png_write(&dpi, (rct_palette*)spriteFilePalette, outPath)) { @@ -330,7 +330,7 @@ static bool sprite_file_import(const char *path, sint16 x_offset, sint16 y_offse // A larger range is needed for proper dithering uint8 *palettedSrc = pixels; - sint16 *rgbaSrc = keep_palette? 0 : (sint16 *)malloc(height * width * 4 * 2); + sint16 *rgbaSrc = keep_palette? nullptr : (sint16 *)malloc(height * width * 4 * 2); sint16 *rgbaSrc_orig = rgbaSrc; if (!keep_palette) { @@ -347,7 +347,7 @@ static bool sprite_file_import(const char *path, sint16 x_offset, sint16 y_offse yOffsets[y] = (uint16)(dst - buffer); - previousCode = NULL; + previousCode = nullptr; currentCode = (rle_code*)dst; dst += 2; sint32 startX = 0; @@ -478,7 +478,7 @@ static bool sprite_file_import(const char *path, sint16 x_offset, sint16 y_offse } else { - if (previousCode == NULL) + if (previousCode == nullptr) { currentCode->num_pixels = 0x80; currentCode->offset_x = 0; @@ -743,7 +743,7 @@ sint32 cmdline_for_sprite(const char **argv, sint32 argc) json_error_t error; json_t* sprite_list=json_load_file(spriteDescriptionPath, JSON_REJECT_DUPLICATES, &error); - if (sprite_list == NULL) + if (sprite_list == nullptr) { fprintf(stderr, "Error parsing sprite description file: %s at line %d column %d\n", error.text, error.line, error.column); return -1; @@ -807,8 +807,8 @@ sint32 cmdline_for_sprite(const char **argv, sint32 argc) int bufferLength; if (!sprite_file_import(imagePath, - x_offset == NULL ? 0 : json_integer_value(x_offset), - y_offset == NULL ? 0 : json_integer_value(y_offset), + x_offset == nullptr ? 0 : json_integer_value(x_offset), + y_offset == nullptr ? 0 : json_integer_value(y_offset), keep_palette, &spriteElement, &buffer, &bufferLength, gSpriteMode)) { fprintf(stderr, "Could not import image file: %s\nCanceling\n", imagePath); diff --git a/src/openrct2/Intro.cpp b/src/openrct2/Intro.cpp index 3452a6377d..cf2c17cac0 100644 --- a/src/openrct2/Intro.cpp +++ b/src/openrct2/Intro.cpp @@ -33,7 +33,7 @@ uint8 gIntroState; // Used mainly for timing but also for Y coordinate and fading. static sint32 _introStateCounter; -static void *_soundChannel = NULL; +static void *_soundChannel = nullptr; static bool _chainLiftFinished; static void screen_intro_process_mouse_input(); @@ -88,9 +88,9 @@ void intro_update() _chainLiftFinished = true; // Stop the chain lift sound - if (_soundChannel != NULL) { + if (_soundChannel != nullptr) { Mixer_Stop_Channel(_soundChannel); - _soundChannel = NULL; + _soundChannel = nullptr; } // Play the track friction sound @@ -100,9 +100,9 @@ void intro_update() // Check if logo is off the screen...ish if (_introStateCounter >= context_get_height() + 40) { // Stop the track friction sound - if (_soundChannel != NULL) { + if (_soundChannel != nullptr) { Mixer_Stop_Channel(_soundChannel); - _soundChannel = NULL; + _soundChannel = nullptr; } // Play long peep scream sound @@ -139,9 +139,9 @@ void intro_update() break; case INTRO_STATE_CLEAR: // Stop any playing sound - if (_soundChannel != NULL) { + if (_soundChannel != nullptr) { Mixer_Stop_Channel(_soundChannel); - _soundChannel = NULL; + _soundChannel = nullptr; } // Move to next part diff --git a/src/openrct2/drawing/Image.cpp b/src/openrct2/drawing/Image.cpp index d8085db40e..199641e914 100644 --- a/src/openrct2/drawing/Image.cpp +++ b/src/openrct2/drawing/Image.cpp @@ -237,7 +237,7 @@ extern "C" for (uint32 i = 0; i < count; i++) { uint32 imageId = baseImageId + i; - rct_g1_element g1 = { 0 }; + rct_g1_element g1 = { nullptr }; gfx_set_g1_element(imageId, &g1); drawing_engine_invalidate_image(imageId); } diff --git a/src/openrct2/drawing/Sprite.cpp b/src/openrct2/drawing/Sprite.cpp index eeb2c98621..e00ed9927d 100644 --- a/src/openrct2/drawing/Sprite.cpp +++ b/src/openrct2/drawing/Sprite.cpp @@ -186,7 +186,7 @@ extern "C" static size_t _g1ElementsCount = 0; static rct_g1_element * _g1Elements = nullptr; - static rct_g1_element _g1Temp = { 0 }; + static rct_g1_element _g1Temp = { nullptr }; bool gTinyFontAntiAliased = false; /** diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 2777a760af..4c6b7006cf 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -670,7 +670,7 @@ void Network::CheckDesynchronizaton() _desynchronised = true; char str_desync[256]; - format_string(str_desync, 256, STR_MULTIPLAYER_DESYNC, NULL); + format_string(str_desync, 256, STR_MULTIPLAYER_DESYNC, nullptr); auto intent = Intent(WC_NETWORK_STATUS); intent.putExtra(INTENT_EXTRA_MESSAGE, std::string { str_desync }); diff --git a/src/openrct2/object/ObjectList.cpp b/src/openrct2/object/ObjectList.cpp index 3239d1c916..8dda72d32b 100644 --- a/src/openrct2/object/ObjectList.cpp +++ b/src/openrct2/object/ObjectList.cpp @@ -136,7 +136,7 @@ sint32 find_object_in_entry_group(const rct_object_entry* entry, uint8* entry_ty entry_group.chunks++, entry_group.entries++){ - if (*entry_group.chunks == NULL) continue; + if (*entry_group.chunks == nullptr) continue; if (object_entry_compare((rct_object_entry*)entry_group.entries, entry))break; } @@ -158,8 +158,8 @@ void get_type_entry_index(size_t index, uint8 * outObjectType, uint8 * outEntryI } } - if (outObjectType != NULL) *outObjectType = objectType; - if (outEntryIndex != NULL) *outEntryIndex = (uint8)index; + if (outObjectType != nullptr) *outObjectType = objectType; + if (outEntryIndex != nullptr) *outEntryIndex = (uint8)index; } const rct_object_entry * get_loaded_object_entry(size_t index) diff --git a/src/openrct2/paint/Supports.cpp b/src/openrct2/paint/Supports.cpp index 2c58076def..098b975d06 100644 --- a/src/openrct2/paint/Supports.cpp +++ b/src/openrct2/paint/Supports.cpp @@ -343,7 +343,7 @@ extern bool gUseOriginalRidePaint; */ bool wooden_a_supports_paint_setup(paint_session * session, sint32 supportType, sint32 special, sint32 height, uint32 imageColourFlags, bool* underground) { - if (underground != NULL){ + if (underground != nullptr){ *underground = false; } @@ -358,7 +358,7 @@ bool wooden_a_supports_paint_setup(paint_session * session, sint32 supportType, sint32 z = floor2(session->Support.height + 15, 16); height -= z; if (height < 0) { - if (underground != NULL) { + if (underground != nullptr) { *underground = true; } return false; @@ -378,7 +378,7 @@ bool wooden_a_supports_paint_setup(paint_session * session, sint32 supportType, // Steep diagonal (place the correct shaped support for the slope) height -= 2; if (height < 0) { - if (underground != NULL) { + if (underground != nullptr) { *underground = true; } return false; @@ -401,7 +401,7 @@ bool wooden_a_supports_paint_setup(paint_session * session, sint32 supportType, // 1 to 3 quarters up height--; if (height < 0) { - if (underground != NULL) { + if (underground != nullptr) { *underground = true; } return false; @@ -459,13 +459,13 @@ bool wooden_a_supports_paint_setup(paint_session * session, sint32 supportType, unk_supports_desc_bound_box bBox = byte_97B23C[special].bounding_box; - if (byte_97B23C[special].var_6 == 0 || session->WoodenSupportsPrependTo == NULL) { + if (byte_97B23C[special].var_6 == 0 || session->WoodenSupportsPrependTo == nullptr) { sub_98197C(session, imageId, 0, 0, bBox.length.x, bBox.length.y, bBox.length.z, z, bBox.offset.x, bBox.offset.y, bBox.offset.z + z, rotation); hasSupports = true; } else { hasSupports = true; paint_struct* ps = sub_98198C(session, imageId, 0, 0, bBox.length.x, bBox.length.y, bBox.length.z, z, bBox.offset.x, bBox.offset.y, bBox.offset.z + z, rotation); - if (ps != NULL) { + if (ps != nullptr) { paint_struct* edi = session->WoodenSupportsPrependTo; edi->var_20 = ps; } @@ -493,12 +493,12 @@ bool wooden_b_supports_paint_setup(paint_session * session, sint32 supportType, bool _9E32B1 = false; if (gCurrentViewportFlags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS) { - if (underground != NULL) *underground = false; // AND + if (underground != nullptr) *underground = false; // AND return false; } if (!(session->Unk141E9DB & G141E9DB_FLAG_1)) { - if (underground != NULL) *underground = false; // AND + if (underground != nullptr) *underground = false; // AND return false; } @@ -506,7 +506,7 @@ bool wooden_b_supports_paint_setup(paint_session * session, sint32 supportType, sint16 supportLength = height - baseHeight; if (supportLength < 0) { - if (underground != NULL) *underground = true; // STC + if (underground != nullptr) *underground = true; // STC return false; } @@ -519,7 +519,7 @@ bool wooden_b_supports_paint_setup(paint_session * session, sint32 supportType, } else if (session->Support.slope & 0x10) { heightSteps -= 2; if (heightSteps < 0) { - if (underground != NULL) *underground = true; // STC + if (underground != nullptr) *underground = true; // STC return false; } @@ -555,7 +555,7 @@ bool wooden_b_supports_paint_setup(paint_session * session, sint32 supportType, } else if ((session->Support.slope & 0x0F) != 0) { heightSteps -= 1; if (heightSteps < 0) { - if (underground != NULL) *underground = true; // STC + if (underground != nullptr) *underground = true; // STC return false; } @@ -635,7 +635,7 @@ bool wooden_b_supports_paint_setup(paint_session * session, sint32 supportType, unk_supports_desc_bound_box boundBox = supportsDesc.bounding_box; - if (supportsDesc.var_6 == 0 || session->WoodenSupportsPrependTo == NULL) { + if (supportsDesc.var_6 == 0 || session->WoodenSupportsPrependTo == nullptr) { sub_98197C(session, imageId | imageColourFlags, 0, 0, @@ -655,14 +655,14 @@ bool wooden_b_supports_paint_setup(paint_session * session, sint32 supportType, get_current_rotation() ); _9E32B1 = true; - if (paintStruct != NULL) { + if (paintStruct != nullptr) { session->WoodenSupportsPrependTo->var_20 = paintStruct; } } } } - if (underground != NULL) *underground = false; // AND + if (underground != nullptr) *underground = false; // AND return _9E32B1; } @@ -1049,7 +1049,7 @@ bool metal_b_supports_paint_setup(paint_session * session, uint8 supportType, ui bool path_a_supports_paint_setup(paint_session * session, sint32 supportType, sint32 special, sint32 height, uint32 imageColourFlags, rct_footpath_entry * pathEntry, bool * underground) { - if (underground != NULL) { + if (underground != nullptr) { *underground = false; // AND } @@ -1064,7 +1064,7 @@ bool path_a_supports_paint_setup(paint_session * session, sint32 supportType, si uint16 baseHeight = ceil2(session->Support.height, 16); sint32 supportLength = height - baseHeight; if (supportLength < 0) { - if (underground != NULL) *underground = true; // STC + if (underground != nullptr) *underground = true; // STC return false; } @@ -1085,7 +1085,7 @@ bool path_a_supports_paint_setup(paint_session * session, sint32 supportType, si } else if (session->Support.slope & 0x10) { heightSteps -= 2; if (heightSteps < 0) { - if (underground != NULL) *underground = true; // STC + if (underground != nullptr) *underground = true; // STC return false; } @@ -1116,7 +1116,7 @@ bool path_a_supports_paint_setup(paint_session * session, sint32 supportType, si } else if (session->Support.slope & 0x0F) { heightSteps -= 1; if (heightSteps < 0) { - if (underground != NULL) *underground = true; // STC + if (underground != nullptr) *underground = true; // STC return false; } @@ -1174,7 +1174,7 @@ bool path_a_supports_paint_setup(paint_session * session, sint32 supportType, si unk_supports_desc supportsDesc = byte_98D8D4[specialIndex]; unk_supports_desc_bound_box boundBox = supportsDesc.bounding_box; - if (supportsDesc.var_6 == 0 || session->WoodenSupportsPrependTo == NULL) { + if (supportsDesc.var_6 == 0 || session->WoodenSupportsPrependTo == nullptr) { sub_98197C(session, imageId | imageColourFlags, 0, 0, @@ -1194,13 +1194,13 @@ bool path_a_supports_paint_setup(paint_session * session, sint32 supportType, si get_current_rotation() ); hasSupports = true; - if (paintStruct != NULL) { + if (paintStruct != nullptr) { session->WoodenSupportsPrependTo->var_20 = paintStruct; } } } - if (underground != NULL) *underground = false; // AND + if (underground != nullptr) *underground = false; // AND return hasSupports; } diff --git a/src/openrct2/paint/tile_element/Banner.cpp b/src/openrct2/paint/tile_element/Banner.cpp index 8e3b84ea84..7bffd898fd 100644 --- a/src/openrct2/paint/tile_element/Banner.cpp +++ b/src/openrct2/paint/tile_element/Banner.cpp @@ -50,7 +50,7 @@ void banner_paint(paint_session * session, uint8 direction, sint32 height, rct_t rct_scenery_entry* banner_scenery = get_banner_entry(gBanners[tile_element->properties.banner.index].type); - if (banner_scenery == NULL) { + if (banner_scenery == nullptr) { return; } diff --git a/src/openrct2/paint/tile_element/Entrance.cpp b/src/openrct2/paint/tile_element/Entrance.cpp index 5e1f48058b..3218ca7d95 100644 --- a/src/openrct2/paint/tile_element/Entrance.cpp +++ b/src/openrct2/paint/tile_element/Entrance.cpp @@ -173,7 +173,7 @@ static void ride_entrance_exit_paint(paint_session * session, uint8 direction, s if (image_id == 0) { image_id = SPRITE_ID_PALETTE_COLOUR_1(COLOUR_SATURATED_BROWN); } - wooden_a_supports_paint_setup(session, direction & 1, 0, height, image_id, NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, image_id, nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -214,13 +214,13 @@ static void park_entrance_paint(paint_session * session, uint8 direction, sint32 switch (part_index){ case 0: - if (path_entry != NULL) { + if (path_entry != nullptr) { image_id = (path_entry->image + 5 * (1 + (direction & 1))) | ghost_id; sub_98197C(session, image_id, 0, 0, 32, 0x1C, 0, height, 0, 2, height, get_current_rotation()); } entrance = (rct_entrance_type*)object_entry_groups[OBJECT_TYPE_PARK_ENTRANCE].chunks[0]; - if (entrance == NULL) + if (entrance == nullptr) { return; } @@ -267,7 +267,7 @@ static void park_entrance_paint(paint_session * session, uint8 direction, sint32 case 1: case 2: entrance = (rct_entrance_type*)object_entry_groups[OBJECT_TYPE_PARK_ENTRANCE].chunks[0]; - if (entrance == NULL) + if (entrance == nullptr) { return; } @@ -280,7 +280,7 @@ static void park_entrance_paint(paint_session * session, uint8 direction, sint32 if (image_id == 0) { image_id = SPRITE_ID_PALETTE_COLOUR_1(COLOUR_SATURATED_BROWN); } - wooden_a_supports_paint_setup(session, direction & 1, 0, height, image_id, NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, image_id, nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 80, 0x20); diff --git a/src/openrct2/paint/tile_element/Fence.cpp b/src/openrct2/paint/tile_element/Fence.cpp index 1d648579cb..1b5f13b53a 100644 --- a/src/openrct2/paint/tile_element/Fence.cpp +++ b/src/openrct2/paint/tile_element/Fence.cpp @@ -68,24 +68,24 @@ static void fence_paint_door(paint_session * session, uint32 imageId, paint_struct * ps; ps = sub_98197C(session, imageId, (sint8) offset.x, (sint8) offset.y, boundsR1.x, boundsR1.y, (sint8) boundsR1.z, offset.z, boundsR1_.x, boundsR1_.y, boundsR1_.z, get_current_rotation()); - if (ps != NULL) { + if (ps != nullptr) { ps->tertiary_colour = tertiaryColour; } ps = sub_98197C(session, imageId + 1, (sint8) offset.x, (sint8) offset.y, boundsR2.x, boundsR2.y, (sint8) boundsR2.z, offset.z, boundsR2_.x, boundsR2_.y, boundsR2_.z, get_current_rotation()); - if (ps != NULL) { + if (ps != nullptr) { ps->tertiary_colour = tertiaryColour; } } else { paint_struct * ps; ps = sub_98197C(session, imageId, (sint8) offset.x, (sint8) offset.y, boundsL1.x, boundsL1.y, (sint8) boundsL1.z, offset.z, boundsL1_.x, boundsL1_.y, boundsL1_.z, get_current_rotation()); - if (ps != NULL) { + if (ps != nullptr) { ps->tertiary_colour = tertiaryColour; } ps = sub_98199C(session, imageId + 1, (sint8) offset.x, (sint8) offset.y, boundsL1.x, boundsL1.y, (sint8) boundsL1.z, offset.z, boundsL1_.x, boundsL1_.y, boundsL1_.z, get_current_rotation()); - if (ps != NULL) { + if (ps != nullptr) { ps->tertiary_colour = tertiaryColour; } } @@ -121,7 +121,7 @@ static void fence_paint_wall(paint_session * session, uint32 frameNum, const rct } paint_struct * paint = sub_98197C(session, imageId, (sint8)offset.x, (sint8)offset.y, bounds.x, bounds.y, (sint8)bounds.z, offset.z, boundsOffset.x, boundsOffset.y, boundsOffset.z, get_current_rotation()); - if (paint != NULL) { + if (paint != nullptr) { paint->tertiary_colour = tertiaryColour; } } @@ -137,7 +137,7 @@ void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_ti session->InteractionType = VIEWPORT_INTERACTION_ITEM_WALL; rct_scenery_entry * sceneryEntry = get_wall_entry(tile_element->properties.wall.type); - if (sceneryEntry == NULL) { + if (sceneryEntry == nullptr) { return; } uint32 frameNum = 0; diff --git a/src/openrct2/paint/tile_element/LargeScenery.cpp b/src/openrct2/paint/tile_element/LargeScenery.cpp index aa1966431f..423f4ade30 100644 --- a/src/openrct2/paint/tile_element/LargeScenery.cpp +++ b/src/openrct2/paint/tile_element/LargeScenery.cpp @@ -48,7 +48,7 @@ static void large_scenery_paint_supports(paint_session * session, uint8 directio supportImageColourFlags = dword_F4387C; } - wooden_b_supports_paint_setup(session, (direction & 1), ax, supportHeight, supportImageColourFlags, NULL); + wooden_b_supports_paint_setup(session, (direction & 1), ax, supportHeight, supportImageColourFlags, nullptr); sint32 clearanceHeight = ceil2(tileElement->clearance_height * 8 + 15, 16); @@ -190,7 +190,7 @@ void large_scenery_paint(paint_session * session, uint8 direction, uint16 height session->InteractionType = VIEWPORT_INTERACTION_ITEM_LARGE_SCENERY; uint32 sequenceNum = scenery_large_get_sequence(tileElement); rct_scenery_entry *entry = get_large_scenery_entry(scenery_large_get_type(tileElement)); - if (entry == NULL) + if (entry == nullptr) return; uint32 image_id = (sequenceNum << 2) + entry->image + 4 + direction; @@ -297,8 +297,8 @@ void large_scenery_paint(paint_session * session, uint8 direction, uint16 height utf8 str1[64] = {0}; utf8 *dst = str1; utf8 *srcold = src; - utf8 *spacesrc = 0; - utf8 *spacedst = 0; + utf8 *spacesrc = nullptr; + utf8 *spacedst = nullptr; sint32 w = 0; uint32 codepoint = utf8_get_next(src, (const utf8**)&src); do { @@ -307,7 +307,7 @@ void large_scenery_paint(paint_session * session, uint8 direction, uint16 height spacesrc = src; spacedst = dst; } - } while(w <= text->max_width && (dst = utf8_write_codepoint(dst, codepoint)) != NULL && (srcold = src) != NULL && (codepoint = utf8_get_next(src, (const utf8**)&src)) != '\0'); + } while(w <= text->max_width && (dst = utf8_write_codepoint(dst, codepoint)) != nullptr && (srcold = src) != nullptr && (codepoint = utf8_get_next(src, (const utf8**)&src)) != '\0'); src = srcold; if (spacesrc && codepoint) { *spacedst = 0; diff --git a/src/openrct2/paint/tile_element/Path.cpp b/src/openrct2/paint/tile_element/Path.cpp index 4b71de3a41..81fb3488c9 100644 --- a/src/openrct2/paint/tile_element/Path.cpp +++ b/src/openrct2/paint/tile_element/Path.cpp @@ -709,7 +709,7 @@ void path_paint(paint_session * session, uint8 direction, uint16 height, rct_til rct_tile_element * surface = map_get_surface_element_at(x / 32, y / 32); uint16 bl = height / 8; - if (surface == NULL) { + if (surface == nullptr) { word_F3F038 = true; } else if (surface->base_height != bl) { word_F3F038 = true; @@ -771,7 +771,7 @@ void path_paint(paint_session * session, uint8 direction, uint16 height, rct_til uint8 pathType = footpath_element_get_type(tile_element); rct_footpath_entry * footpathEntry = get_footpath_entry(pathType); - if (footpathEntry != NULL) { + if (footpathEntry != nullptr) { if (footpathEntry->support_type == FOOTPATH_ENTRY_SUPPORT_TYPE_POLE) { path_paint_pole_support(session, tile_element, height, footpathEntry, word_F3F038, imageFlags, sceneryImageFlags); } @@ -878,9 +878,9 @@ void path_paint_box_support(paint_session * session, rct_tile_element * tileElem } if (byte_98D8A4[edges] == 0) { - path_a_supports_paint_setup(session, 0, ax, height, imageFlags, footpathEntry, NULL); + path_a_supports_paint_setup(session, 0, ax, height, imageFlags, footpathEntry, nullptr); } else { - path_a_supports_paint_setup(session, 1, ax, height, imageFlags, footpathEntry, NULL); + path_a_supports_paint_setup(session, 1, ax, height, imageFlags, footpathEntry, nullptr); } height += 32; diff --git a/src/openrct2/paint/tile_element/SmallScenery.cpp b/src/openrct2/paint/tile_element/SmallScenery.cpp index 567506638c..6cccd0ee00 100644 --- a/src/openrct2/paint/tile_element/SmallScenery.cpp +++ b/src/openrct2/paint/tile_element/SmallScenery.cpp @@ -66,7 +66,7 @@ void scenery_paint(paint_session * session, uint8 direction, sint32 height, rct_ rct_scenery_entry *entry = get_small_scenery_entry(tileElement->properties.scenery.type); - if (entry == NULL) + if (entry == nullptr) { return; } @@ -291,9 +291,9 @@ void scenery_paint(paint_session * session, uint8 direction, sint32 height, rct_ supportImageColourFlags = dword_F64EB0; } if (direction & 1) { - wooden_b_supports_paint_setup(session, 1, ax, supportHeight, supportImageColourFlags, NULL); + wooden_b_supports_paint_setup(session, 1, ax, supportHeight, supportImageColourFlags, nullptr); } else { - wooden_b_supports_paint_setup(session, 0, ax, supportHeight, supportImageColourFlags, NULL); + wooden_b_supports_paint_setup(session, 0, ax, supportHeight, supportImageColourFlags, nullptr); } } } diff --git a/src/openrct2/paint/tile_element/Surface.cpp b/src/openrct2/paint/tile_element/Surface.cpp index 664760d1f8..4c3aa2e523 100644 --- a/src/openrct2/paint/tile_element/Surface.cpp +++ b/src/openrct2/paint/tile_element/Surface.cpp @@ -435,7 +435,7 @@ static uint8 viewport_surface_paint_setup_get_relative_slope(rct_tile_element * */ static void viewport_surface_smoothen_edge(paint_session * session, enum edge_t edge, struct tile_descriptor self, struct tile_descriptor neighbour) { - if (neighbour.tile_element == NULL) + if (neighbour.tile_element == nullptr) return; uint32 maskImageBase = 0; @@ -775,7 +775,7 @@ static void viewport_surface_draw_tile_side_top(paint_session * session, enum ed regs.dl = height; // save ecx - if (neighbour.tile_element == NULL) + if (neighbour.tile_element == nullptr) { regs.ah = 1; regs.ch = 1; @@ -936,14 +936,14 @@ void surface_paint(paint_session * session, uint8 direction, uint16 height, rct_ tile_descriptor& descriptor = tileDescriptors[i + 1]; - descriptor.tile_element = NULL; + descriptor.tile_element = nullptr; if (position.x > 0x2000 || position.y > 0x2000) { continue; } rct_tile_element * surfaceElement = map_get_surface_element_at(position.x / 32, position.y / 32); - if (surfaceElement == NULL) + if (surfaceElement == nullptr) { continue; } diff --git a/src/openrct2/paint/tile_element/TileElement.cpp b/src/openrct2/paint/tile_element/TileElement.cpp index 543a86334e..7a11eee400 100644 --- a/src/openrct2/paint/tile_element/TileElement.cpp +++ b/src/openrct2/paint/tile_element/TileElement.cpp @@ -244,8 +244,8 @@ static void sub_68B3FB(paint_session * session, sint32 x, sint32 y) if (height != previousHeight) { previousHeight = height; - session->PathElementOnSameHeight = 0; - session->TrackElementOnSameHeight = 0; + session->PathElementOnSameHeight = nullptr; + session->TrackElementOnSameHeight = nullptr; rct_tile_element * tile_element_sub_iterator = tile_element; while (!tile_element_is_last_for_tile(tile_element_sub_iterator++)) { @@ -346,7 +346,7 @@ static void sub_68B3FB(paint_session * session, sint32 x, sint32 y) sint32 xOffset = sy * 10; sint32 yOffset = -22 + sx * 10; paint_struct * ps = sub_98197C(session, 5504 | imageColourFlats, xOffset, yOffset, 10, 10, 1, segmentHeight, xOffset + 1, yOffset + 16, segmentHeight, get_current_rotation()); - if (ps != NULL) { + if (ps != nullptr) { ps->flags &= PAINT_STRUCT_FLAG_IS_MASKED; ps->colour_image_id = COLOUR_BORDEAUX_RED; } diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index d2c490c5f5..4b0ff95a23 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -120,7 +120,7 @@ enum F1EE18_RIDE_ENTRANCE = 1 << 3, }; -static void * _crowdSoundChannel = NULL; +static void * _crowdSoundChannel = nullptr; static void sub_68F41A(rct_peep * peep, sint32 index); static void peep_update(rct_peep * peep); @@ -525,12 +525,12 @@ static const LocationXY16 SpiralSlideWalkingPath[64] = { rct_peep * try_get_guest(uint16 spriteIndex) { rct_sprite * sprite = try_get_sprite(spriteIndex); - if (sprite == NULL) - return NULL; + if (sprite == nullptr) + return nullptr; if (sprite->unknown.sprite_identifier != SPRITE_IDENTIFIER_PEEP) - return NULL; + return nullptr; if (sprite->peep.type != PEEP_TYPE_GUEST) - return NULL; + return nullptr; return &sprite->peep; } @@ -620,7 +620,7 @@ static uint8 peep_assess_surroundings(sint16 centre_x, sint16 centre_y, sint16 c break; scenery = get_footpath_item_entry(footpath_element_get_path_scenery_index(tileElement)); - if (scenery == NULL) + if (scenery == nullptr) { return PEEP_THOUGHT_TYPE_NONE; } @@ -739,7 +739,7 @@ static void peep_leave_park(rct_peep * peep) peep_insert_new_thought(peep, PEEP_THOUGHT_TYPE_GO_HOME, 0xFF); rct_window * w = window_find_by_number(WC_PEEP, peep->sprite_index); - if (w != NULL) + if (w != nullptr) window_event_invalidate_call(w); window_invalidate_by_number(WC_PEEP, peep->sprite_index); } @@ -1989,7 +1989,7 @@ void peep_update_sprite_type(rct_peep * peep) void peep_window_state_update(rct_peep * peep) { rct_window * w = window_find_by_number(WC_PEEP, peep->sprite_index); - if (w != NULL) + if (w != nullptr) window_event_invalidate_call(w); if (peep->type == PEEP_TYPE_GUEST) @@ -2286,10 +2286,10 @@ static void peep_update_falling(rct_peep * peep) // If not drowning then falling. Note: peeps 'fall' after leaving a ride/enter the park. rct_tile_element * tile_element = map_get_first_element_at(peep->x / 32, peep->y / 32); - rct_tile_element * saved_map = NULL; + rct_tile_element * saved_map = nullptr; sint32 saved_height = 0; - if (tile_element != NULL) + if (tile_element != nullptr) { do { @@ -2345,7 +2345,7 @@ static void peep_update_falling(rct_peep * peep) } // This will be null if peep is falling - if (saved_map == NULL) + if (saved_map == nullptr) { invalidate_sprite_2((rct_sprite *)peep); if (peep->z <= 1) @@ -2621,7 +2621,7 @@ static void peep_go_to_ride_entrance(rct_peep * peep, Ride * ride) rct_tile_element * tile_element = ride_get_station_exit_element(ride, x, y, z); - uint8 direction = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); + uint8 direction = (tile_element == nullptr ? 0 : tile_element_get_direction(tile_element)); x *= 32; y *= 32; @@ -2633,7 +2633,7 @@ static void peep_go_to_ride_entrance(rct_peep * peep, Ride * ride) uint8 shift_multiplier = 21; rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); - if (rideEntry != NULL) + if (rideEntry != nullptr) { if (rideEntry->vehicles[rideEntry->default_vehicle].flags & VEHICLE_ENTRY_FLAG_MINI_GOLF || rideEntry->vehicles[rideEntry->default_vehicle].flags & (VEHICLE_ENTRY_FLAG_28 | VEHICLE_ENTRY_FLAG_30)) @@ -2873,7 +2873,7 @@ static void peep_update_ride_sub_state_1(rct_peep * peep) if (peep_update_action(&x, &y, &xy_distance, peep)) { uint16 distanceThreshold = 16; - if (ride_entry != NULL) + if (ride_entry != nullptr) { uint8 vehicle = ride_entry->default_vehicle; if (ride_entry->vehicles[vehicle].flags & VEHICLE_ENTRY_FLAG_MINI_GOLF || @@ -2911,7 +2911,7 @@ static void peep_update_ride_sub_state_1(rct_peep * peep) rct_tile_element * tile_element = ride_get_station_exit_element(ride, x, y, z); - uint8 direction_entrance = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); + uint8 direction_entrance = (tile_element == nullptr ? 0 : tile_element_get_direction(tile_element)); if (ride->type == RIDE_TYPE_MAZE) { @@ -2952,7 +2952,7 @@ static void peep_update_ride_sub_state_1(rct_peep * peep) tile_element = ride_get_station_start_track_element(ride, peep->current_ride_station); - uint8 direction_track = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); + uint8 direction_track = (tile_element == nullptr ? 0 : tile_element_get_direction(tile_element)); peep->var_37 = (direction_entrance << 2) | (direction_track << 4); @@ -2997,14 +2997,14 @@ static void peep_update_ride_sub_state_1(rct_peep * peep) rct_tile_element * tile_element = ride_get_station_exit_element(ride, x, y, z); - uint8 direction_entrance = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); + uint8 direction_entrance = (tile_element == nullptr ? 0 : tile_element_get_direction(tile_element)); x = ride->station_starts[peep->current_ride_station].x; y = ride->station_starts[peep->current_ride_station].y; tile_element = ride_get_station_start_track_element(ride, peep->current_ride_station); - uint8 direction_track = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); + uint8 direction_track = (tile_element == nullptr ? 0 : tile_element_get_direction(tile_element)); vehicle = GET_VEHICLE(ride->vehicles[peep->current_train]); ride_entry = get_ride_entry(vehicle->ride_subtype); @@ -3113,7 +3113,7 @@ static void peep_go_to_ride_exit(rct_peep * peep, Ride * ride, sint16 x, sint16 sint16 shift_multiplier = 20; rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); - if (rideEntry != NULL) + if (rideEntry != nullptr) { rct_ride_entry_vehicle * vehicle_entry = &rideEntry->vehicles[rideEntry->default_vehicle]; if (vehicle_entry->flags & VEHICLE_ENTRY_FLAG_MINI_GOLF || @@ -3214,7 +3214,7 @@ static void peep_update_ride_sub_state_2_rejoin_queue(rct_peep * peep, Ride * ri rct_tile_element * tile_element = ride_get_station_exit_element(ride, x, y, z); - uint8 direction_entrance = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); + uint8 direction_entrance = (tile_element == nullptr ? 0 : tile_element_get_direction(tile_element)); x *= 32; y *= 32; @@ -3454,7 +3454,7 @@ static void peep_update_ride_sub_state_7(rct_peep * peep) rct_tile_element * tile_element = ride_get_station_exit_element(ride, x, y, z); - uint8 exit_direction = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); + uint8 exit_direction = (tile_element == nullptr ? 0 : tile_element_get_direction(tile_element)); exit_direction ^= (1 << 1); if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_16)) @@ -3485,7 +3485,7 @@ static void peep_update_ride_sub_state_7(rct_peep * peep) ride_entry = get_ride_entry(ride->subtype); - if (ride_entry != NULL) + if (ride_entry != nullptr) { vehicle_entry = &ride_entry->vehicles[ride_entry->default_vehicle]; @@ -3549,14 +3549,14 @@ static void peep_update_ride_sub_state_7(rct_peep * peep) rct_tile_element * tile_element = ride_get_station_exit_element(ride, x, y, z); - uint8 exit_direction = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); + uint8 exit_direction = (tile_element == nullptr ? 0 : tile_element_get_direction(tile_element)); x = ride->station_starts[peep->current_ride_station].x; y = ride->station_starts[peep->current_ride_station].y; tile_element = ride_get_station_start_track_element(ride, peep->current_ride_station); - uint8 station_direction = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); + uint8 station_direction = (tile_element == nullptr ? 0 : tile_element_get_direction(tile_element)); vehicle = GET_VEHICLE(ride->vehicles[peep->current_train]); @@ -3626,7 +3626,7 @@ static void peep_update_ride_prepare_for_state_9(rct_peep * peep) rct_tile_element * tile_element = ride_get_station_exit_element(ride, x, y, z); - uint8 exit_direction = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); + uint8 exit_direction = (tile_element == nullptr ? 0 : tile_element_get_direction(tile_element)); x *= 32; y *= 32; @@ -3639,7 +3639,7 @@ static void peep_update_ride_prepare_for_state_9(rct_peep * peep) sint16 shift_multiplier = 20; rct_ride_entry * ride_type = get_ride_entry(ride->subtype); - if (ride_type != NULL) + if (ride_type != nullptr) { rct_ride_entry_vehicle * vehicle_entry = &ride_type->vehicles[ride_type->default_vehicle]; if (vehicle_entry->flags & (VEHICLE_ENTRY_FLAG_28 | VEHICLE_ENTRY_FLAG_30)) @@ -3873,7 +3873,7 @@ static void peep_update_ride_sub_state_13(rct_peep * peep) rct_tile_element * tile_element = ride_get_station_exit_element(ride, x, y, z); - uint8 exit_direction = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); + uint8 exit_direction = (tile_element == nullptr ? 0 : tile_element_get_direction(tile_element)); exit_direction ^= (1 << 1); x *= 32; @@ -3950,7 +3950,7 @@ static void peep_update_ride_sub_state_14(rct_peep * peep) rct_tile_element * tile_element = ride_get_station_exit_element(ride, x, y, z); - uint8 exit_direction = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); + uint8 exit_direction = (tile_element == nullptr ? 0 : tile_element_get_direction(tile_element)); peep->var_37 = (exit_direction * 4) | (peep->var_37 & 0x30) | 1; x = ride->station_starts[peep->current_ride_station].x; @@ -4149,7 +4149,7 @@ static void peep_update_ride_sub_state_16(rct_peep * peep) rct_tile_element * tile_element = ride_get_station_exit_element(ride, x, y, z); - uint8 exit_direction = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); + uint8 exit_direction = (tile_element == nullptr ? 0 : tile_element_get_direction(tile_element)); exit_direction ^= (1 << 1); x *= 32; @@ -4743,7 +4743,7 @@ static bool peep_update_fixing_sub_state_1(bool firstRun, rct_peep * peep, Ride if (!firstRun) { rct_vehicle * vehicle = ride_get_broken_vehicle(ride); - if (vehicle == NULL) + if (vehicle == nullptr) { return true; } @@ -4823,7 +4823,7 @@ static bool peep_update_fixing_sub_state_2345(bool firstRun, rct_peep * peep, Ri } rct_vehicle * vehicle = ride_get_broken_vehicle(ride); - if (vehicle == NULL) + if (vehicle == nullptr) { return true; } @@ -4863,7 +4863,7 @@ static bool peep_update_fixing_sub_state_6(bool firstRun, rct_peep * peep, Ride } rct_vehicle * vehicle = ride_get_broken_vehicle(ride); - if (vehicle == NULL) + if (vehicle == nullptr) { return true; } @@ -4906,7 +4906,7 @@ static bool peep_update_fixing_sub_state_7(bool firstRun, rct_peep * peep, Ride uint16 stationY = stationPosition.y * 32; rct_tile_element * tileElement = map_get_track_element_at(stationX, stationY, stationZ); - if (tileElement == NULL) + if (tileElement == nullptr) { log_error("Couldn't find tile_element"); return false; @@ -4998,7 +4998,7 @@ static bool peep_update_fixing_sub_state_9(bool firstRun, rct_peep * peep, Ride input.x = stationPosition.x * 32; input.y = stationPosition.y * 32; input.element = map_get_track_element_at_from_ride(input.x, input.y, stationZ, peep->current_ride); - if (input.element == NULL) + if (input.element == nullptr) { return true; } @@ -6779,7 +6779,7 @@ static sint32 peep_update_patrolling_find_watering(rct_peep * peep) rct_tile_element * tile_element = map_get_first_element_at(x / 32, y / 32); // This seems to happen in some SV4 files. - if (tile_element == NULL) + if (tile_element == nullptr) { continue; } @@ -6847,7 +6847,7 @@ static sint32 peep_update_patrolling_find_bin(rct_peep * peep) return 0; rct_tile_element * tile_element = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); - if (tile_element == NULL) + if (tile_element == nullptr) return 0; for (;; tile_element++) @@ -6945,7 +6945,7 @@ static sint32 peep_update_patrolling_find_sweeping(rct_peep * peep) uint16 sprite_id = sprite_get_first_in_quadrant(peep->x, peep->y); - for (rct_sprite * sprite = NULL; sprite_id != SPRITE_INDEX_NULL; sprite_id = sprite->unknown.next_in_quadrant) + for (rct_sprite * sprite = nullptr; sprite_id != SPRITE_INDEX_NULL; sprite_id = sprite->unknown.next_in_quadrant) { sprite = get_sprite(sprite_id); @@ -6989,7 +6989,7 @@ static void peep_update_patrolling(rct_peep * peep) { rct_tile_element * tile_element = map_get_surface_element_at(peep->next_x / 32, peep->next_y / 32); - if (tile_element != NULL) + if (tile_element != nullptr) { sint32 water_height = map_get_water_height(tile_element); if (water_height) @@ -7687,10 +7687,10 @@ void peep_problem_warnings_update() void peep_stop_crowd_noise() { - if (_crowdSoundChannel != NULL) + if (_crowdSoundChannel != nullptr) { Mixer_Stop_Channel(_crowdSoundChannel); - _crowdSoundChannel = NULL; + _crowdSoundChannel = nullptr; } } @@ -7715,7 +7715,7 @@ void peep_update_crowd_noise() return; viewport = g_music_tracking_viewport; - if (viewport == NULL) + if (viewport == nullptr) return; // Count the number of peeps visible @@ -7746,10 +7746,10 @@ void peep_update_crowd_noise() if (visiblePeeps < 0) { // Mute crowd noise - if (_crowdSoundChannel != NULL) + if (_crowdSoundChannel != nullptr) { Mixer_Stop_Channel(_crowdSoundChannel); - _crowdSoundChannel = NULL; + _crowdSoundChannel = nullptr; } } else @@ -7763,15 +7763,15 @@ void peep_update_crowd_noise() volume = (((207360000 - volume) >> viewport->zoom) - 207360000) / 65536 - 150; // Load and play crowd noise if needed and set volume - if (_crowdSoundChannel == NULL) + if (_crowdSoundChannel == nullptr) { _crowdSoundChannel = Mixer_Play_Music(PATH_ID_CSS2, MIXER_LOOP_INFINITE, false); - if (_crowdSoundChannel != NULL) + if (_crowdSoundChannel != nullptr) { Mixer_Channel_SetGroup(_crowdSoundChannel, MIXER_GROUP_SOUND); } } - if (_crowdSoundChannel != NULL) + if (_crowdSoundChannel != nullptr) { Mixer_Channel_Volume(_crowdSoundChannel, DStoMixerVolume(volume)); } @@ -7914,7 +7914,7 @@ static const uint8 tshirt_colours[] = { rct_peep * peep_generate(sint32 x, sint32 y, sint32 z) { if (gSpriteListCount[SPRITE_LIST_NULL] < 400) - return NULL; + return nullptr; rct_peep * peep = (rct_peep *)create_sprite(1); @@ -9358,7 +9358,7 @@ static sint32 peep_interact_with_shop(rct_peep * peep, sint16 x, sint16 y, rct_t ride->total_profit += cost; ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME; gCommandExpenditureType = RCT_EXPENDITURE_TYPE_PARK_RIDE_TICKETS; - peep_spend_money(peep, NULL, cost); + peep_spend_money(peep, nullptr, cost); } peep->destination_x = (x & 0xFFE0) + 16; peep->destination_y = (y & 0xFFE0) + 16; @@ -9515,24 +9515,24 @@ static rct_tile_element * get_banner_on_path(rct_tile_element * path_element) // This is an improved version of original. // That only checked for one fence in the way. if (tile_element_is_last_for_tile(path_element)) - return NULL; + return nullptr; rct_tile_element * bannerElement = path_element + 1; do { // Path on top, so no banners if (tile_element_get_type(bannerElement) == TILE_ELEMENT_TYPE_PATH) - return NULL; + return nullptr; // Found a banner if (tile_element_get_type(bannerElement) == TILE_ELEMENT_TYPE_BANNER) return bannerElement; // Last element so there cant be any other banners if (tile_element_is_last_for_tile(bannerElement)) - return NULL; + return nullptr; } while (bannerElement++); - return NULL; + return nullptr; } static sint32 banner_clear_path_edges(rct_tile_element * tileElement, sint32 edges) @@ -9540,12 +9540,12 @@ static sint32 banner_clear_path_edges(rct_tile_element * tileElement, sint32 edg if (_peepPathFindIsStaff) return edges; rct_tile_element * bannerElement = get_banner_on_path(tileElement); - if (bannerElement != NULL) + if (bannerElement != nullptr) { do { edges &= bannerElement->properties.banner.flags; - } while ((bannerElement = get_banner_on_path(bannerElement)) != NULL); + } while ((bannerElement = get_banner_on_path(bannerElement)) != nullptr); } return edges; } @@ -10583,7 +10583,7 @@ sint32 peep_pathfind_choose_direction(sint16 x, sint16 y, uint8 z, rct_peep * pe * EXPECT to experience path finding irregularities due to those paths! * In particular common edges at different heights will not work * in a useful way. Simply do not do it! :-) */ - rct_tile_element * first_tile_element = NULL; + rct_tile_element * first_tile_element = nullptr; bool found = false; uint8 permitted_edges = 0; @@ -10595,7 +10595,7 @@ sint32 peep_pathfind_choose_direction(sint16 x, sint16 y, uint8 z, rct_peep * pe if (tile_element_get_type(dest_tile_element) != TILE_ELEMENT_TYPE_PATH) continue; found = true; - if (first_tile_element == NULL) + if (first_tile_element == nullptr) { first_tile_element = dest_tile_element; } @@ -11107,7 +11107,7 @@ static void get_ride_queue_end(sint16 * x, sint16 * y, sint16 * z) LocationXY16 result = { 0, 0 }; rct_tile_element * tileElement = map_get_first_element_at(*x / 32, *y / 32); - if (tileElement == NULL) + if (tileElement == nullptr) { return; } @@ -11129,8 +11129,8 @@ static void get_ride_queue_end(sint16 * x, sint16 * y, sint16 * z) return; uint8 direction = tile_element_get_direction_with_offset(tileElement, 2); - rct_tile_element * lastPathElement = NULL; - rct_tile_element * firstPathElement = NULL; + rct_tile_element * lastPathElement = nullptr; + rct_tile_element * firstPathElement = nullptr; sint16 baseZ = tileElement->base_height; sint16 nextX = *x; @@ -11200,7 +11200,7 @@ static void get_ride_queue_end(sint16 * x, sint16 * y, sint16 * z) if (!(tileElement->properties.path.edges & (1 << (direction ^ (1 << 1))))) break; - if (firstPathElement == NULL) + if (firstPathElement == nullptr) firstPathElement = tileElement; // More queue to go. @@ -11225,7 +11225,7 @@ static void get_ride_queue_end(sint16 * x, sint16 * y, sint16 * z) return; tileElement = lastPathElement; - if (tileElement == NULL) + if (tileElement == nullptr) return; if (!footpath_element_is_queue(tileElement)) @@ -11262,7 +11262,7 @@ static sint32 guest_path_finding(rct_peep * peep) z = peep->next_z; rct_tile_element * tileElement = map_get_path_element_at(x / 32, y / 32, z); - if (tileElement == NULL) + if (tileElement == nullptr) { return 1; } @@ -11659,7 +11659,7 @@ static sint32 peep_perform_next_action(rct_peep * peep) } tileElement = map_get_surface_element_at(x / 32, y / 32); - if (tileElement == NULL) + if (tileElement == nullptr) return peep_return_to_centre_of_tile(peep); sint16 water_height = map_get_water_height(tileElement); @@ -11692,7 +11692,7 @@ static void peep_spend_money(rct_peep * peep, money16 * peep_expend_type, money3 peep->cash_in_pocket = Math::Max(0, peep->cash_in_pocket - amount); peep->cash_spent += amount; - if (peep_expend_type != NULL) + if (peep_expend_type != nullptr) { *peep_expend_type += (money16)amount; } @@ -12054,7 +12054,7 @@ static void peep_on_exit_ride(rct_peep * peep, sint32 rideIndex) peep_reset_pathfind_goal(peep); rct_window * w = window_find_by_number(WC_PEEP, peep->sprite_index); - if (w != NULL) + if (w != nullptr) { window_event_invalidate_call(w); widget_invalidate(w, WC_PEEP__WIDX_ACTION_LBL); @@ -13042,7 +13042,7 @@ static void peep_reset_ride_heading(rct_peep * peep) peep->guest_heading_to_ride_id = 255; w = window_find_by_number(WC_PEEP, peep->sprite_index); - if (w != NULL) + if (w != nullptr) { window_event_invalidate_call(w); widget_invalidate(w, WC_PEEP__WIDX_ACTION_LBL); @@ -13595,7 +13595,7 @@ static void peep_pick_ride_to_go_on(rct_peep * peep) // Invalidate windows rct_window * w = window_find_by_number(WC_PEEP, peep->sprite_index); - if (w != NULL) + if (w != nullptr) { window_event_invalidate_call(w); widget_invalidate(w, WC_PEEP__WIDX_ACTION_LBL); @@ -13725,7 +13725,7 @@ static void peep_head_for_nearest_ride_type(rct_peep * peep, sint32 rideType) // Invalidate windows rct_window * w = window_find_by_number(WC_PEEP, peep->sprite_index); - if (w != NULL) + if (w != nullptr) { window_event_invalidate_call(w); widget_invalidate(w, WC_PEEP__WIDX_ACTION_LBL); @@ -13857,7 +13857,7 @@ static void peep_head_for_nearest_ride_with_flags(rct_peep * peep, sint32 rideTy // Invalidate windows rct_window * w = window_find_by_number(WC_PEEP, peep->sprite_index); - if (w != NULL) + if (w != nullptr) { window_event_invalidate_call(w); window_invalidate(w); @@ -14291,7 +14291,7 @@ void peep_autoposition(rct_peep * newPeep) sint16 x, y, z; uint32 count = 0; uint16 sprite_index; - rct_peep * guest = NULL; + rct_peep * guest = nullptr; // Count number of walking guests FOR_ALL_GUESTS(sprite_index, guest) diff --git a/src/openrct2/peep/Staff.cpp b/src/openrct2/peep/Staff.cpp index edcdd3dbd7..f225da9c55 100644 --- a/src/openrct2/peep/Staff.cpp +++ b/src/openrct2/peep/Staff.cpp @@ -122,7 +122,7 @@ static inline void staff_autoposition_new_staff_member(rct_peep * newPeep) sint16 x, y, z; uint32 count = 0; uint16 sprite_index; - rct_peep * guest = NULL; + rct_peep * guest = nullptr; // Count number of walking guests FOR_ALL_GUESTS(sprite_index, guest) @@ -249,7 +249,7 @@ static money32 staff_hire_new_staff_member(uint8 staff_type, uint8 flags, sint16 const rct_sprite_bounds * spriteBounds; rct_peep * newPeep = &(create_sprite(flags)->peep); - if (newPeep == NULL) + if (newPeep == nullptr) { gGameCommandErrorText = STR_TOO_MANY_PEOPLE_IN_GAME; return MONEY32_UNDEFINED; @@ -904,8 +904,8 @@ void staff_toggle_patrol_area(sint32 staffIndex, sint32 x, sint32 y) static uint8 staff_handyman_direction_to_nearest_litter(rct_peep * peep) { uint16 nearestLitterDist = (uint16)-1; - rct_litter * nearestLitter = NULL; - rct_litter * litter = NULL; + rct_litter * nearestLitter = nullptr; + rct_litter * litter = nullptr; for (uint16 litterIndex = gSpriteListHead[SPRITE_LIST_LITTER]; litterIndex != 0xFFFF; litterIndex = litter->next) { @@ -1102,7 +1102,7 @@ static sint32 staff_path_finding_handyman(rct_peep * peep) { rct_tile_element * tileElement = map_get_path_element_at(peep->next_x / 32, peep->next_y / 32, peep->next_z); - if (tileElement == NULL) + if (tileElement == nullptr) return 1; uint8 pathDirections = (tileElement->properties.path.edges & validDirections) & 0xF; @@ -1395,7 +1395,7 @@ static sint32 staff_path_finding_mechanic(rct_peep * peep) else { rct_tile_element * pathElement = map_get_path_element_at(peep->next_x / 32, peep->next_y / 32, peep->next_z); - if (pathElement == NULL) + if (pathElement == nullptr) return 1; direction = staff_mechanic_direction_path(peep, validDirections, pathElement); @@ -1483,7 +1483,7 @@ static sint32 staff_path_finding_misc(rct_peep * peep) else { rct_tile_element * pathElement = map_get_path_element_at(peep->next_x / 32, peep->next_y / 32, peep->next_z); - if (pathElement == NULL) + if (pathElement == nullptr) return 1; direction = staff_direction_path(peep, validDirections, pathElement); diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index ad2c79d718..c523da437c 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -4203,7 +4203,7 @@ static bool ride_check_track_contains_banked(rct_xy_element *input, rct_xy_eleme static sint32 ride_check_station_length(rct_xy_element *input, rct_xy_element *output) { rct_window* w = window_find_by_class(WC_RIDE_CONSTRUCTION); - if (w != 0 && + if (w != nullptr && _rideConstructionState != RIDE_CONSTRUCTION_STATE_0 && _currentRideIndex == track_element_get_ride_index(input->element)) { @@ -4648,7 +4648,7 @@ static train_ref vehicle_create_train(sint32 rideIndex, sint32 x, sint32 y, sint static void vehicle_create_trains(sint32 rideIndex, sint32 x, sint32 y, sint32 z, rct_tile_element *tileElement) { Ride *ride = get_ride(rideIndex); - train_ref firstTrain = { 0 }, lastTrain = { 0 }; + train_ref firstTrain = { nullptr }, lastTrain = { nullptr }; sint32 remainingDistance = 0; for (sint32 vehicleIndex = 0; vehicleIndex < ride->num_vehicles; vehicleIndex++) { diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index b1a55598bc..3e1a0b94a0 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -824,10 +824,10 @@ uint16 vehicle_get_move_info_size(sint32 cd, sint32 typeAndDirection) rct_vehicle * try_get_vehicle(uint16 spriteIndex) { rct_sprite * sprite = try_get_sprite(spriteIndex); - if (sprite == NULL) - return NULL; + if (sprite == nullptr) + return nullptr; if (sprite->unknown.sprite_identifier != SPRITE_IDENTIFIER_VEHICLE) - return NULL; + return nullptr; return &sprite->vehicle; } @@ -913,7 +913,7 @@ static void vehicle_update_sound_params(rct_vehicle * vehicle) sint32 v = vehicle->velocity; rct_ride_entry * ride_type = get_ride_entry(vehicle->ride_subtype); - if (ride_type != NULL) + if (ride_type != nullptr) { uint8 test = ride_type->vehicles[vehicle->vehicle_type].var_5A; @@ -937,7 +937,7 @@ static void vehicle_update_sound_params(rct_vehicle * vehicle) if (vehicle->x != LOCATION_NULL) { rct_tile_element * tile_element = map_get_surface_element_at(vehicle->x >> 5, vehicle->y >> 5); - if (tile_element != NULL && tile_element->base_height * 8 > vehicle->z) + if (tile_element != nullptr && tile_element->base_height * 8 > vehicle->z) { // vehicle underground i->volume = 0x30; } @@ -962,7 +962,7 @@ sint32 sub_6BC2F3(rct_vehicle * vehicle) { result += vehicle_temp->mass; } while (vehicle_temp->next_vehicle_on_train != SPRITE_INDEX_NULL && - (vehicle_temp = GET_VEHICLE(vehicle_temp->next_vehicle_on_train)) != NULL); + (vehicle_temp = GET_VEHICLE(vehicle_temp->next_vehicle_on_train)) != nullptr); sint32 v4 = vehicle->velocity; if (v4 < 0) { @@ -991,8 +991,8 @@ void vehicle_sounds_update() { if (gAudioCurrentDevice != -1 && !gGameSoundsOff && gConfigSound.sound_enabled && !gOpenRCT2Headless) { - g_music_tracking_viewport = NULL; - rct_viewport * viewport = NULL; + g_music_tracking_viewport = nullptr; + rct_viewport * viewport = nullptr; rct_window * window = gWindowNextSlot; while (true) { @@ -1008,7 +1008,7 @@ void vehicle_sounds_update() } } g_music_tracking_viewport = viewport; - if (viewport != NULL) + if (viewport != nullptr) { if (window) { @@ -2711,7 +2711,7 @@ assert_struct_size(rct_synchronised_vehicle, 4); // Synchronised vehicle info static rct_synchronised_vehicle _synchronisedVehicles[SYNCHRONISED_VEHICLE_COUNT] = { 0 }; -static rct_synchronised_vehicle * _lastSynchronisedVehicle = NULL; +static rct_synchronised_vehicle * _lastSynchronisedVehicle = nullptr; /** * Checks if a map position contains a synchronised ride station and adds the vehicle @@ -2727,7 +2727,7 @@ static bool try_add_synchronised_station(sint32 x, sint32 y, sint32 z) } rct_tile_element * tileElement = get_station_platform(x, y, z, 2); - if (tileElement == NULL) + if (tileElement == nullptr) { /* No station platform element found, * so no station to synchronise */ @@ -2827,7 +2827,7 @@ static bool vehicle_can_depart_synchronised(rct_vehicle * vehicle) sint32 z = ride->station_heights[station]; rct_tile_element * tileElement = map_get_track_element_at(x, y, z); - if (tileElement == NULL) + if (tileElement == nullptr) { return false; } @@ -3298,7 +3298,7 @@ static void vehicle_update_departing(rct_vehicle * vehicle) break; } - uint32 flags = vehicle_update_track_motion(vehicle, NULL); + uint32 flags = vehicle_update_track_motion(vehicle, nullptr); if (flags & (1 << 8)) { @@ -3678,7 +3678,7 @@ static void vehicle_update_travelling(rct_vehicle * vehicle) return; } - uint32 flags = vehicle_update_track_motion(vehicle, NULL); + uint32 flags = vehicle_update_track_motion(vehicle, nullptr); bool skipCheck = false; if (flags & ((1 << 8) | (1 << 9)) && ride->mode == RIDE_MODE_REVERSE_INCLINE_LAUNCHED_SHUTTLE && vehicle->sub_state == 0) @@ -3960,7 +3960,7 @@ static void vehicle_update_arriving(rct_vehicle * vehicle) uint32 flags; loc_6D8E36: - flags = vehicle_update_track_motion(vehicle, NULL); + flags = vehicle_update_track_motion(vehicle, nullptr); if (flags & (1 << 7) && unkF64E35 == 0) { vehicle_update_collision_setup(vehicle); @@ -3990,7 +3990,7 @@ loc_6D8E36: rct_tile_element * tileElement = map_get_track_element_at(vehicle->track_x, vehicle->track_y, vehicle->track_z / 8); - if (tileElement == NULL) + if (tileElement == nullptr) { return; } @@ -4223,7 +4223,7 @@ static void vehicle_update_travelling_cable_lift(rct_vehicle * vehicle) { vehicle->acceleration = 4398; } - sint32 flags = vehicle_update_track_motion(vehicle, NULL); + sint32 flags = vehicle_update_track_motion(vehicle, nullptr); if (flags & VEHICLE_UPDATE_MOTION_TRACK_FLAG_11) { @@ -4270,7 +4270,7 @@ static void vehicle_update_travelling_boat(rct_vehicle * vehicle) static void loc_6DA9F9(rct_vehicle * vehicle, sint32 x, sint32 y, sint32 bx, sint32 dx) { vehicle->remaining_distance = 0; - if (!vehicle_update_motion_collision_detection(vehicle, x, y, vehicle->z, NULL)) + if (!vehicle_update_motion_collision_detection(vehicle, x, y, vehicle->z, nullptr)) { vehicle->track_x = bx; vehicle->track_y = dx; @@ -4431,7 +4431,7 @@ static void vehicle_update_motion_boat_hire(rct_vehicle * vehicle) x = vehicle->x + Unk9A36C4[edi].x; y = vehicle->y + Unk9A36C4[edi].y; z = vehicle->z; - if (vehicle_update_motion_collision_detection(vehicle, x, y, z, NULL)) + if (vehicle_update_motion_collision_detection(vehicle, x, y, z, nullptr)) { vehicle->remaining_distance = 0; if (vehicle->sprite_direction == vehicle->var_34) @@ -4519,7 +4519,7 @@ static void vehicle_update_motion_boat_hire(rct_vehicle * vehicle) // loc_6DA9D1: vehicle->remaining_distance = 0; - if (!vehicle_update_motion_collision_detection(vehicle, x, y, vehicle->z, NULL)) + if (!vehicle_update_motion_collision_detection(vehicle, x, y, vehicle->z, nullptr)) { unk_F64E20.x = x; unk_F64E20.y = y; @@ -5159,9 +5159,9 @@ static void vehicle_update_doing_circus_show(rct_vehicle * vehicle) static rct_tile_element * vehicle_check_collision(sint16 x, sint16 y, sint16 z) { rct_tile_element * tileElement = map_get_first_element_at(x / 32, y / 32); - if (tileElement == NULL) + if (tileElement == nullptr) { - return NULL; + return nullptr; } uint8 bl; @@ -5190,7 +5190,7 @@ static rct_tile_element * vehicle_check_collision(sint16 x, sint16 y, sint16 z) return tileElement; } while (!tile_element_is_last_for_tile(tileElement++)); - return NULL; + return nullptr; } /** @@ -5407,7 +5407,7 @@ static void vehicle_update_crash(rct_vehicle * vehicle) } rct_tile_element * collideElement = vehicle_check_collision(curVehicle->x, curVehicle->y, curVehicle->z); - if (collideElement == NULL) + if (collideElement == nullptr) { curVehicle->sub_state = 1; } @@ -5482,7 +5482,7 @@ static void vehicle_update_sound(rct_vehicle * vehicle) ride = get_ride(vehicle->ride); rideEntry = get_ride_entry(vehicle->ride_subtype); - if (rideEntry == NULL) + if (rideEntry == nullptr) { return; } @@ -6190,9 +6190,9 @@ void vehicle_get_g_forces(rct_vehicle * vehicle, sint32 * verticalG, sint32 * la gForceVert >>= 16; gForceLateral >>= 16; - if (verticalG != NULL) + if (verticalG != nullptr) *verticalG = (sint16)(gForceVert & 0xFFFF); - if (lateralG != NULL) + if (lateralG != nullptr) *lateralG = (sint16)(gForceLateral & 0xFFFF); } @@ -6447,7 +6447,7 @@ bool vehicle_update_dodgems_collision(rct_vehicle * vehicle, sint16 x, sint16 y, if (x - bp < rideLeft || y - bp < rideTop || x + bp > rideRight || y + bp > rideBottom) { - if (spriteId != NULL) + if (spriteId != nullptr) *spriteId = SPRITE_INDEX_NULL; return true; } @@ -6488,7 +6488,7 @@ bool vehicle_update_dodgems_collision(rct_vehicle * vehicle, sint16 x, sint16 y, ecx >>= 8; if (Math::Max(distX, distY) < ecx) { - if (spriteId != NULL) + if (spriteId != nullptr) *spriteId = vehicle2->sprite_index; return true; } @@ -6662,7 +6662,7 @@ static void check_and_apply_block_section_stop_site(rct_vehicle * vehicle) rct_tile_element * trackElement = map_get_track_element_at_of_type(vehicle->track_x, vehicle->track_y, vehicle->track_z >> 3, trackType); - if (trackElement == NULL) + if (trackElement == nullptr) { return; } @@ -6778,7 +6778,7 @@ static void vehicle_update_block_brakes_open_previous_section(rct_vehicle * vehi y = trackBeginEnd.begin_y; z = trackBeginEnd.begin_z; tileElement = map_get_track_element_at(x, y, z >> 3); - if (tileElement == NULL) + if (tileElement == nullptr) { return; } @@ -7218,10 +7218,10 @@ static void vehicle_update_spinning_car(rct_vehicle * vehicle) static void steam_particle_create(sint16 x, sint16 y, sint16 z) { rct_tile_element * tileElement = map_get_surface_element_at(x >> 5, y >> 5); - if (tileElement != NULL && z > tileElement->base_height * 8) + if (tileElement != nullptr && z > tileElement->base_height * 8) { rct_steam_particle * steam = (rct_steam_particle *)create_sprite(2); - if (steam == NULL) + if (steam == nullptr) return; steam->sprite_width = 20; @@ -7438,7 +7438,7 @@ static void vehicle_update_scenery_door(rct_vehicle * vehicle) sint32 direction = (vehicle->track_direction + trackCoordinates->rotation_end) & 3; rct_tile_element * tileElement = map_get_wall_element_at(x, y, z, direction); - if (tileElement == NULL) + if (tileElement == nullptr) { return; } @@ -7523,7 +7523,7 @@ static void vehicle_update_handle_scenery_door(rct_vehicle * vehicle) direction ^= 2; rct_tile_element * tileElement = map_get_wall_element_at(x, y, z, direction); - if (tileElement == NULL) + if (tileElement == nullptr) { return; } @@ -7644,7 +7644,7 @@ static bool vehicle_update_motion_collision_detection(rct_vehicle * vehicle, sin vehicle->var_C4 = 0; // If hacking boat hire rides you can end up here - if (otherVehicleIndex == NULL) + if (otherVehicleIndex == nullptr) return false; rct_vehicle * collideVehicle = GET_VEHICLE(*otherVehicleIndex); @@ -7681,7 +7681,7 @@ static bool vehicle_update_motion_collision_detection(rct_vehicle * vehicle, sin bool mayCollide = false; uint16 collideId = SPRITE_INDEX_NULL; - rct_vehicle * collideVehicle = NULL; + rct_vehicle * collideVehicle = nullptr; for (auto xy_offset : Unk9A37C4) { location.x += xy_offset.x; @@ -7772,7 +7772,7 @@ static bool vehicle_update_motion_collision_detection(rct_vehicle * vehicle, sin if (vehicle->var_C4 < 200) { vehicle->update_flags |= VEHICLE_UPDATE_FLAG_6; - if (otherVehicleIndex != NULL) + if (otherVehicleIndex != nullptr) *otherVehicleIndex = collideId; return true; } @@ -7818,7 +7818,7 @@ static bool vehicle_update_motion_collision_detection(rct_vehicle * vehicle, sin } vehicle->update_flags |= VEHICLE_UPDATE_FLAG_6; - if (otherVehicleIndex != NULL) + if (otherVehicleIndex != nullptr) *otherVehicleIndex = collideId; return true; } @@ -7864,14 +7864,14 @@ static void sub_6DBF3E(rct_vehicle * vehicle) _vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_3; - rct_tile_element * tileElement = NULL; + rct_tile_element * tileElement = nullptr; if (map_is_location_valid(vehicle->track_x, vehicle->track_y)) { tileElement = map_get_track_element_at_of_type_seq(vehicle->track_x, vehicle->track_y, vehicle->track_z >> 3, trackType, 0); } - if (tileElement == NULL) + if (tileElement == nullptr) { return; } @@ -7949,7 +7949,7 @@ static bool vehicle_update_track_motion_forwards_get_new_track(rct_vehicle * veh rct_tile_element * tileElement = map_get_track_element_at_of_type_seq(vehicle->track_x, vehicle->track_y, vehicle->track_z >> 3, trackType, 0); - if (tileElement == NULL) + if (tileElement == nullptr) { return false; } @@ -8385,7 +8385,7 @@ static bool vehicle_update_track_motion_backwards_get_new_track(rct_vehicle * ve rct_tile_element * tileElement = map_get_track_element_at_of_type_seq(vehicle->track_x, vehicle->track_y, vehicle->track_z >> 3, trackType, 0); - if (tileElement == NULL) + if (tileElement == nullptr) return false; bool nextTileBackwards = true; @@ -8708,7 +8708,7 @@ static sint32 vehicle_update_track_motion_mini_golf(rct_vehicle * vehicle, sint3 rct_ride_entry * rideEntry = get_ride_entry(vehicle->ride_subtype); rct_ride_entry_vehicle * vehicleEntry = vehicle_get_vehicle_entry(vehicle); - rct_tile_element * tileElement = NULL; + rct_tile_element * tileElement = nullptr; gCurrentVehicle = vehicle; _vehicleMotionTrackFlags = 0; @@ -9441,7 +9441,7 @@ loc_6DD069: regs.eax = _vehicleMotionTrackFlags; regs.ebx = _vehicleStationIndex; - if (outStation != NULL) + if (outStation != nullptr) *outStation = regs.ebx; return regs.eax; } @@ -9458,7 +9458,7 @@ sint32 vehicle_update_track_motion(rct_vehicle * vehicle, sint32 * outStation) rct_ride_entry * rideEntry = get_ride_entry(vehicle->ride_subtype); rct_ride_entry_vehicle * vehicleEntry = vehicle_get_vehicle_entry(vehicle); - if (vehicleEntry == NULL) + if (vehicleEntry == nullptr) { return 0; } @@ -9823,7 +9823,7 @@ loc_6DC316: regs.ebx = _vehicleStationIndex; // hook_setreturnregisters(®s); - if (outStation != NULL) + if (outStation != nullptr) *outStation = regs.ebx; return regs.eax; } @@ -9866,7 +9866,7 @@ void vehicle_invalidate_window(rct_vehicle * vehicle) rct_window * w; w = window_find_by_number(WC_RIDE, vehicle->ride); - if (w == NULL) + if (w == nullptr) return; ride = get_ride(vehicle->ride); diff --git a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp index b9c2c9b31e..813b56701b 100644 --- a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp +++ b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp @@ -194,7 +194,7 @@ static void air_powered_vertical_rc_track_flat(paint_session * session, uint8 ri uint32 imageId = imageIds[direction] | session->TrackColours[SCHEME_TRACK]; sub_98197C_rotated(session, direction, imageId, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); @@ -217,7 +217,7 @@ static void air_powered_vertical_rc_track_station(paint_session * session, uint8 sub_98199C_rotated(session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); Ride * ride = get_ride(rideIndex); track_paint_util_draw_station_platform(session, ride, direction, height, 5, tileElement); @@ -335,7 +335,7 @@ static void air_powered_vertical_rc_track_flat_to_left_bank(paint_session * sess sub_98197C_rotated(session, direction, imageId, 0, 0, 32, 1, 26, height, 0, 27, height); } - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); @@ -363,7 +363,7 @@ static void air_powered_vertical_rc_track_flat_to_right_bank(paint_session * ses sub_98197C_rotated(session, direction, imageId, 0, 0, 32, 1, 26, height, 0, 27, height); } - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); @@ -509,7 +509,7 @@ static void air_powered_vertical_rc_track_left_bank(paint_session * session, uin sub_98197C_rotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height); } - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); @@ -536,7 +536,7 @@ static void air_powered_vertical_rc_track_brakes(paint_session * session, uint8 uint32 imageId = imageIds[direction] | session->TrackColours[SCHEME_TRACK]; sub_98197C_rotated(session, direction, imageId, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); @@ -650,7 +650,7 @@ static void air_powered_vertical_rc_track_vertical_slope_up(paint_session * sess sub_98197C_rotated(session, direction, supportsImageId, 0, 0, 20, 32, bbHeight, height, 0, 6, height); sub_98199C_rotated(session, direction, trackImageId, 0, 0, 20, 32, bbHeight, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); @@ -675,7 +675,7 @@ static void air_powered_vertical_rc_track_vertical_slope_up(paint_session * sess sub_98199C_rotated(session, direction, trackImageId, 0, 0, 32, 20, bbHeight, height, 0, 6, height); } - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (trackSequence == 0) { @@ -699,12 +699,12 @@ static void air_powered_vertical_rc_track_vertical_slope_up(paint_session * sess sub_98199C_rotated(session, direction, supportsImageId, 0, 0, 32, 20, bbHeight, height, 0, 6, height); } - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + supportHeights[trackSequence], 0x20); break; case 5: - if (wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL)) + if (wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr)) { uint32 floorImageId; if (direction & 1) @@ -736,7 +736,7 @@ static void air_powered_vertical_rc_track_vertical_slope_up(paint_session * sess sub_98197C_rotated(session, direction, trackImageId, 0, 0, 1, 20, 126, height, 27, 6, height); sub_98199C_rotated(session, direction, supportsImageId, 0, 0, 1, 20, 126, height, 27, 6, height); } - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_vertical_tunnel(session, height + 240); @@ -920,5 +920,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_air_powered_vertical_rc(sint32 tra case TRACK_ELEM_AIR_THRUST_VERTICAL_DOWN_TO_LEVEL: return air_powered_vertical_rc_track_vertical_slope_down; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/BobsleighCoaster.cpp b/src/openrct2/ride/coaster/BobsleighCoaster.cpp index 3e59514ed0..d9909f0843 100644 --- a/src/openrct2/ride/coaster/BobsleighCoaster.cpp +++ b/src/openrct2/ride/coaster/BobsleighCoaster.cpp @@ -3309,5 +3309,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_bobsleigh_rc(sint32 trackType, sin case TRACK_ELEM_ON_RIDE_PHOTO: return bobsleigh_rc_track_on_ride_photo; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp index a08152a144..3542aae544 100644 --- a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp +++ b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp @@ -8167,5 +8167,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_compact_inverted_rc(sint32 trackTy case TRACK_ELEM_BLOCK_BRAKES: return compact_inverted_rc_track_block_brakes; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp index 3b904734c7..087a0c0a9d 100644 --- a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp @@ -8065,5 +8065,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_corkscrew_rc(sint32 trackType, sin case TRACK_ELEM_BOOSTER: return corkscrew_rc_track_booster; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp index 39388a147f..4a6a536bd8 100644 --- a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp @@ -16262,5 +16262,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_flying_rc(sint32 trackType, sint32 case TRACK_ELEM_RIGHT_BANKED_25_DEG_DOWN_TO_FLAT: return flying_rc_track_right_banked_25_deg_down_to_flat; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/GigaCoaster.cpp b/src/openrct2/ride/coaster/GigaCoaster.cpp index 304d646e9b..2e0a42fc43 100644 --- a/src/openrct2/ride/coaster/GigaCoaster.cpp +++ b/src/openrct2/ride/coaster/GigaCoaster.cpp @@ -8514,5 +8514,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_giga_rc(sint32 trackType, sint32 d case TRACK_ELEM_BOOSTER: return giga_rc_track_booster; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp index 82cb820e72..3565eb3d19 100644 --- a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp +++ b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp @@ -39,28 +39,28 @@ static void heartline_twister_rc_track_flat(paint_session * session, uint8 rideI height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21356, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21355, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21357, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21358, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21360, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21359, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21361, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -74,7 +74,7 @@ static void heartline_twister_rc_track_flat(paint_session * session, uint8 rideI height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21296, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: case 3: @@ -82,7 +82,7 @@ static void heartline_twister_rc_track_flat(paint_session * session, uint8 rideI height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21297, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -125,28 +125,28 @@ static void heartline_twister_rc_track_25_deg_up(paint_session * session, uint8 height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21382, 0, 0, 32, 1, 50, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21379, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21383, 0, 0, 32, 1, 50, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21380, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21384, 0, 0, 32, 1, 50, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21381, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21385, 0, 0, 32, 1, 50, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -159,28 +159,28 @@ static void heartline_twister_rc_track_25_deg_up(paint_session * session, uint8 height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21326, 0, 0, 32, 1, 50, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21323, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21327, 0, 0, 32, 1, 50, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21324, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21328, 0, 0, 32, 1, 50, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21325, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21329, 0, 0, 32, 1, 50, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -209,28 +209,28 @@ static void heartline_twister_rc_track_60_deg_up(paint_session * session, uint8 height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21406, 0, 0, 32, 1, 98, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 21, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 21, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: session->WoodenSupportsPrependTo = sub_98197C_rotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21403, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21407, 0, 0, 32, 1, 98, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 22, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 22, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: session->WoodenSupportsPrependTo = sub_98197C_rotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21404, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21408, 0, 0, 32, 1, 98, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 23, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 23, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21405, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21409, 0, 0, 32, 1, 98, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 24, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 24, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -243,28 +243,28 @@ static void heartline_twister_rc_track_60_deg_up(paint_session * session, uint8 height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21350, 0, 0, 32, 1, 98, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 21, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 21, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: session->WoodenSupportsPrependTo = sub_98197C_rotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21347, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21351, 0, 0, 32, 1, 98, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 22, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 22, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: session->WoodenSupportsPrependTo = sub_98197C_rotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21348, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21352, 0, 0, 32, 1, 98, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 23, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 23, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21349, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21353, 0, 0, 32, 1, 98, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 24, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 24, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -293,28 +293,28 @@ static void heartline_twister_rc_track_flat_to_25_deg_up(paint_session * session height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21366, 0, 0, 32, 1, 42, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21363, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21367, 0, 0, 32, 1, 42, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 2, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21364, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21368, 0, 0, 32, 1, 42, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 3, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21365, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21369, 0, 0, 32, 1, 42, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 4, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -327,28 +327,28 @@ static void heartline_twister_rc_track_flat_to_25_deg_up(paint_session * session height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21310, 0, 0, 32, 1, 42, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21307, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21311, 0, 0, 32, 1, 42, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 2, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21308, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21312, 0, 0, 32, 1, 42, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 3, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21309, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21313, 0, 0, 32, 1, 42, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 4, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -377,28 +377,28 @@ static void heartline_twister_rc_track_25_deg_up_to_60_deg_up(paint_session * se height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21390, 0, 0, 32, 1, 66, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 13, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 13, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: session->WoodenSupportsPrependTo = sub_98197C_rotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21387, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21391, 0, 0, 32, 1, 66, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 14, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 14, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: session->WoodenSupportsPrependTo = sub_98197C_rotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21388, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21392, 0, 0, 32, 1, 66, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 15, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 15, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21389, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21393, 0, 0, 32, 1, 66, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 16, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 16, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -411,28 +411,28 @@ static void heartline_twister_rc_track_25_deg_up_to_60_deg_up(paint_session * se height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21334, 0, 0, 32, 1, 66, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 13, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 13, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: session->WoodenSupportsPrependTo = sub_98197C_rotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21331, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21335, 0, 0, 32, 1, 66, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 14, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 14, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: session->WoodenSupportsPrependTo = sub_98197C_rotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21332, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21336, 0, 0, 32, 1, 66, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 15, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 15, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21333, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21337, 0, 0, 32, 1, 66, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 16, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 16, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -461,28 +461,28 @@ static void heartline_twister_rc_track_60_deg_up_to_25_deg_up(paint_session * se height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21398, 0, 0, 32, 1, 66, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 17, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 17, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: session->WoodenSupportsPrependTo = sub_98197C_rotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21395, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21399, 0, 0, 32, 1, 66, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 18, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 18, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: session->WoodenSupportsPrependTo = sub_98197C_rotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21396, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21400, 0, 0, 32, 1, 66, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 19, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 19, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21397, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21401, 0, 0, 32, 1, 66, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 20, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 20, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -495,28 +495,28 @@ static void heartline_twister_rc_track_60_deg_up_to_25_deg_up(paint_session * se height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21342, 0, 0, 32, 1, 66, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 17, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 17, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: session->WoodenSupportsPrependTo = sub_98197C_rotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21339, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21343, 0, 0, 32, 1, 66, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 18, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 18, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: session->WoodenSupportsPrependTo = sub_98197C_rotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21340, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21344, 0, 0, 32, 1, 66, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 19, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 19, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21341, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21345, 0, 0, 32, 1, 66, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 20, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 20, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -545,28 +545,28 @@ static void heartline_twister_rc_track_25_deg_up_to_flat(paint_session * session height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21374, 0, 0, 32, 1, 34, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 5, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 5, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21371, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21375, 0, 0, 32, 1, 34, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 6, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 6, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21372, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21376, 0, 0, 32, 1, 34, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 7, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 7, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21373, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21377, 0, 0, 32, 1, 34, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 8, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 8, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -579,28 +579,28 @@ static void heartline_twister_rc_track_25_deg_up_to_flat(paint_session * session height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21318, 0, 0, 32, 1, 34, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 5, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 5, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21315, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21319, 0, 0, 32, 1, 34, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 6, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 6, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21316, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21320, 0, 0, 32, 1, 34, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 7, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 7, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21317, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21321, 0, 0, 32, 1, 34, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 8, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 8, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -674,28 +674,28 @@ static void heartline_twister_rc_track_heartline_transfer_up(paint_session * ses height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21310, 0, 0, 32, 20, 0, height, 0, 6, height + 23); - wooden_a_supports_paint_setup(session, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21307, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21311, 0, 0, 32, 20, 0, height, 0, 6, height + 23); - wooden_a_supports_paint_setup(session, 7, 2, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21308, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21312, 0, 0, 32, 20, 0, height, 0, 6, height + 23); - wooden_a_supports_paint_setup(session, 6, 3, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21309, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21313, 0, 0, 32, 20, 0, height, 0, 6, height + 23); - wooden_a_supports_paint_setup(session, 7, 4, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -721,7 +721,7 @@ static void heartline_twister_rc_track_heartline_transfer_up(paint_session * ses 27, height + 8); sub_98199C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21312, 0, 0, 32, 1, 34, height + 16, 0, 27, height + 16); - wooden_a_supports_paint_setup(session, 6, 5, height + 8, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 5, height + 8, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21315, 0, 0, 32, 20, 2, height + 8, 0, @@ -732,7 +732,7 @@ static void heartline_twister_rc_track_heartline_transfer_up(paint_session * ses 27, height + 8); sub_98199C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21313, 0, 0, 32, 1, 34, height + 16, 0, 27, height + 16); - wooden_a_supports_paint_setup(session, 7, 6, height + 8, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 6, height + 8, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21316, 0, 0, 32, 20, 2, height + 8, 0, @@ -743,7 +743,7 @@ static void heartline_twister_rc_track_heartline_transfer_up(paint_session * ses 27, height + 8); sub_98199C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21310, 0, 0, 32, 1, 34, height + 16, 0, 27, height + 16); - wooden_a_supports_paint_setup(session, 6, 7, height + 8, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 7, height + 8, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21317, 0, 0, 32, 20, 2, height + 8, 0, @@ -754,7 +754,7 @@ static void heartline_twister_rc_track_heartline_transfer_up(paint_session * ses 27, height + 8); sub_98199C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21311, 0, 0, 32, 1, 34, height + 16, 0, 27, height + 16); - wooden_a_supports_paint_setup(session, 7, 8, height + 8, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 8, height + 8, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -768,28 +768,28 @@ static void heartline_twister_rc_track_heartline_transfer_up(paint_session * ses height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21302, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21299, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21303, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21300, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21304, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21301, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21305, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -894,7 +894,7 @@ static void heartline_twister_rc_track_heartline_transfer_down(paint_session * s 27, height + 8); sub_98199C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21312, 0, 0, 32, 1, 34, height + 16, 0, 27, height + 16); - wooden_a_supports_paint_setup(session, 6, 5, height + 8, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 5, height + 8, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21315, 0, 0, 32, 20, 2, height + 8, 0, @@ -905,7 +905,7 @@ static void heartline_twister_rc_track_heartline_transfer_down(paint_session * s 27, height + 8); sub_98199C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21313, 0, 0, 32, 1, 34, height + 16, 0, 27, height + 16); - wooden_a_supports_paint_setup(session, 7, 6, height + 8, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 6, height + 8, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21316, 0, 0, 32, 20, 2, height + 8, 0, @@ -916,7 +916,7 @@ static void heartline_twister_rc_track_heartline_transfer_down(paint_session * s 27, height + 8); sub_98199C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21310, 0, 0, 32, 1, 34, height + 16, 0, 27, height + 16); - wooden_a_supports_paint_setup(session, 6, 7, height + 8, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 7, height + 8, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21317, 0, 0, 32, 20, 2, height + 8, 0, @@ -927,7 +927,7 @@ static void heartline_twister_rc_track_heartline_transfer_down(paint_session * s 27, height + 8); sub_98199C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21311, 0, 0, 32, 1, 34, height + 16, 0, 27, height + 16); - wooden_a_supports_paint_setup(session, 7, 8, height + 8, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 8, height + 8, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -941,28 +941,28 @@ static void heartline_twister_rc_track_heartline_transfer_down(paint_session * s height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21302, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21299, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21303, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21300, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21304, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21301, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21305, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -976,28 +976,28 @@ static void heartline_twister_rc_track_heartline_transfer_down(paint_session * s height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21310, 0, 0, 32, 20, 0, height, 0, 6, height + 23); - wooden_a_supports_paint_setup(session, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21307, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21311, 0, 0, 32, 20, 0, height, 0, 6, height + 23); - wooden_a_supports_paint_setup(session, 7, 2, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21308, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21312, 0, 0, 32, 20, 0, height, 0, 6, height + 23); - wooden_a_supports_paint_setup(session, 6, 3, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21309, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21313, 0, 0, 32, 20, 0, height, 0, 6, height + 23); - wooden_a_supports_paint_setup(session, 7, 4, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -1028,28 +1028,28 @@ static void heartline_twister_rc_track_left_heartline_roll(paint_session * sessi height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21422, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21413, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21425, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21416, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21428, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21419, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21431, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); @@ -1064,28 +1064,28 @@ static void heartline_twister_rc_track_left_heartline_roll(paint_session * sessi height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21423, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21414, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21426, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21417, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21429, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21420, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21432, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -1099,28 +1099,28 @@ static void heartline_twister_rc_track_left_heartline_roll(paint_session * sessi height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21424, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21415, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21427, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21418, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21430, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21421, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21433, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -1134,28 +1134,28 @@ static void heartline_twister_rc_track_left_heartline_roll(paint_session * sessi height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21430, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21421, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21433, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21412, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21424, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21415, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21427, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -1169,28 +1169,28 @@ static void heartline_twister_rc_track_left_heartline_roll(paint_session * sessi height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21429, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21420, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21432, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21411, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21423, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21414, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21426, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -1204,28 +1204,28 @@ static void heartline_twister_rc_track_left_heartline_roll(paint_session * sessi height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21428, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21419, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21431, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21410, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21422, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21413, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21425, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); @@ -1249,28 +1249,28 @@ static void heartline_twister_rc_track_right_heartline_roll(paint_session * sess height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21446, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21437, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21449, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21440, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21452, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21443, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21455, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); @@ -1285,28 +1285,28 @@ static void heartline_twister_rc_track_right_heartline_roll(paint_session * sess height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21447, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21438, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21450, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21441, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21453, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21444, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21456, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -1320,28 +1320,28 @@ static void heartline_twister_rc_track_right_heartline_roll(paint_session * sess height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21448, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21439, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21451, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21442, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21454, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21445, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21457, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -1355,28 +1355,28 @@ static void heartline_twister_rc_track_right_heartline_roll(paint_session * sess height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21454, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21445, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21457, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21436, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21448, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21439, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21451, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -1390,28 +1390,28 @@ static void heartline_twister_rc_track_right_heartline_roll(paint_session * sess height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21453, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21444, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21456, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21435, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21447, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21438, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21450, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -1425,28 +1425,28 @@ static void heartline_twister_rc_track_right_heartline_roll(paint_session * sess height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21452, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21443, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21455, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21434, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21446, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21437, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21449, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); @@ -1499,5 +1499,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_heartline_twister_rc(sint32 trackT case TRACK_ELEM_RIGHT_HEARTLINE_ROLL: return heartline_twister_rc_track_right_heartline_roll; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp index b820bfed0c..417d5dd348 100644 --- a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp @@ -1268,5 +1268,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_inverted_hairpin_rc(sint32 trackTy case TRACK_ELEM_BLOCK_BRAKES: return inverted_hairpin_rc_track_block_brakes; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp index d880cc79a3..b9b6edbfb3 100644 --- a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp @@ -741,5 +741,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_inverted_impulse_rc(sint32 trackTy case TRACK_ELEM_RIGHT_QUARTER_TURN_1_TILE_90_DEG_DOWN: return inverted_impulse_rc_track_right_quarter_turn_1_90_deg_down; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp index f95bb20ae7..4d0396da86 100644 --- a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp @@ -9631,5 +9631,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_inverted_rc(sint32 trackType, sint case TRACK_ELEM_RIGHT_BANKED_25_DEG_DOWN_TO_FLAT: return inverted_rc_track_right_banked_25_deg_down_to_flat; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp index 6e9c1e0794..8de76152a5 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp @@ -2052,7 +2052,7 @@ static void junior_rc_banked_right_quarter_turn_5_tiles_paint_setup(paint_sessio } track_paint_util_right_quarter_turn_5_tiles_paint( session, thickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], - junior_rc_track_pieces_banked_quarter_turn_5_tiles, NULL, junior_rc_banked_right_quarter_turn_5_tiles_bound_lengths, + junior_rc_track_pieces_banked_quarter_turn_5_tiles, nullptr, junior_rc_banked_right_quarter_turn_5_tiles_bound_lengths, junior_rc_banked_right_quarter_turn_5_tiles_bound_offsets, get_current_rotation()); if (direction == 1 && trackSequence == 6) @@ -2484,7 +2484,7 @@ void junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up(paint_session * s session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_left_quarter_turn_5_tiles_25_deg_up[chainType], junior_rc_left_quarter_turn_5_tiles_25_deg_up_offsets, - defaultRightQuarterTurn5TilesBoundLengths, NULL, get_current_rotation()); + defaultRightQuarterTurn5TilesBoundLengths, nullptr, get_current_rotation()); uint8 supportSpecial[4] = { 8, 8, 8, 3 }; switch (trackSequence) @@ -2561,7 +2561,7 @@ void junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up(paint_session * track_paint_util_right_quarter_turn_5_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_right_quarter_turn_5_tiles_25_deg_up[chainType], defaultRightQuarterTurn5TilesOffsets, - defaultRightQuarterTurn5TilesBoundLengths, NULL, get_current_rotation()); + defaultRightQuarterTurn5TilesBoundLengths, nullptr, get_current_rotation()); uint8 supportSpecial[4] = { 11, 8, 8, 7 }; switch (trackSequence) @@ -2879,7 +2879,7 @@ static void junior_rc_right_quarter_turn_3_tiles_paint_setup(paint_session * ses track_paint_util_right_quarter_turn_3_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_flat_quarter_turn_3_tiles, defaultRightQuarterTurn3TilesOffsets, - defaultRightQuarterTurn3TilesBoundLengths, NULL, get_current_rotation()); + defaultRightQuarterTurn3TilesBoundLengths, nullptr, get_current_rotation()); track_paint_util_right_quarter_turn_3_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_0); uint8 supportType[2][4] = { { 1, 0, 0, 2 }, { 2, 0, 0, 1 } }; @@ -2969,7 +2969,7 @@ static void junior_rc_right_quarter_turn_3_tiles_bank_paint_setup(paint_session track_paint_util_right_quarter_turn_3_tiles_paint( session, thickness[direction][trackSequence], height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], - junior_rc_track_pieces_banked_quarter_turn_3_tiles, NULL, junior_rc_right_quarter_turn_3_tiles_bank_bound_lengths, + junior_rc_track_pieces_banked_quarter_turn_3_tiles, nullptr, junior_rc_right_quarter_turn_3_tiles_bank_bound_lengths, junior_rc_right_quarter_turn_3_tiles_bank_offsets, get_current_rotation()); track_paint_util_right_quarter_turn_3_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_0); @@ -3236,7 +3236,7 @@ static void junior_rc_right_half_banked_helix_up_small_paint_setup(paint_session } track_paint_util_right_helix_up_small_quarter_tiles_paint( session, thickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], - junior_rc_track_pieces_right_half_banked_helix_up_small_quarter_tiles, NULL, + junior_rc_track_pieces_right_half_banked_helix_up_small_quarter_tiles, nullptr, defaultRightHelixUpSmallQuarterBoundLengths, defaultRightHelixUpSmallQuarterBoundOffsets, get_current_rotation()); if (trackSequence == 0) @@ -3302,7 +3302,7 @@ static void junior_rc_right_half_banked_helix_down_small_paint_setup(paint_sessi } track_paint_util_right_helix_up_small_quarter_tiles_paint( session, thickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], - junior_rc_track_pieces_right_half_banked_helix_down_small_quarter_tiles, NULL, + junior_rc_track_pieces_right_half_banked_helix_down_small_quarter_tiles, nullptr, defaultRightHelixUpSmallQuarterBoundLengths, defaultRightHelixUpSmallQuarterBoundOffsets, get_current_rotation()); if (trackSequence == 0) @@ -3399,7 +3399,7 @@ static void junior_rc_right_half_banked_helix_up_large_paint_setup(paint_session } track_paint_util_right_helix_up_large_quarter_tiles_paint( session, thickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], - junior_rc_track_pieces_right_half_banked_helix_up_large_quarter_tiles, NULL, + junior_rc_track_pieces_right_half_banked_helix_up_large_quarter_tiles, nullptr, defaultRightHelixUpLargeQuarterBoundLengths, defaultRightHelixUpLargeQuarterBoundOffsets, get_current_rotation()); if (trackSequence == 0) @@ -3481,7 +3481,7 @@ static void junior_rc_right_half_banked_helix_down_large_paint_setup(paint_sessi } track_paint_util_right_helix_up_large_quarter_tiles_paint( session, thickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], - junior_rc_track_pieces_right_half_banked_helix_down_large_quarter_tiles, NULL, + junior_rc_track_pieces_right_half_banked_helix_down_large_quarter_tiles, nullptr, defaultRightHelixUpLargeQuarterBoundLengths, defaultRightHelixUpLargeQuarterBoundOffsets, get_current_rotation()); if (trackSequence == 0) @@ -5685,5 +5685,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_junior_rc(sint32 trackType, sint32 case TRACK_ELEM_DIAG_FLAT_TO_60_DEG_DOWN: return junior_rc_diag_flat_to_60_deg_down_paint_setup; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp index b365fff28b..594922d370 100644 --- a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp @@ -14602,5 +14602,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_lay_down_rc(sint32 trackType, sint case TRACK_ELEM_RIGHT_QUARTER_BANKED_HELIX_LARGE_DOWN: return lay_down_rc_track_right_quarter_banked_helix_large_down; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp index a21c988bca..ffe7a4d64b 100644 --- a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp @@ -1760,5 +1760,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_lim_launched_rc(sint32 trackType, case TRACK_ELEM_RIGHT_QUARTER_TURN_1_TILE_90_DEG_DOWN: return lim_launched_rc_track_right_quarter_turn_1_90_deg_down; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp index 3bc2569784..da867daeab 100644 --- a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp @@ -8725,5 +8725,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_looping_rc(sint32 trackType, sint3 case TRACK_ELEM_BOOSTER: return looping_rc_track_booster; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/MineRide.cpp b/src/openrct2/ride/coaster/MineRide.cpp index bce18dd564..d7d796c455 100644 --- a/src/openrct2/ride/coaster/MineRide.cpp +++ b/src/openrct2/ride/coaster/MineRide.cpp @@ -5007,5 +5007,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_mine_ride(sint32 trackType, sint32 case TRACK_ELEM_DIAG_RIGHT_BANK: return mine_ride_track_diag_right_bank; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/MineTrainCoaster.cpp b/src/openrct2/ride/coaster/MineTrainCoaster.cpp index a3f0a74c57..22844467ee 100644 --- a/src/openrct2/ride/coaster/MineTrainCoaster.cpp +++ b/src/openrct2/ride/coaster/MineTrainCoaster.cpp @@ -37,22 +37,22 @@ static void mine_train_rc_track_flat(paint_session * session, uint8 rideIndex, u case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20054, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20055, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20056, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20057, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -64,13 +64,13 @@ static void mine_train_rc_track_flat(paint_session * session, uint8 rideIndex, u case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20052, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20053, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -120,22 +120,22 @@ static void mine_train_rc_track_25_deg_up(paint_session * session, uint8 rideInd case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20102, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20103, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20104, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20105, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -146,22 +146,22 @@ static void mine_train_rc_track_25_deg_up(paint_session * session, uint8 rideInd case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20074, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20075, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20076, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20077, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -186,22 +186,22 @@ static void mine_train_rc_track_60_deg_up(paint_session * session, uint8 rideInd case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20090, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 21, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 21, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: session->WoodenSupportsPrependTo = sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20091, 0, 0, 1, 32, 98, height, 27, 0, height); - wooden_a_supports_paint_setup(session, 7, 22, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 22, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: session->WoodenSupportsPrependTo = sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20092, 0, 0, 1, 32, 98, height, 27, 0, height); - wooden_a_supports_paint_setup(session, 6, 23, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 23, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20093, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 24, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 24, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -227,22 +227,22 @@ static void mine_train_rc_track_flat_to_25_deg_up(paint_session * session, uint8 case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20094, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20095, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 2, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20096, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 3, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20097, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 4, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -253,22 +253,22 @@ static void mine_train_rc_track_flat_to_25_deg_up(paint_session * session, uint8 case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20066, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20067, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 2, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20068, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 3, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20069, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 4, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -293,26 +293,26 @@ static void mine_train_rc_track_25_deg_up_to_60_deg_up(paint_session * session, case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20078, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 13, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 13, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: session->WoodenSupportsPrependTo = sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20079, 0, 0, 32, 20, 1, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20082, 0, 0, 32, 1, 66, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 14, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 14, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: session->WoodenSupportsPrependTo = sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20080, 0, 0, 32, 20, 1, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20083, 0, 0, 32, 1, 66, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 15, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 15, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20081, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 16, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 16, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -336,26 +336,26 @@ static void mine_train_rc_track_60_deg_up_to_25_deg_up(paint_session * session, case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20084, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 17, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 17, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: session->WoodenSupportsPrependTo = sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20085, 0, 0, 24, 1, 61, height, 4, 29, height - 16); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20088, 0, 0, 32, 2, 66, height, 0, 4, height); - wooden_a_supports_paint_setup(session, 7, 18, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 18, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: session->WoodenSupportsPrependTo = sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20086, 0, 0, 24, 1, 61, height, 4, 29, height - 16); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20089, 0, 0, 32, 2, 66, height, 0, 4, height); - wooden_a_supports_paint_setup(session, 6, 19, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 19, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20087, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 20, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 20, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -381,22 +381,22 @@ static void mine_train_rc_track_25_deg_up_to_flat(paint_session * session, uint8 case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20098, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 5, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 5, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20099, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 6, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 6, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20100, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 7, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 7, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20101, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 8, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 8, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -407,22 +407,22 @@ static void mine_train_rc_track_25_deg_up_to_flat(paint_session * session, uint8 case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20070, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 5, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 5, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20071, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 6, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 6, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20072, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 7, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 7, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20073, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 8, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 8, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -492,22 +492,22 @@ static void mine_train_rc_track_left_quarter_turn_5(paint_session * session, uin case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20155, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20160, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20165, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20150, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -527,21 +527,21 @@ static void mine_train_rc_track_left_quarter_turn_5(paint_session * session, uin { case 0: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20154, 0, 0, 32, 16, 1, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20159, 0, 0, 32, 16, 1, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20164, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20149, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -556,21 +556,21 @@ static void mine_train_rc_track_left_quarter_turn_5(paint_session * session, uin case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20153, 0, 0, 16, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20158, 0, 0, 16, 16, 1, height, 16, 16, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20163, 0, 0, 16, 16, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20148, 0, 0, 16, 16, 1, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, @@ -591,20 +591,20 @@ static void mine_train_rc_track_left_quarter_turn_5(paint_session * session, uin case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20152, 0, 0, 16, 32, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20157, 0, 0, 16, 32, 1, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20162, 0, 0, 16, 32, 1, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20147, 0, 0, 16, 32, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -619,22 +619,22 @@ static void mine_train_rc_track_left_quarter_turn_5(paint_session * session, uin case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20151, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20156, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20161, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20146, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -671,24 +671,24 @@ static void mine_train_rc_track_flat_to_left_bank(paint_session * session, uint8 height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20114, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20107, 0, 0, 32, 20, 1, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20115, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20108, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20109, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); @@ -705,26 +705,26 @@ static void mine_train_rc_track_flat_to_right_bank(paint_session * session, uint case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20110, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20111, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20112, 0, 0, 32, 20, 1, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20116, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20113, 0, 0, 32, 20, 1, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20117, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); @@ -743,24 +743,24 @@ static void mine_train_rc_track_left_bank_to_flat(paint_session * session, uint8 height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20116, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20113, 0, 0, 32, 20, 1, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20117, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20110, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20111, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); @@ -777,26 +777,26 @@ static void mine_train_rc_track_right_bank_to_flat(paint_session * session, uint case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20108, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20109, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20106, 0, 0, 32, 20, 1, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20114, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20107, 0, 0, 32, 20, 1, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20115, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); @@ -818,22 +818,22 @@ static void mine_train_rc_track_banked_left_quarter_turn_5(paint_session * sessi height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20186, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20180, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20185, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20170, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -853,22 +853,22 @@ static void mine_train_rc_track_banked_left_quarter_turn_5(paint_session * sessi { case 0: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20174, 0, 0, 32, 16, 1, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20179, 0, 0, 32, 16, 1, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20184, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20169, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -883,21 +883,21 @@ static void mine_train_rc_track_banked_left_quarter_turn_5(paint_session * sessi case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20173, 0, 0, 16, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20178, 0, 0, 16, 16, 1, height, 16, 16, height + 27); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20183, 0, 0, 16, 16, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20168, 0, 0, 16, 16, 1, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, @@ -918,21 +918,21 @@ static void mine_train_rc_track_banked_left_quarter_turn_5(paint_session * sessi case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20172, 0, 0, 16, 32, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20177, 0, 0, 16, 32, 1, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20182, 0, 0, 16, 32, 1, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20167, 0, 0, 16, 32, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -947,24 +947,24 @@ static void mine_train_rc_track_banked_left_quarter_turn_5(paint_session * sessi case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20171, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20176, 0, 0, 1, 32, 26, height, 27, 0, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20181, 0, 0, 20, 32, 1, height, 6, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20187, 0, 0, 1, 32, 26, height, 27, 0, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20166, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -1001,24 +1001,24 @@ static void mine_train_rc_track_left_bank_to_25_deg_up(paint_session * session, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20122, 0, 0, 32, 1, 34, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20119, 0, 0, 32, 20, 1, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20123, 0, 0, 32, 1, 34, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 2, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20120, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 3, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20121, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 4, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -1042,26 +1042,26 @@ static void mine_train_rc_track_right_bank_to_25_deg_up(paint_session * session, case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20124, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20125, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 2, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20126, 0, 0, 32, 20, 1, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20128, 0, 0, 32, 1, 34, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 3, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20127, 0, 0, 32, 20, 1, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20129, 0, 0, 32, 1, 34, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 4, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -1087,24 +1087,24 @@ static void mine_train_rc_track_25_deg_up_to_left_bank(paint_session * session, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20134, 0, 0, 32, 1, 34, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 5, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 5, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20131, 0, 0, 32, 20, 1, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20135, 0, 0, 32, 1, 34, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 6, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 6, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20132, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 7, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 7, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20133, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 8, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 8, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -1128,26 +1128,26 @@ static void mine_train_rc_track_25_deg_up_to_right_bank(paint_session * session, case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20136, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 5, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 5, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20137, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 6, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 6, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20138, 0, 0, 32, 20, 1, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20140, 0, 0, 32, 1, 34, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 7, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 7, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20139, 0, 0, 32, 20, 1, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20141, 0, 0, 32, 1, 34, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 8, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 8, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -1199,22 +1199,22 @@ static void mine_train_rc_track_left_bank(paint_session * session, uint8 rideInd case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20142, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20143, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20144, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20145, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); @@ -1241,22 +1241,22 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(paint_session * se case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20250, 0, 0, 32, 27, 1, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 6, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20255, 0, 0, 32, 27, 1, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 7, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20260, 0, 0, 32, 27, 1, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 6, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20265, 0, 0, 32, 27, 1, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 7, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -1277,22 +1277,22 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(paint_session * se case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20251, 0, 0, 32, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20256, 0, 0, 32, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20261, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20266, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -1307,22 +1307,22 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(paint_session * se case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20252, 0, 0, 16, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20257, 0, 0, 16, 16, 1, height, 16, 16, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20262, 0, 0, 16, 16, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20267, 0, 0, 16, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, @@ -1343,22 +1343,22 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(paint_session * se case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20253, 0, 0, 16, 32, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20258, 0, 0, 16, 32, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20263, 0, 0, 16, 32, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20268, 0, 0, 16, 32, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -1373,22 +1373,22 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(paint_session * se case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20254, 0, 0, 27, 32, 1, height, 2, 0, height); - wooden_a_supports_paint_setup(session, 7, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20259, 0, 0, 27, 32, 1, height, 2, 0, height); - wooden_a_supports_paint_setup(session, 6, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20264, 0, 0, 27, 32, 1, height, 2, 0, height); - wooden_a_supports_paint_setup(session, 7, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20269, 0, 0, 27, 32, 1, height, 2, 0, height); - wooden_a_supports_paint_setup(session, 6, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -1418,22 +1418,22 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(paint_session * s case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20230, 0, 0, 32, 27, 1, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 6, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20235, 0, 0, 32, 27, 1, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 7, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20240, 0, 0, 32, 27, 1, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 6, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20245, 0, 0, 32, 27, 1, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 7, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -1454,22 +1454,22 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(paint_session * s case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20231, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20236, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20241, 0, 0, 32, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20246, 0, 0, 32, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -1484,22 +1484,22 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(paint_session * s case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20232, 0, 0, 16, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20237, 0, 0, 16, 16, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20242, 0, 0, 16, 16, 1, height, 16, 16, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20247, 0, 0, 16, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, @@ -1520,22 +1520,22 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(paint_session * s case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20233, 0, 0, 16, 32, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20238, 0, 0, 16, 32, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20243, 0, 0, 16, 32, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20248, 0, 0, 16, 32, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -1550,22 +1550,22 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(paint_session * s case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20234, 0, 0, 27, 32, 1, height, 2, 0, height); - wooden_a_supports_paint_setup(session, 7, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20239, 0, 0, 27, 32, 1, height, 2, 0, height); - wooden_a_supports_paint_setup(session, 6, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20244, 0, 0, 27, 32, 1, height, 2, 0, height); - wooden_a_supports_paint_setup(session, 7, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20249, 0, 0, 27, 32, 1, height, 2, 0, height); - wooden_a_supports_paint_setup(session, 6, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -1613,22 +1613,22 @@ static void mine_train_rc_track_s_bend_left(paint_session * session, uint8 rideI case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20270, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20274, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20273, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20277, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -1643,21 +1643,21 @@ static void mine_train_rc_track_s_bend_left(paint_session * session, uint8 rideI { case 0: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20271, 0, 0, 32, 26, 1, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20275, 0, 0, 32, 26, 1, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20272, 0, 0, 32, 26, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20276, 0, 0, 32, 26, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -1672,20 +1672,20 @@ static void mine_train_rc_track_s_bend_left(paint_session * session, uint8 rideI case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20272, 0, 0, 32, 26, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20276, 0, 0, 32, 26, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20271, 0, 0, 32, 26, 1, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20275, 0, 0, 32, 26, 1, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -1700,22 +1700,22 @@ static void mine_train_rc_track_s_bend_left(paint_session * session, uint8 rideI case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20273, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20277, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20270, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20274, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -1745,22 +1745,22 @@ static void mine_train_rc_track_s_bend_right(paint_session * session, uint8 ride case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20278, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20282, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20281, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20285, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -1776,20 +1776,20 @@ static void mine_train_rc_track_s_bend_right(paint_session * session, uint8 ride case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20279, 0, 0, 32, 26, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20283, 0, 0, 32, 26, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20280, 0, 0, 32, 26, 1, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20284, 0, 0, 32, 26, 1, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -1803,21 +1803,21 @@ static void mine_train_rc_track_s_bend_right(paint_session * session, uint8 ride { case 0: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20280, 0, 0, 32, 26, 1, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20284, 0, 0, 32, 26, 1, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20279, 0, 0, 32, 26, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20283, 0, 0, 32, 26, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -1832,22 +1832,22 @@ static void mine_train_rc_track_s_bend_right(paint_session * session, uint8 ride case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20281, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20285, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20278, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20282, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -1877,22 +1877,22 @@ static void mine_train_rc_track_left_quarter_turn_3(paint_session * session, uin case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20193, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20196, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20199, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20190, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -1906,16 +1906,16 @@ static void mine_train_rc_track_left_quarter_turn_3(paint_session * session, uin switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_general_support_height(session, height + 32, 0x20); @@ -1949,22 +1949,22 @@ static void mine_train_rc_track_left_quarter_turn_3(paint_session * session, uin case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20191, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20194, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20197, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20188, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -2004,22 +2004,22 @@ static void mine_train_rc_track_left_quarter_turn_3_bank(paint_session * session height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20212, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20208, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20211, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20202, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -2033,16 +2033,16 @@ static void mine_train_rc_track_left_quarter_turn_3_bank(paint_session * session switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_general_support_height(session, height + 32, 0x20); @@ -2077,24 +2077,24 @@ static void mine_train_rc_track_left_quarter_turn_3_bank(paint_session * session case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20203, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20206, 0, 0, 1, 32, 26, height, 27, 0, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20209, 0, 0, 20, 32, 1, height, 6, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20213, 0, 0, 1, 32, 26, height, 27, 0, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20200, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -2131,19 +2131,19 @@ static void mine_train_rc_track_left_quarter_turn_3_25_deg_up(paint_session * se { case 0: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20225, 0, 6, 32, 20, 1, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20227, 0, 6, 32, 20, 1, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20229, 0, 6, 32, 20, 1, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20223, 0, 6, 32, 20, 1, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -2157,16 +2157,16 @@ static void mine_train_rc_track_left_quarter_turn_3_25_deg_up(paint_session * se switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_general_support_height(session, height + 56, 0x20); @@ -2181,19 +2181,19 @@ static void mine_train_rc_track_left_quarter_turn_3_25_deg_up(paint_session * se { case 0: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20224, 6, 0, 20, 32, 1, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20226, 6, 0, 20, 32, 1, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20228, 6, 0, 20, 32, 1, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20222, 6, 0, 20, 32, 1, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -2222,19 +2222,19 @@ static void mine_train_rc_track_right_quarter_turn_3_25_deg_up(paint_session * s { case 0: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20214, 0, 6, 32, 20, 1, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20216, 0, 6, 32, 20, 1, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20218, 0, 6, 32, 20, 1, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20220, 0, 6, 32, 20, 1, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -2248,16 +2248,16 @@ static void mine_train_rc_track_right_quarter_turn_3_25_deg_up(paint_session * s switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_general_support_height(session, height + 56, 0x20); @@ -2272,19 +2272,19 @@ static void mine_train_rc_track_right_quarter_turn_3_25_deg_up(paint_session * s { case 0: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20215, 6, 0, 20, 32, 1, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20217, 6, 0, 20, 32, 1, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20219, 6, 0, 20, 32, 1, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20221, 6, 0, 20, 32, 1, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -2334,22 +2334,22 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(paint_session * height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20312, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20308, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20311, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20302, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -2367,16 +2367,16 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(paint_session * switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_general_support_height(session, height + 32, 0x20); @@ -2411,24 +2411,24 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20303, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20306, 0, 0, 1, 32, 26, height, 27, 0, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20309, 0, 0, 20, 32, 1, height, 6, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20313, 0, 0, 1, 32, 26, height, 27, 0, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20300, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -2453,24 +2453,24 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20302, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20305, 0, 0, 20, 32, 1, height, 6, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20312, 0, 0, 1, 32, 26, height, 27, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20308, 0, 0, 1, 32, 26, height, 27, 0, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20311, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -2493,16 +2493,16 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(paint_session * switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_general_support_height(session, height + 32, 0x20); @@ -2537,24 +2537,24 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20300, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20303, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20306, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20309, 0, 0, 32, 20, 1, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20313, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -2583,24 +2583,24 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20286, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20289, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20292, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20295, 0, 0, 32, 20, 1, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20299, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -2618,16 +2618,16 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(paint_session * switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_general_support_height(session, height + 32, 0x20); @@ -2662,24 +2662,24 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20288, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20291, 0, 0, 20, 32, 1, height, 6, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20298, 0, 0, 1, 32, 26, height, 27, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20294, 0, 0, 1, 32, 26, height, 27, 0, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20297, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -2704,24 +2704,24 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20289, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20292, 0, 0, 1, 32, 26, height, 27, 0, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20295, 0, 0, 20, 32, 1, height, 6, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20299, 0, 0, 1, 32, 26, height, 27, 0, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20286, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -2744,16 +2744,16 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(paint_session * switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_general_support_height(session, height + 32, 0x20); @@ -2790,22 +2790,22 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(paint_session * height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20298, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20294, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20297, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20288, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -2865,22 +2865,22 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(paint_session * height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20356, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20350, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20355, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20340, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -2905,22 +2905,22 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20344, 0, 0, 32, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20349, 0, 0, 32, 16, 1, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20354, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20339, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -2935,24 +2935,24 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20343, 0, 0, 16, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20348, 0, 0, 16, 16, 1, height, 16, 16, height + 27); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20178, 0, 0, 16, 16, 1, height, 16, 16, height + 27); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20353, 0, 0, 16, 16, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20338, 0, 0, 16, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -2972,24 +2972,24 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20342, 0, 0, 16, 32, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20347, 0, 0, 16, 32, 1, height, 0, 0, height + 27); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20177, 0, 0, 16, 32, 1, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20352, 0, 0, 16, 32, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20337, 0, 0, 16, 32, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -3004,24 +3004,24 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20341, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20346, 0, 0, 1, 32, 26, height, 27, 0, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20351, 0, 0, 20, 32, 1, height, 6, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20357, 0, 0, 1, 32, 26, height, 27, 0, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20336, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -3046,24 +3046,24 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20340, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20345, 0, 0, 20, 32, 1, height, 6, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20356, 0, 0, 1, 32, 26, height, 27, 0, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20350, 0, 0, 1, 32, 26, height, 27, 0, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20355, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -3093,22 +3093,22 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20339, 0, 0, 16, 32, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20344, 0, 0, 16, 32, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20349, 0, 0, 16, 32, 1, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20354, 0, 0, 16, 32, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -3123,24 +3123,24 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20338, 0, 0, 16, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20343, 0, 0, 16, 16, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20348, 0, 0, 16, 16, 1, height, 16, 16, height + 27); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20178, 0, 0, 16, 16, 1, height, 16, 16, height + 27); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20353, 0, 0, 16, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -3160,24 +3160,24 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20337, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20342, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20347, 0, 0, 32, 16, 1, height, 0, 0, height + 27); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20177, 0, 0, 32, 16, 1, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20352, 0, 0, 32, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -3192,24 +3192,24 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20336, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20341, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20346, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20351, 0, 0, 32, 20, 1, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20357, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -3238,24 +3238,24 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20314, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20319, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20324, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20329, 0, 0, 32, 20, 1, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20335, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -3280,22 +3280,22 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20315, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20320, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20325, 0, 0, 32, 16, 1, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20330, 0, 0, 32, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -3310,22 +3310,22 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20316, 0, 0, 16, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20321, 0, 0, 16, 16, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20326, 0, 0, 16, 16, 1, height, 16, 16, height + 27); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20331, 0, 0, 16, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -3345,22 +3345,22 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20317, 0, 0, 16, 32, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20322, 0, 0, 16, 32, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20327, 0, 0, 16, 32, 1, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20332, 0, 0, 16, 32, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -3375,24 +3375,24 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20318, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20323, 0, 0, 20, 32, 1, height, 6, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20334, 0, 0, 1, 32, 26, height, 27, 0, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20328, 0, 0, 1, 32, 26, height, 27, 0, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20333, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -3417,24 +3417,24 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20319, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20324, 0, 0, 1, 32, 26, height, 27, 0, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20329, 0, 0, 20, 32, 1, height, 6, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20335, 0, 0, 1, 32, 26, height, 27, 0, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20314, 0, 0, 20, 32, 1, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -3464,22 +3464,22 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20320, 0, 0, 16, 32, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20325, 0, 0, 16, 32, 1, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20330, 0, 0, 16, 32, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20315, 0, 0, 16, 32, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -3494,22 +3494,22 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20321, 0, 0, 16, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20326, 0, 0, 16, 16, 1, height, 16, 16, height + 27); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20331, 0, 0, 16, 16, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20316, 0, 0, 16, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -3529,22 +3529,22 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20322, 0, 0, 32, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20327, 0, 0, 32, 16, 1, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20332, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20317, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -3561,22 +3561,22 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(paint_session * height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20334, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20328, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20333, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20318, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -3632,13 +3632,13 @@ static void mine_train_rc_track_brakes(paint_session * session, uint8 rideIndex, case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20058, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20059, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); @@ -3655,22 +3655,22 @@ static void mine_train_rc_track_on_ride_photo(paint_session * session, uint8 rid case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20052, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20053, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20052, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20053, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } track_paint_util_onride_photo_paint(session, direction, height + 2, tileElement); @@ -3691,22 +3691,22 @@ static void mine_train_rc_track_left_eighth_to_diag(paint_session * session, uin case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20452, 0, 0, 32, 32, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20456, 0, 0, 32, 32, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20460, 0, 0, 32, 32, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20464, 0, 0, 32, 32, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -3722,22 +3722,22 @@ static void mine_train_rc_track_left_eighth_to_diag(paint_session * session, uin case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20453, 0, 0, 32, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20457, 0, 0, 34, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20461, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20465, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -3749,22 +3749,22 @@ static void mine_train_rc_track_left_eighth_to_diag(paint_session * session, uin case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20454, 0, 0, 16, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20458, 0, 0, 16, 16, 1, height, 16, 16, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20462, 0, 0, 16, 16, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20466, 0, 0, 16, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -3774,16 +3774,16 @@ static void mine_train_rc_track_left_eighth_to_diag(paint_session * session, uin switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -3827,22 +3827,22 @@ static void mine_train_rc_track_right_eighth_to_diag(paint_session * session, ui case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20436, 0, 0, 32, 32, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20440, 0, 0, 32, 32, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20444, 0, 0, 32, 32, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20448, 0, 0, 32, 32, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -3858,22 +3858,22 @@ static void mine_train_rc_track_right_eighth_to_diag(paint_session * session, ui case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20437, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20441, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20445, 0, 0, 34, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20449, 0, 0, 32, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -3885,22 +3885,22 @@ static void mine_train_rc_track_right_eighth_to_diag(paint_session * session, ui case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20438, 0, 0, 16, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20442, 0, 0, 16, 16, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20446, 0, 0, 28, 28, 1, height, 4, 4, height); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20450, 0, 0, 16, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -3910,16 +3910,16 @@ static void mine_train_rc_track_right_eighth_to_diag(paint_session * session, ui switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -3979,22 +3979,22 @@ static void mine_train_rc_track_left_eighth_bank_to_diag(paint_session * session case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20484, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20488, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20492, 0, 0, 32, 32, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20496, 0, 0, 32, 32, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -4010,22 +4010,22 @@ static void mine_train_rc_track_left_eighth_bank_to_diag(paint_session * session case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20485, 0, 0, 32, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20489, 0, 0, 34, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20493, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20497, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -4037,22 +4037,22 @@ static void mine_train_rc_track_left_eighth_bank_to_diag(paint_session * session case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20486, 0, 0, 16, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20490, 0, 0, 16, 16, 0, height, 16, 16, height + 27); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20494, 0, 0, 16, 16, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20498, 0, 0, 16, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -4062,16 +4062,16 @@ static void mine_train_rc_track_left_eighth_bank_to_diag(paint_session * session switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -4115,22 +4115,22 @@ static void mine_train_rc_track_right_eighth_bank_to_diag(paint_session * sessio case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20468, 0, 0, 32, 32, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20472, 0, 0, 32, 32, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20476, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20480, 0, 0, 32, 1, 26, height, 0, 27, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -4146,22 +4146,22 @@ static void mine_train_rc_track_right_eighth_bank_to_diag(paint_session * sessio case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20469, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20473, 0, 0, 32, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20477, 0, 0, 34, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20481, 0, 0, 32, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -4173,22 +4173,22 @@ static void mine_train_rc_track_right_eighth_bank_to_diag(paint_session * sessio case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20470, 0, 0, 16, 16, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20474, 0, 0, 16, 16, 1, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20478, 0, 0, 28, 28, 0, height, 4, 4, height + 27); - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20482, 0, 0, 16, 16, 1, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -4198,16 +4198,16 @@ static void mine_train_rc_track_right_eighth_bank_to_diag(paint_session * sessio switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -4293,16 +4293,16 @@ static void mine_train_rc_track_diag_flat(paint_session * session, uint8 rideInd case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20386, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -4313,16 +4313,16 @@ static void mine_train_rc_track_diag_flat(paint_session * session, uint8 rideInd case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20358, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -4335,18 +4335,18 @@ static void mine_train_rc_track_diag_flat(paint_session * session, uint8 rideInd switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20388, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -4355,18 +4355,18 @@ static void mine_train_rc_track_diag_flat(paint_session * session, uint8 rideInd switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20360, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -4438,16 +4438,16 @@ static void mine_train_rc_track_diag_25_deg_up(paint_session * session, uint8 ri case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20398, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -4458,16 +4458,16 @@ static void mine_train_rc_track_diag_25_deg_up(paint_session * session, uint8 ri case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20370, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -4480,18 +4480,18 @@ static void mine_train_rc_track_diag_25_deg_up(paint_session * session, uint8 ri switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20400, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -4500,18 +4500,18 @@ static void mine_train_rc_track_diag_25_deg_up(paint_session * session, uint8 ri switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20372, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -4568,16 +4568,16 @@ static void mine_train_rc_track_diag_60_deg_up(paint_session * session, uint8 ri case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20382, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -4587,18 +4587,18 @@ static void mine_train_rc_track_diag_60_deg_up(paint_session * session, uint8 ri switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20384, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -4656,16 +4656,16 @@ static void mine_train_rc_track_diag_flat_to_25_deg_up(paint_session * session, case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20390, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -4676,16 +4676,16 @@ static void mine_train_rc_track_diag_flat_to_25_deg_up(paint_session * session, case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20362, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -4698,18 +4698,18 @@ static void mine_train_rc_track_diag_flat_to_25_deg_up(paint_session * session, switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20392, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -4718,18 +4718,18 @@ static void mine_train_rc_track_diag_flat_to_25_deg_up(paint_session * session, switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20364, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -4786,16 +4786,16 @@ static void mine_train_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * sess case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20374, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -4805,18 +4805,18 @@ static void mine_train_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * sess switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20376, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -4859,16 +4859,16 @@ static void mine_train_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * sess case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20378, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -4878,18 +4878,18 @@ static void mine_train_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * sess switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20380, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -4947,16 +4947,16 @@ static void mine_train_rc_track_diag_25_deg_up_to_flat(paint_session * session, case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20394, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -4967,16 +4967,16 @@ static void mine_train_rc_track_diag_25_deg_up_to_flat(paint_session * session, case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20366, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -4989,18 +4989,18 @@ static void mine_train_rc_track_diag_25_deg_up_to_flat(paint_session * session, switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20396, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -5009,18 +5009,18 @@ static void mine_train_rc_track_diag_25_deg_up_to_flat(paint_session * session, switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20368, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -5092,16 +5092,16 @@ static void mine_train_rc_track_diag_25_deg_down(paint_session * session, uint8 case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20400, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -5112,16 +5112,16 @@ static void mine_train_rc_track_diag_25_deg_down(paint_session * session, uint8 case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20372, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -5134,18 +5134,18 @@ static void mine_train_rc_track_diag_25_deg_down(paint_session * session, uint8 switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20398, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -5154,18 +5154,18 @@ static void mine_train_rc_track_diag_25_deg_down(paint_session * session, uint8 switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20370, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -5222,16 +5222,16 @@ static void mine_train_rc_track_diag_60_deg_down(paint_session * session, uint8 case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20384, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -5241,18 +5241,18 @@ static void mine_train_rc_track_diag_60_deg_down(paint_session * session, uint8 switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20382, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -5309,16 +5309,16 @@ static void mine_train_rc_track_diag_flat_to_25_deg_down(paint_session * session case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20396, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -5329,16 +5329,16 @@ static void mine_train_rc_track_diag_flat_to_25_deg_down(paint_session * session case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20368, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -5350,18 +5350,18 @@ static void mine_train_rc_track_diag_flat_to_25_deg_down(paint_session * session switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20394, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -5370,18 +5370,18 @@ static void mine_train_rc_track_diag_flat_to_25_deg_down(paint_session * session switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20366, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -5438,16 +5438,16 @@ static void mine_train_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20380, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -5457,18 +5457,18 @@ static void mine_train_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20378, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -5511,16 +5511,16 @@ static void mine_train_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20376, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -5530,18 +5530,18 @@ static void mine_train_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20374, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -5599,16 +5599,16 @@ static void mine_train_rc_track_diag_25_deg_down_to_flat(paint_session * session case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20392, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -5619,16 +5619,16 @@ static void mine_train_rc_track_diag_25_deg_down_to_flat(paint_session * session case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20364, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -5641,18 +5641,18 @@ static void mine_train_rc_track_diag_25_deg_down_to_flat(paint_session * session switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20390, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -5661,18 +5661,18 @@ static void mine_train_rc_track_diag_25_deg_down_to_flat(paint_session * session switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20362, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -5731,16 +5731,16 @@ static void mine_train_rc_track_diag_flat_to_left_bank(paint_session * session, -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20410, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -5750,18 +5750,18 @@ static void mine_train_rc_track_diag_flat_to_left_bank(paint_session * session, switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20408, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -5804,16 +5804,16 @@ static void mine_train_rc_track_diag_flat_to_right_bank(paint_session * session, case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20411, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -5823,20 +5823,20 @@ static void mine_train_rc_track_diag_flat_to_right_bank(paint_session * session, switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20413, -16, -16, 32, 32, 1, height, -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20415, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -5881,16 +5881,16 @@ static void mine_train_rc_track_diag_left_bank_to_flat(paint_session * session, -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20415, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -5900,18 +5900,18 @@ static void mine_train_rc_track_diag_left_bank_to_flat(paint_session * session, switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20411, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -5954,16 +5954,16 @@ static void mine_train_rc_track_diag_right_bank_to_flat(paint_session * session, case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20408, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -5973,20 +5973,20 @@ static void mine_train_rc_track_diag_right_bank_to_flat(paint_session * session, switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20406, -16, -16, 32, 32, 1, height, -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20410, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6031,16 +6031,16 @@ static void mine_train_rc_track_diag_left_bank_to_25_deg_up(paint_session * sess -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20430, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6050,18 +6050,18 @@ static void mine_train_rc_track_diag_left_bank_to_25_deg_up(paint_session * sess switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20428, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6104,16 +6104,16 @@ static void mine_train_rc_track_diag_right_bank_to_25_deg_up(paint_session * ses case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20431, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6123,20 +6123,20 @@ static void mine_train_rc_track_diag_right_bank_to_25_deg_up(paint_session * ses switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20433, -16, -16, 32, 32, 1, height, -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20435, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6181,16 +6181,16 @@ static void mine_train_rc_track_diag_25_deg_up_to_left_bank(paint_session * sess -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20420, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6200,18 +6200,18 @@ static void mine_train_rc_track_diag_25_deg_up_to_left_bank(paint_session * sess switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20418, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6254,16 +6254,16 @@ static void mine_train_rc_track_diag_25_deg_up_to_right_bank(paint_session * ses case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20421, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6273,20 +6273,20 @@ static void mine_train_rc_track_diag_25_deg_up_to_right_bank(paint_session * ses switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20423, -16, -16, 32, 32, 1, height, -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20425, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6329,16 +6329,16 @@ static void mine_train_rc_track_diag_left_bank_to_25_deg_down(paint_session * se -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20425, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } break; @@ -6346,18 +6346,18 @@ static void mine_train_rc_track_diag_left_bank_to_25_deg_down(paint_session * se switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20421, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } break; @@ -6397,16 +6397,16 @@ static void mine_train_rc_track_diag_right_bank_to_25_deg_down(paint_session * s case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20418, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } break; @@ -6414,20 +6414,20 @@ static void mine_train_rc_track_diag_right_bank_to_25_deg_down(paint_session * s switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 10, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 11, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20416, -16, -16, 32, 32, 1, height, -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20420, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 9, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } break; @@ -6471,16 +6471,16 @@ static void mine_train_rc_track_diag_25_deg_down_to_left_bank(paint_session * se -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20435, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6490,18 +6490,18 @@ static void mine_train_rc_track_diag_25_deg_down_to_left_bank(paint_session * se switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20431, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6544,16 +6544,16 @@ static void mine_train_rc_track_diag_25_deg_down_to_right_bank(paint_session * s case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20428, -16, -16, 32, 32, 1, height, -16, -16, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6563,20 +6563,20 @@ static void mine_train_rc_track_diag_25_deg_down_to_right_bank(paint_session * s switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20426, -16, -16, 32, 32, 1, height, -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20430, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6620,16 +6620,16 @@ static void mine_train_rc_track_diag_left_bank(paint_session * session, uint8 ri case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20402, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -6640,18 +6640,18 @@ static void mine_train_rc_track_diag_left_bank(paint_session * session, uint8 ri switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20404, -16, -16, 32, 32, 3, height, -16, -16, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -6697,16 +6697,16 @@ static void mine_train_rc_track_diag_right_bank(paint_session * session, uint8 r case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20404, -16, -16, 32, 32, 3, height, -16, -16, height); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -6717,18 +6717,18 @@ static void mine_train_rc_track_diag_right_bank(paint_session * session, uint8 r switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20402, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -6760,13 +6760,13 @@ static void mine_train_rc_track_block_brakes(paint_session * session, uint8 ride case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20060, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 20061, 0, 0, 32, 20, 1, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); @@ -6965,5 +6965,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_mine_train_rc(sint32 trackType, si case TRACK_ELEM_BLOCK_BRAKES: return mine_train_rc_track_block_brakes; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp index adbdb923ab..cefdcdc917 100644 --- a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp @@ -8678,5 +8678,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_mini_rc(sint32 trackType, sint32 d case TRACK_ELEM_BOOSTER: return mini_rc_track_booster; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp index c3c3c14ff7..cf9c2fe770 100644 --- a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp @@ -2295,5 +2295,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_mini_suspended_rc(sint32 trackType case TRACK_ELEM_DIAG_25_DEG_DOWN_TO_FLAT: return mini_suspended_rc_track_diag_25_deg_down_to_flat; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp index 25dc9d64cb..440df9261e 100644 --- a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp @@ -12102,5 +12102,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_multi_dimension_rc(sint32 trackTyp case TRACK_ELEM_255: return multi_dimension_rc_track_elem_255; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp index d956107f6b..8fbfde8531 100644 --- a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp @@ -216,7 +216,7 @@ static void paint_reverse_freefall_rc_flat(paint_session * session, uint8 rideIn paint_util_push_tunnel_left(session, height, TUNNEL_6); } - wooden_a_supports_paint_setup(session, (direction & 1) ? 1 : 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, (direction & 1) ? 1 : 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 32, 0x20); } @@ -238,7 +238,7 @@ static void paint_reverse_freefall_rc_station(paint_session * session, uint8 rid sub_98199C(session, imageId, 0, 0, 32, 20, 1, height, 0, 6, height, get_current_rotation()); wooden_a_supports_paint_setup(session, (direction & 1) ? 1 : 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], - NULL); + nullptr); paint_util_push_tunnel_left(session, height, TUNNEL_6); } else if (direction == 1 || direction == 3) @@ -252,7 +252,7 @@ static void paint_reverse_freefall_rc_station(paint_session * session, uint8 rid sub_98199C(session, imageId, 0, 0, 20, 32, 1, height, 6, 0, height, get_current_rotation()); wooden_a_supports_paint_setup(session, (direction & 1) ? 1 : 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], - NULL); + nullptr); paint_util_push_tunnel_right(session, height, TUNNEL_6); } @@ -308,12 +308,12 @@ static void paint_reverse_freefall_rc_slope(paint_session * session, uint8 rideI sub_98199C_rotated(session, direction, supportsImageId, 0, 0, 32, 20, bbHeight, height, 0, 6, height); } - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + supportHeights[trackSequence], 0x20); break; case 5: - if (wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL)) + if (wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr)) { uint32 floorImageId; if (direction & 1) @@ -347,7 +347,7 @@ static void paint_reverse_freefall_rc_slope(paint_session * session, uint8 rideI sub_98197C_rotated(session, direction, trackImageId, 0, 0, 1, 20, 126, height, 27, 6, height); sub_98199C_rotated(session, direction, supportsImageId, 0, 0, 1, 20, 126, height, 27, 6, height); } - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + supportHeights[trackSequence], 0x20); break; @@ -399,5 +399,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_reverse_freefall_rc(sint32 trackTy case TRACK_ELEM_REVERSE_FREEFALL_VERTICAL: return paint_reverse_freefall_rc_vertical; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp index 222e683230..90d33cd1a1 100644 --- a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp @@ -58,13 +58,13 @@ static void reverser_rc_track_flat(paint_session * session, uint8 rideIndex, uin case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21520, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21521, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -76,13 +76,13 @@ static void reverser_rc_track_flat(paint_session * session, uint8 rideIndex, uin case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21504, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21505, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -105,7 +105,7 @@ static void reverser_rc_track_station(paint_session * session, uint8 rideIndex, 0, 2, height); sub_98199C_rotated(session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); track_paint_util_draw_station_2(session, rideIndex, trackSequence, direction, height, tileElement, 9, 11); paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -123,22 +123,22 @@ static void reverser_rc_track_25_deg_up(paint_session * session, uint8 rideIndex case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21530, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21531, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21532, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21533, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -149,22 +149,22 @@ static void reverser_rc_track_25_deg_up(paint_session * session, uint8 rideIndex case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21516, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21517, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21518, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21519, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -191,22 +191,22 @@ static void reverser_rc_track_flat_to_25_deg_up(paint_session * session, uint8 r case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21522, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21523, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21524, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21525, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -217,22 +217,22 @@ static void reverser_rc_track_flat_to_25_deg_up(paint_session * session, uint8 r case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21508, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21509, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21510, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21511, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -259,22 +259,22 @@ static void reverser_rc_track_25_deg_up_to_flat(paint_session * session, uint8 r case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21526, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21527, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21528, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 7, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 7, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21529, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -285,22 +285,22 @@ static void reverser_rc_track_25_deg_up_to_flat(paint_session * session, uint8 r case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21512, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21513, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21514, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 7, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 7, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21515, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -348,19 +348,19 @@ static void reverser_rc_track_left_quarter_turn_5(paint_session * session, uint8 { case 0: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21543, 0, 2, 32, 27, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21548, 0, 2, 32, 27, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21553, 0, 2, 32, 32, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21538, 0, 2, 32, 32, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -380,19 +380,19 @@ static void reverser_rc_track_left_quarter_turn_5(paint_session * session, uint8 { case 0: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21542, 0, 0, 32, 16, 2, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21547, 0, 0, 32, 16, 2, height); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21552, 0, 16, 32, 16, 2, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21537, 0, 16, 32, 16, 2, height); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -406,19 +406,19 @@ static void reverser_rc_track_left_quarter_turn_5(paint_session * session, uint8 { case 0: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21541, 0, 16, 16, 16, 2, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21546, 16, 16, 16, 16, 2, height); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21551, 16, 0, 16, 16, 2, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21536, 0, 0, 16, 16, 2, height); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, @@ -438,19 +438,19 @@ static void reverser_rc_track_left_quarter_turn_5(paint_session * session, uint8 { case 0: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21540, 16, 0, 16, 34, 2, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21545, 0, 0, 16, 32, 2, height); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21550, 0, 0, 16, 32, 2, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21535, 16, 0, 16, 32, 2, height); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -464,19 +464,19 @@ static void reverser_rc_track_left_quarter_turn_5(paint_session * session, uint8 { case 0: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21539, 2, 0, 32, 32, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21544, 2, 0, 27, 32, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21549, 2, 0, 27, 32, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21534, 2, 0, 32, 32, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -514,22 +514,22 @@ static void reverser_rc_track_s_bend_left(paint_session * session, uint8 rideInd case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21566, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21570, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21569, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21573, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -545,22 +545,22 @@ static void reverser_rc_track_s_bend_left(paint_session * session, uint8 rideInd case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21567, 0, 0, 32, 26, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21571, 0, 0, 32, 26, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21568, 0, 0, 32, 26, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21572, 0, 0, 32, 26, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -575,22 +575,22 @@ static void reverser_rc_track_s_bend_left(paint_session * session, uint8 rideInd case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21568, 0, 0, 32, 26, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21572, 0, 0, 32, 26, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21567, 0, 0, 32, 26, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21571, 0, 0, 32, 26, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -605,22 +605,22 @@ static void reverser_rc_track_s_bend_left(paint_session * session, uint8 rideInd case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21569, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21573, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21566, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21570, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -650,22 +650,22 @@ static void reverser_rc_track_s_bend_right(paint_session * session, uint8 rideIn case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21574, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21578, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21577, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21581, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -681,22 +681,22 @@ static void reverser_rc_track_s_bend_right(paint_session * session, uint8 rideIn case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21575, 0, 0, 32, 26, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21579, 0, 0, 32, 26, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21576, 0, 0, 32, 26, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21580, 0, 0, 32, 26, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -711,22 +711,22 @@ static void reverser_rc_track_s_bend_right(paint_session * session, uint8 rideIn case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21576, 0, 0, 32, 26, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21580, 0, 0, 32, 26, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21575, 0, 0, 32, 26, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21579, 0, 0, 32, 26, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -741,22 +741,22 @@ static void reverser_rc_track_s_bend_right(paint_session * session, uint8 rideIn case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21577, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21581, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21574, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21578, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -786,22 +786,22 @@ static void reverser_rc_track_left_quarter_turn_3(paint_session * session, uint8 case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21559, 0, 0, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21562, 0, 0, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21565, 0, 0, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21556, 0, 0, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -844,22 +844,22 @@ static void reverser_rc_track_left_quarter_turn_3(paint_session * session, uint8 case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21557, 0, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21560, 0, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21563, 0, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21554, 0, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -895,13 +895,13 @@ static void reverser_rc_track_brakes(paint_session * session, uint8 rideIndex, u case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21506, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21507, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); @@ -921,22 +921,22 @@ static void reverser_rc_track_left_reverser(paint_session * session, uint8 rideI case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21582, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21588, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21594, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21600, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -952,22 +952,22 @@ static void reverser_rc_track_left_reverser(paint_session * session, uint8 rideI case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21585, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21591, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21597, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21603, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -979,22 +979,22 @@ static void reverser_rc_track_left_reverser(paint_session * session, uint8 rideI case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21586, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21592, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21598, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21604, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -1006,22 +1006,22 @@ static void reverser_rc_track_left_reverser(paint_session * session, uint8 rideI case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21587, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21593, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21599, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21605, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -1033,22 +1033,22 @@ static void reverser_rc_track_left_reverser(paint_session * session, uint8 rideI case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21583, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21589, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21595, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21601, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -1060,22 +1060,22 @@ static void reverser_rc_track_left_reverser(paint_session * session, uint8 rideI case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21584, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21590, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21596, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21602, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -1105,22 +1105,22 @@ static void reverser_rc_track_right_reverser(paint_session * session, uint8 ride case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21596, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21602, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21584, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21590, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -1136,22 +1136,22 @@ static void reverser_rc_track_right_reverser(paint_session * session, uint8 ride case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21599, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21605, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21587, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21593, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -1163,22 +1163,22 @@ static void reverser_rc_track_right_reverser(paint_session * session, uint8 ride case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21598, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21604, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21586, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21592, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -1190,22 +1190,22 @@ static void reverser_rc_track_right_reverser(paint_session * session, uint8 ride case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21597, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21603, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21585, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21591, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -1217,22 +1217,22 @@ static void reverser_rc_track_right_reverser(paint_session * session, uint8 ride case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21595, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21601, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21583, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21589, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -1244,22 +1244,22 @@ static void reverser_rc_track_right_reverser(paint_session * session, uint8 ride case 0: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21594, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21600, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21582, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21588, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -1318,5 +1318,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_reverser_rc(sint32 trackType, sint case TRACK_ELEM_RIGHT_REVERSER: return reverser_rc_track_right_reverser; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp index c1e38a7d3d..cc69d3a3dd 100644 --- a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp @@ -39,28 +39,28 @@ static void side_friction_rc_track_flat(paint_session * session, uint8 rideIndex height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21664, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21663, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21665, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21666, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21668, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21667, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21669, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -74,7 +74,7 @@ static void side_friction_rc_track_flat(paint_session * session, uint8 rideIndex height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21608, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: case 3: @@ -82,7 +82,7 @@ static void side_friction_rc_track_flat(paint_session * session, uint8 rideIndex height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21609, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -104,7 +104,7 @@ static void side_friction_rc_track_station(paint_session * session, uint8 rideIn sub_98197C_rotated(session, direction, imageIds[direction] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); track_paint_util_draw_station_2(session, rideIndex, trackSequence, direction, height, tileElement, 9, 11); paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -124,28 +124,28 @@ static void side_friction_rc_track_25_deg_up(paint_session * session, uint8 ride height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21690, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21679, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21691, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21680, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21692, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21681, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21693, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -158,28 +158,28 @@ static void side_friction_rc_track_25_deg_up(paint_session * session, uint8 ride height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21634, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21623, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21635, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21624, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21636, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21625, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21637, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -208,28 +208,28 @@ static void side_friction_rc_track_flat_to_25_deg_up(paint_session * session, ui height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21682, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21671, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21683, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21672, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21684, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21673, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21685, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -242,28 +242,28 @@ static void side_friction_rc_track_flat_to_25_deg_up(paint_session * session, ui height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21626, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21615, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21627, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21616, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21628, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21617, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21629, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -292,28 +292,28 @@ static void side_friction_rc_track_25_deg_up_to_flat(paint_session * session, ui height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21686, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21675, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21687, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21676, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21688, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 0, 7, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 7, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21677, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21689, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -326,28 +326,28 @@ static void side_friction_rc_track_25_deg_up_to_flat(paint_session * session, ui height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21630, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21619, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21631, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21620, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21632, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 0, 7, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 7, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21621, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21633, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -397,25 +397,25 @@ static void side_friction_rc_track_left_quarter_turn_5(paint_session * session, sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21727, 0, 2, 32, 27, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21747, 0, 2, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21732, 0, 2, 32, 27, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21752, 0, 2, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21737, 0, 2, 32, 32, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21757, 0, 2, 32, 32, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21722, 0, 2, 32, 32, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21742, 0, 2, 32, 32, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -437,25 +437,25 @@ static void side_friction_rc_track_left_quarter_turn_5(paint_session * session, sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21726, 0, 0, 32, 16, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21746, 0, 0, 32, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21731, 0, 0, 32, 16, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21751, 0, 0, 32, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21736, 0, 16, 32, 16, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21756, 0, 16, 32, 16, 0, height, 0, 16, height + 27); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21721, 0, 16, 32, 16, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21741, 0, 16, 32, 16, 0, height, 0, 16, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -471,25 +471,25 @@ static void side_friction_rc_track_left_quarter_turn_5(paint_session * session, sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21725, 0, 16, 16, 16, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21745, 0, 16, 16, 16, 0, height, 0, 16, height + 27); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21730, 16, 16, 16, 16, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21750, 16, 16, 16, 16, 0, height, 16, 16, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21735, 16, 0, 16, 16, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21755, 16, 0, 16, 16, 0, height, 16, 0, height + 27); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21720, 0, 0, 16, 16, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21740, 0, 0, 16, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, @@ -511,25 +511,25 @@ static void side_friction_rc_track_left_quarter_turn_5(paint_session * session, sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21724, 16, 0, 16, 34, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21744, 16, 0, 16, 34, 0, height, 16, 0, height + 27); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21729, 0, 0, 16, 32, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21749, 0, 0, 16, 32, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21734, 0, 0, 16, 32, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21754, 0, 0, 16, 32, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21719, 16, 0, 16, 32, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21739, 16, 0, 16, 32, 0, height, 16, 0, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -545,25 +545,25 @@ static void side_friction_rc_track_left_quarter_turn_5(paint_session * session, sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21723, 2, 0, 32, 32, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21743, 2, 0, 32, 32, 0, height, 2, 0, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21728, 2, 0, 27, 32, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21748, 2, 0, 27, 32, 0, height, 2, 0, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21733, 2, 0, 27, 32, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21753, 2, 0, 27, 32, 0, height, 2, 0, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21718, 2, 0, 32, 32, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21738, 2, 0, 32, 32, 0, height, 2, 0, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -603,28 +603,28 @@ static void side_friction_rc_track_s_bend_left(paint_session * session, uint8 ri height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21904, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21892, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21908, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21891, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21907, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21895, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21911, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -642,28 +642,28 @@ static void side_friction_rc_track_s_bend_left(paint_session * session, uint8 ri height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21905, 0, 0, 32, 26, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21893, 0, 0, 32, 26, 2, height, 0, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21909, 0, 0, 32, 26, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21890, 0, 0, 32, 26, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21906, 0, 0, 32, 26, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21894, 0, 0, 32, 26, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21910, 0, 0, 32, 26, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -680,28 +680,28 @@ static void side_friction_rc_track_s_bend_left(paint_session * session, uint8 ri height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21906, 0, 0, 32, 26, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21894, 0, 0, 32, 26, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21910, 0, 0, 32, 26, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21889, 0, 0, 32, 26, 2, height, 0, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21905, 0, 0, 32, 26, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21893, 0, 0, 32, 26, 2, height, 0, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21909, 0, 0, 32, 26, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -718,28 +718,28 @@ static void side_friction_rc_track_s_bend_left(paint_session * session, uint8 ri height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21907, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21895, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21911, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21888, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21904, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21892, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21908, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -771,28 +771,28 @@ static void side_friction_rc_track_s_bend_right(paint_session * session, uint8 r height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21912, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21900, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21916, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21899, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21915, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21903, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21919, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -810,28 +810,28 @@ static void side_friction_rc_track_s_bend_right(paint_session * session, uint8 r height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21913, 0, 0, 32, 26, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21901, 0, 0, 32, 26, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21917, 0, 0, 32, 26, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21898, 0, 0, 32, 26, 2, height, 0, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21914, 0, 0, 32, 26, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21902, 0, 0, 32, 26, 2, height, 0, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21918, 0, 0, 32, 26, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -848,28 +848,28 @@ static void side_friction_rc_track_s_bend_right(paint_session * session, uint8 r height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21914, 0, 0, 32, 26, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21902, 0, 0, 32, 26, 2, height, 0, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21918, 0, 0, 32, 26, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21897, 0, 0, 32, 26, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21913, 0, 0, 32, 26, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21901, 0, 0, 32, 26, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21917, 0, 0, 32, 26, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -886,28 +886,28 @@ static void side_friction_rc_track_s_bend_right(paint_session * session, uint8 r height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21915, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21903, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21919, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21896, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21912, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21900, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21916, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -939,28 +939,28 @@ static void side_friction_rc_track_left_quarter_turn_3(paint_session * session, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21711, 0, 0, 32, 20, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21702, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21714, 0, 0, 32, 20, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21705, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21717, 0, 0, 32, 20, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21696, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21708, 0, 0, 32, 20, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -1013,28 +1013,28 @@ static void side_friction_rc_track_left_quarter_turn_3(paint_session * session, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21709, 0, 0, 20, 32, 0, height, 6, 0, height + 27); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21700, 0, 0, 20, 32, 2, height, 6, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21712, 0, 0, 20, 32, 0, height, 6, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21703, 0, 0, 20, 32, 2, height, 6, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21715, 0, 0, 20, 32, 0, height, 6, 0, height + 27); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21694, 0, 0, 20, 32, 2, height, 6, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21706, 0, 0, 20, 32, 0, height, 6, 0, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -1072,7 +1072,7 @@ static void side_friction_rc_track_brakes(paint_session * session, uint8 rideInd height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21612, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: case 3: @@ -1080,7 +1080,7 @@ static void side_friction_rc_track_brakes(paint_session * session, uint8 rideInd height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21613, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); @@ -1102,28 +1102,28 @@ static void side_friction_rc_track_left_eighth_to_diag(paint_session * session, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21806, 0, 0, 32, 32, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21794, 0, 0, 32, 32, 2, height, 0, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21810, 0, 0, 32, 32, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21798, 0, 0, 32, 32, 2, height, 0, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21814, 0, 0, 32, 32, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21802, 0, 0, 32, 32, 2, height, 0, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21818, 0, 0, 32, 32, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -1141,28 +1141,28 @@ static void side_friction_rc_track_left_eighth_to_diag(paint_session * session, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21807, 0, 0, 32, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21795, 0, 0, 34, 16, 2, height, 0, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21811, 0, 0, 32, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21799, 0, 0, 32, 16, 2, height, 0, 16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21815, 0, 0, 32, 16, 0, height, 0, 16, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21803, 0, 0, 32, 16, 2, height, 0, 16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21819, 0, 0, 32, 16, 0, height, 0, 16, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -1176,28 +1176,28 @@ static void side_friction_rc_track_left_eighth_to_diag(paint_session * session, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21808, 0, 0, 16, 16, 0, height, 0, 16, height + 27); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21796, 0, 0, 16, 16, 2, height, 16, 16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21812, 0, 0, 16, 16, 0, height, 16, 16, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21800, 0, 0, 16, 16, 2, height, 16, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21816, 0, 0, 16, 16, 0, height, 16, 0, height + 27); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21804, 0, 0, 16, 16, 2, height, 0, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21820, 0, 0, 16, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -1207,16 +1207,16 @@ static void side_friction_rc_track_left_eighth_to_diag(paint_session * session, switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -1270,28 +1270,28 @@ static void side_friction_rc_track_right_eighth_to_diag(paint_session * session, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21774, 0, 0, 32, 32, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21762, 0, 0, 32, 32, 2, height, 0, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21778, 0, 0, 32, 32, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21766, 0, 0, 32, 32, 2, height, 0, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21782, 0, 0, 32, 32, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21770, 0, 0, 32, 32, 2, height, 0, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21786, 0, 0, 32, 32, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -1309,28 +1309,28 @@ static void side_friction_rc_track_right_eighth_to_diag(paint_session * session, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21775, 0, 0, 32, 16, 0, height, 0, 16, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21763, 0, 0, 32, 16, 2, height, 0, 16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21779, 0, 0, 32, 16, 0, height, 0, 16, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21767, 0, 0, 34, 16, 2, height, 0, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21783, 0, 0, 32, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21771, 0, 0, 32, 16, 2, height, 0, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21787, 0, 0, 32, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -1344,28 +1344,28 @@ static void side_friction_rc_track_right_eighth_to_diag(paint_session * session, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21776, 0, 0, 16, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21764, 0, 0, 16, 16, 2, height, 16, 0, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21780, 0, 0, 16, 16, 0, height, 16, 0, height + 27); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21768, 0, 0, 28, 28, 2, height, 4, 4, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21784, 0, 0, 28, 28, 0, height, 4, 4, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21772, 0, 0, 16, 16, 2, height, 0, 16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21788, 0, 0, 16, 16, 0, height, 0, 16, height + 27); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -1375,16 +1375,16 @@ static void side_friction_rc_track_right_eighth_to_diag(paint_session * session, switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -1480,16 +1480,16 @@ static void side_friction_rc_track_diag_flat(paint_session * session, uint8 ride -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21850, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -1502,16 +1502,16 @@ static void side_friction_rc_track_diag_flat(paint_session * session, uint8 ride -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21826, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -1524,20 +1524,20 @@ static void side_friction_rc_track_diag_flat(paint_session * session, uint8 ride switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21848, -16, -16, 32, 32, 2, height, -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21851, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -1546,20 +1546,20 @@ static void side_friction_rc_track_diag_flat(paint_session * session, uint8 ride switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21824, -16, -16, 32, 32, 2, height, -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21827, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -1633,16 +1633,16 @@ static void side_friction_rc_track_diag_25_deg_up(paint_session * session, uint8 -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21868, -16, -16, 32, 32, 0, height, -16, -16, height + 43); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -1655,16 +1655,16 @@ static void side_friction_rc_track_diag_25_deg_up(paint_session * session, uint8 -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21844, -16, -16, 32, 32, 0, height, -16, -16, height + 43); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -1677,20 +1677,20 @@ static void side_friction_rc_track_diag_25_deg_up(paint_session * session, uint8 switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21866, -16, -16, 32, 32, 2, height, -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21869, -16, -16, 32, 32, 0, height, -16, -16, height + 43); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -1699,20 +1699,20 @@ static void side_friction_rc_track_diag_25_deg_up(paint_session * session, uint8 switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21842, -16, -16, 32, 32, 2, height, -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21845, -16, -16, 32, 32, 0, height, -16, -16, height + 43); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -1786,16 +1786,16 @@ static void side_friction_rc_track_diag_flat_to_25_deg_up(paint_session * sessio -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21856, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -1808,16 +1808,16 @@ static void side_friction_rc_track_diag_flat_to_25_deg_up(paint_session * sessio -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21832, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -1830,20 +1830,20 @@ static void side_friction_rc_track_diag_flat_to_25_deg_up(paint_session * sessio switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21854, -16, -16, 32, 32, 2, height, -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21857, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -1852,20 +1852,20 @@ static void side_friction_rc_track_diag_flat_to_25_deg_up(paint_session * sessio switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21830, -16, -16, 32, 32, 2, height, -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21833, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -1939,16 +1939,16 @@ static void side_friction_rc_track_diag_25_deg_up_to_flat(paint_session * sessio -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21862, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -1961,16 +1961,16 @@ static void side_friction_rc_track_diag_25_deg_up_to_flat(paint_session * sessio -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21838, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -1983,20 +1983,20 @@ static void side_friction_rc_track_diag_25_deg_up_to_flat(paint_session * sessio switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21860, -16, -16, 32, 32, 2, height, -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21863, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -2005,20 +2005,20 @@ static void side_friction_rc_track_diag_25_deg_up_to_flat(paint_session * sessio switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21836, -16, -16, 32, 32, 2, height, -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21839, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -2092,16 +2092,16 @@ static void side_friction_rc_track_diag_25_deg_down(paint_session * session, uin -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21869, -16, -16, 32, 32, 0, height, -16, -16, height + 43); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -2114,16 +2114,16 @@ static void side_friction_rc_track_diag_25_deg_down(paint_session * session, uin -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21845, -16, -16, 32, 32, 0, height, -16, -16, height + 43); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -2136,20 +2136,20 @@ static void side_friction_rc_track_diag_25_deg_down(paint_session * session, uin switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21864, -16, -16, 32, 32, 2, height, -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21868, -16, -16, 32, 32, 0, height, -16, -16, height + 43); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -2158,20 +2158,20 @@ static void side_friction_rc_track_diag_25_deg_down(paint_session * session, uin switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21840, -16, -16, 32, 32, 2, height, -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21844, -16, -16, 32, 32, 0, height, -16, -16, height + 43); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -2243,16 +2243,16 @@ static void side_friction_rc_track_diag_flat_to_25_deg_down(paint_session * sess -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21863, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -2265,16 +2265,16 @@ static void side_friction_rc_track_diag_flat_to_25_deg_down(paint_session * sess -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21839, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -2285,20 +2285,20 @@ static void side_friction_rc_track_diag_flat_to_25_deg_down(paint_session * sess switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21858, -16, -16, 32, 32, 2, height, -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21862, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -2307,20 +2307,20 @@ static void side_friction_rc_track_diag_flat_to_25_deg_down(paint_session * sess switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21834, -16, -16, 32, 32, 2, height, -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21838, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -2393,16 +2393,16 @@ static void side_friction_rc_track_diag_25_deg_down_to_flat(paint_session * sess -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21857, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -2415,16 +2415,16 @@ static void side_friction_rc_track_diag_25_deg_down_to_flat(paint_session * sess -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21833, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -2437,20 +2437,20 @@ static void side_friction_rc_track_diag_25_deg_down_to_flat(paint_session * sess switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21852, -16, -16, 32, 32, 2, height, -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21856, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -2459,20 +2459,20 @@ static void side_friction_rc_track_diag_25_deg_down_to_flat(paint_session * sess switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21828, -16, -16, 32, 32, 2, height, -16, -16, height); sub_98197C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 21832, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -2565,5 +2565,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_side_friction_rc(sint32 trackType, case TRACK_ELEM_DIAG_25_DEG_DOWN_TO_FLAT: return side_friction_rc_track_diag_25_deg_down_to_flat; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp index 3d780c90ef..7c259318c2 100644 --- a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp @@ -7723,5 +7723,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_stand_up_rc(sint32 trackType, sint case TRACK_ELEM_BLOCK_BRAKES: return stand_up_rc_track_block_brakes; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/Steeplechase.cpp b/src/openrct2/ride/coaster/Steeplechase.cpp index dbfd8eb23b..f84022fcbb 100644 --- a/src/openrct2/ride/coaster/Steeplechase.cpp +++ b/src/openrct2/ride/coaster/Steeplechase.cpp @@ -2159,5 +2159,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_steeplechase(sint32 trackType, sin case TRACK_ELEM_BLOCK_BRAKES: return steeplechase_track_block_brakes; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp index a7862e1d28..acfc93b143 100644 --- a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp +++ b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp @@ -4073,5 +4073,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_suspended_swinging_rc(sint32 track case TRACK_ELEM_BLOCK_BRAKES: return suspended_swinging_rc_track_block_brakes; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp index 2a72931715..012e1188fa 100644 --- a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp @@ -1833,5 +1833,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_twister_rc(sint32 trackType, sint3 case TRACK_ELEM_BOOSTER: return twister_rc_track_booster; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp b/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp index 97b9b54309..622dc4cd81 100644 --- a/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp @@ -1841,5 +1841,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_vertical_drop_rc(sint32 trackType, case TRACK_ELEM_BOOSTER: return vertical_drop_rc_track_booster; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/VirginiaReel.cpp b/src/openrct2/ride/coaster/VirginiaReel.cpp index df738898da..44eecbefda 100644 --- a/src/openrct2/ride/coaster/VirginiaReel.cpp +++ b/src/openrct2/ride/coaster/VirginiaReel.cpp @@ -251,7 +251,7 @@ static void paint_virginia_reel_track_flat(paint_session * session, uint8 rideIn paint_util_push_tunnel_left(session, height, TUNNEL_6); } - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 32, 0x20); @@ -287,19 +287,19 @@ static void paint_virginia_reel_track_25_deg_up(paint_session * session, uint8 r switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_left(session, height - 8, TUNNEL_7); break; case 1: - wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 2: - wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; case 3: - wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_right(session, height - 8, TUNNEL_7); break; } @@ -325,27 +325,27 @@ static void paint_virginia_reel_track_flat_to_25_deg_up(paint_session * session, case 0: sub_98197C(session, imageId, 0, 0, 32, 27, 2, height, 0, 2, height, get_current_rotation()); - wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_left(session, height, TUNNEL_6); break; case 1: ps = sub_98197C(session, imageId, 0, 0, 27, 32, 2, height, 2, 0, height, get_current_rotation()); session->WoodenSupportsPrependTo = ps; - wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_right(session, height, TUNNEL_8); break; case 2: ps = sub_98197C(session, imageId, 0, 0, 32, 27, 2, height, 0, 2, height, get_current_rotation()); session->WoodenSupportsPrependTo = ps; - wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_left(session, height, TUNNEL_8); break; case 3: sub_98197C(session, imageId, 0, 0, 27, 32, 2, height, 2, 0, height, get_current_rotation()); - wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_right(session, height, TUNNEL_6); break; } @@ -384,19 +384,19 @@ static void paint_virginia_reel_track_25_deg_up_to_flat(paint_session * session, switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_left(session, height - 8, TUNNEL_6); break; case 1: - wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_right(session, height + 8, TUNNEL_14); break; case 2: - wooden_a_supports_paint_setup(session, 0, 7, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 7, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_left(session, height + 8, TUNNEL_14); break; case 3: - wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_right(session, height - 8, TUNNEL_6); break; } @@ -453,7 +453,7 @@ static void paint_virginia_reel_station(paint_session * session, uint8 rideIndex paint_util_push_tunnel_right(session, height, TUNNEL_6); } - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); track_paint_util_draw_station(session, rideIndex, trackSequence, direction, height, tileElement); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -480,7 +480,7 @@ static void paint_virginia_reel_track_left_quarter_turn_3_tiles(paint_session * case 0: case 3: wooden_a_supports_paint_setup(session, virginia_reel_left_quarter_turn_supports[direction], 0, height, - session->TrackColours[SCHEME_SUPPORTS], NULL); + session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, paint_util_rotate_segments(SEGMENTS_ALL, direction), 0xFFFF, 0); break; } @@ -510,18 +510,18 @@ static void paint_virginia_reel_track_left_quarter_turn_1_tile(paint_session * s switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_left(session, height, TUNNEL_6); break; case 1: - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_right(session, height, TUNNEL_6); paint_util_push_tunnel_left(session, height, TUNNEL_6); break; @@ -579,5 +579,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_virginia_reel(sint32 trackType, si return paint_virginia_reel_track_right_quarter_turn_1_tile; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/WildMouse.cpp b/src/openrct2/ride/coaster/WildMouse.cpp index 2d2c12f952..6db9c7b735 100644 --- a/src/openrct2/ride/coaster/WildMouse.cpp +++ b/src/openrct2/ride/coaster/WildMouse.cpp @@ -971,5 +971,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_wild_mouse(sint32 trackType, sint3 case TRACK_ELEM_BLOCK_BRAKES: return wild_mouse_track_block_brakes; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp index 77627366dd..a93592a8b6 100644 --- a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp @@ -456,7 +456,7 @@ static void wooden_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 uint8 isChained = track_element_is_lift_hill(tileElement) ? 1 : 0; wooden_rc_track_paint(session, imageIds[direction][isChained], railsImageIds[direction][isChained], direction, 0, 2, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 32, 0x20); @@ -484,7 +484,7 @@ static void wooden_rc_track_station(paint_session * session, uint8 rideIndex, ui wooden_rc_track_paint(session, stationImageIds[direction][0], stationImageIds[direction][1], direction, 0, 2, 32, 27, 2, height, 0, 2, height); } - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); track_paint_util_draw_station_2(session, rideIndex, trackSequence, direction, height, tileElement, 9, 11); paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -522,7 +522,7 @@ static void wooden_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, wooden_rc_track_paint(session, imageIds[isChained][direction][2], imageIds[isChained][direction][3], direction, 0, 0, 32, 1, 9, height, 0, 26, height + 5); } - wooden_a_supports_paint_setup(session, direction & 1, 9 + direction, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 9 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction == 0 || direction == 3) { @@ -558,7 +558,7 @@ static void wooden_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, session->WoodenSupportsPrependTo = wooden_rc_track_paint(session, imageIds[direction][0], imageIds[direction][1], direction, 0, 0, 2, 24, 93, height, 28, 4, height - 16); } - wooden_a_supports_paint_setup(session, direction & 1, 21 + direction, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 21 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction == 0 || direction == 3) { @@ -604,7 +604,7 @@ static void wooden_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rid wooden_rc_track_paint(session, imageIds[isChained][direction][2], imageIds[isChained][direction][3], direction, 0, 0, 32, 1, 9, height, 0, 26, height + 5); } - wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction == 0 || direction == 3) { @@ -644,7 +644,7 @@ static void wooden_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint wooden_rc_track_paint(session, imageIds[direction][2], imageIds[direction][3], direction, 0, 0, 32, 2, 43, height, 0, 4, height); } - wooden_a_supports_paint_setup(session, direction & 1, 13 + direction, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 13 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction == 0 || direction == 3) { @@ -684,7 +684,7 @@ static void wooden_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint wooden_rc_track_paint(session, imageIds[direction][2], imageIds[direction][3], direction, 0, 0, 32, 2, 43, height, 0, 4, height); } - wooden_a_supports_paint_setup(session, direction & 1, 17 + direction, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 17 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction == 0 || direction == 3) { @@ -730,7 +730,7 @@ static void wooden_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rid wooden_rc_track_paint(session, imageIds[isChained][direction][2], imageIds[isChained][direction][3], direction, 0, 0, 32, 1, 9, height, 0, 26, height + 5); } - wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction == 0 || direction == 3) { @@ -998,7 +998,7 @@ static void wooden_rc_track_right_quarter_turn_5(paint_session * session, uint8 if (supportType[direction][trackSequence] != -1) { wooden_a_supports_paint_setup(session, supportType[direction][trackSequence], 0, height, - session->TrackColours[SCHEME_SUPPORTS], NULL); + session->TrackColours[SCHEME_SUPPORTS], nullptr); } sint32 blockedSegments = 0; @@ -1058,7 +1058,7 @@ static void wooden_rc_track_flat_to_left_bank(paint_session * session, uint8 rid wooden_rc_track_paint(session, imageIds[direction][2], imageIds[direction][3], direction, 0, 0, 32, 1, 9, height, 0, 26, height + 5); } - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 32, 0x20); @@ -1084,7 +1084,7 @@ static void wooden_rc_track_flat_to_right_bank(paint_session * session, uint8 ri wooden_rc_track_paint(session, imageIds[direction][2], imageIds[direction][3], direction, 0, 0, 32, 1, 9, height, 0, 26, height + 5); } - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 32, 0x20); @@ -1315,7 +1315,7 @@ static void wooden_rc_track_banked_right_quarter_turn_5(paint_session * session, if (supportType[direction][trackSequence] != -1) { wooden_a_supports_paint_setup(session, supportType[direction][trackSequence], 0, height, - session->TrackColours[SCHEME_SUPPORTS], NULL); + session->TrackColours[SCHEME_SUPPORTS], nullptr); } sint32 blockedSegments = 0; @@ -1375,7 +1375,7 @@ static void wooden_rc_track_left_bank_to_25_deg_up(paint_session * session, uint wooden_rc_track_paint(session, imageIds[direction][2], imageIds[direction][3], direction, 0, 0, 32, 1, 9, height, 0, 26, height + 5); } - wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction == 0 || direction == 3) { paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); @@ -1408,7 +1408,7 @@ static void wooden_rc_track_right_bank_to_25_deg_up(paint_session * session, uin wooden_rc_track_paint(session, imageIds[direction][2], imageIds[direction][3], direction, 0, 0, 32, 1, 9, height, 0, 26, height + 5); } - wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction == 0 || direction == 3) { paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); @@ -1441,7 +1441,7 @@ static void wooden_rc_track_25_deg_up_to_left_bank(paint_session * session, uint wooden_rc_track_paint(session, imageIds[direction][2], imageIds[direction][3], direction, 0, 0, 32, 1, 9, height, 0, 26, height + 5); } - wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction == 0 || direction == 3) { paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); @@ -1474,7 +1474,7 @@ static void wooden_rc_track_25_deg_up_to_right_bank(paint_session * session, uin wooden_rc_track_paint(session, imageIds[direction][2], imageIds[direction][3], direction, 0, 0, 32, 1, 9, height, 0, 26, height + 5); } - wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction == 0 || direction == 3) { paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); @@ -1528,7 +1528,7 @@ static void wooden_rc_track_left_bank(paint_session * session, uint8 rideIndex, wooden_rc_track_paint(session, imageIds[direction][0], imageIds[direction][1], direction, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 32, 0x20); @@ -1555,7 +1555,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24647, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23786, 0, 0, 32, 27, 2, height, 0, 2, @@ -1566,21 +1566,21 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24678, 0, 0, 32, 27, 0, height, 0, 2, height + 67); - wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23791, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24657, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23796, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24662, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -1603,7 +1603,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24648, 0, 0, 32, 16, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23787, 0, 0, 32, 16, 2, height, 0, 0, @@ -1614,14 +1614,14 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24679, 0, 0, 32, 16, 0, height, 0, 0, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23792, 0, 0, 32, 16, 2, height, 0, 16, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24658, 0, 0, 32, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23797, 0, 0, 32, 16, 2, height, 0, 16, @@ -1632,7 +1632,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24685, 0, 0, 32, 16, 0, height, 0, 16, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -1649,7 +1649,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24649, 0, 0, 16, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23788, 0, 0, 16, 16, 2, height, 16, 16, @@ -1660,14 +1660,14 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio height + 59); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24680, 0, 0, 16, 16, 0, height, 16, 16, height + 59); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23793, 0, 0, 16, 16, 2, height, 16, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24659, 0, 0, 16, 16, 2, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23798, 0, 0, 16, 16, 2, height, 0, 0, @@ -1678,7 +1678,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio height + 59); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24686, 0, 0, 16, 16, 0, height, 0, 0, height + 59); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, @@ -1701,7 +1701,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24650, 0, 0, 16, 32, 2, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23789, 0, 0, 16, 32, 2, height, 0, 0, @@ -1712,7 +1712,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24681, 0, 0, 16, 32, 0, height, 0, 0, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23794, 0, 0, 16, 32, 2, height, 0, 0, @@ -1723,7 +1723,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24683, 0, 0, 16, 32, 0, height, 0, 0, height + 67); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23799, 0, 0, 16, 32, 2, height, 16, 0, @@ -1734,7 +1734,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24687, 0, 0, 16, 32, 0, height, 16, 0, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -1751,7 +1751,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24651, 0, 0, 27, 32, 2, height, 2, 0, height); - wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23790, 0, 0, 27, 32, 2, height, 2, 0, @@ -1762,7 +1762,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24682, 0, 0, 27, 32, 0, height, 2, 0, height + 67); - wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23795, 0, 0, 27, 32, 2, height, 2, 0, @@ -1773,7 +1773,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24684, 0, 0, 27, 32, 0, height, 2, 0, height + 67); - wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23800, 0, 0, 27, 32, 2, height, 2, 0, @@ -1784,7 +1784,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24688, 0, 0, 27, 32, 0, height, 2, 0, height + 67); - wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -1816,14 +1816,14 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sessi height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24627, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23766, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24632, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23771, 0, 0, 32, 27, 2, height, 0, 2, @@ -1834,14 +1834,14 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sessi height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24673, 0, 0, 32, 27, 0, height, 0, 2, height + 67); - wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23776, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24642, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -1868,14 +1868,14 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sessi height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24667, 0, 0, 32, 16, 0, height, 0, 16, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23767, 0, 0, 32, 16, 2, height, 0, 16, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24633, 0, 0, 32, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23772, 0, 0, 32, 16, 2, height, 0, 0, @@ -1886,14 +1886,14 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sessi height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24674, 0, 0, 32, 16, 0, height, 0, 0, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23777, 0, 0, 32, 16, 2, height, 0, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24643, 0, 0, 32, 16, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -1914,14 +1914,14 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sessi height + 59); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24668, 0, 0, 16, 16, 0, height, 0, 0, height + 59); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23768, 0, 0, 16, 16, 2, height, 16, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24634, 0, 0, 16, 16, 2, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23773, 0, 0, 16, 16, 2, height, 16, 16, @@ -1932,14 +1932,14 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sessi height + 59); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24675, 0, 0, 16, 16, 0, height, 16, 16, height + 59); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23778, 0, 0, 16, 16, 2, height, 0, 16, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24644, 0, 0, 16, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, @@ -1966,7 +1966,7 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sessi height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24669, 0, 0, 16, 32, 0, height, 16, 0, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23769, 0, 0, 16, 32, 2, height, 0, 0, @@ -1977,7 +1977,7 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sessi height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24671, 0, 0, 16, 32, 0, height, 0, 0, height + 67); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23774, 0, 0, 16, 32, 2, height, 0, 0, @@ -1988,14 +1988,14 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sessi height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24676, 0, 0, 16, 32, 0, height, 0, 0, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23779, 0, 0, 16, 32, 2, height, 16, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24645, 0, 0, 16, 32, 2, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -2016,7 +2016,7 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sessi height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24670, 0, 0, 27, 32, 0, height, 2, 0, height + 67); - wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23770, 0, 0, 27, 32, 2, height, 2, 0, @@ -2027,7 +2027,7 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sessi height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24672, 0, 0, 27, 32, 0, height, 2, 0, height + 67); - wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23775, 0, 0, 27, 32, 2, height, 2, 0, @@ -2038,14 +2038,14 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sessi height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24677, 0, 0, 27, 32, 0, height, 2, 0, height + 67); - wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23780, 0, 0, 27, 32, 2, height, 2, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24646, 0, 0, 27, 32, 2, height, 2, 0, height); - wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -2093,7 +2093,7 @@ static void wooden_rc_track_s_bend_left(paint_session * session, uint8 rideIndex height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24591, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23729, 0, 0, 32, 25, 2, height, 0, 3, @@ -2104,14 +2104,14 @@ static void wooden_rc_track_s_bend_left(paint_session * session, uint8 rideIndex height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24607, 0, 0, 32, 25, 0, height, 0, 3, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23728, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24594, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23732, 0, 0, 32, 25, 2, height, 0, 3, @@ -2122,7 +2122,7 @@ static void wooden_rc_track_s_bend_left(paint_session * session, uint8 rideIndex height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24610, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -2140,7 +2140,7 @@ static void wooden_rc_track_s_bend_left(paint_session * session, uint8 rideIndex height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24592, 0, 0, 32, 26, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23730, 0, 0, 32, 26, 2, height, 0, 0, @@ -2151,14 +2151,14 @@ static void wooden_rc_track_s_bend_left(paint_session * session, uint8 rideIndex height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24608, 0, 0, 32, 26, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23727, 0, 0, 32, 26, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24593, 0, 0, 32, 26, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23731, 0, 0, 32, 26, 2, height, 0, 6, @@ -2169,7 +2169,7 @@ static void wooden_rc_track_s_bend_left(paint_session * session, uint8 rideIndex height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24609, 0, 0, 32, 26, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -2186,7 +2186,7 @@ static void wooden_rc_track_s_bend_left(paint_session * session, uint8 rideIndex height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24593, 0, 0, 32, 26, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23731, 0, 0, 32, 26, 2, height, 0, 6, @@ -2197,14 +2197,14 @@ static void wooden_rc_track_s_bend_left(paint_session * session, uint8 rideIndex height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24609, 0, 0, 32, 26, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23726, 0, 0, 32, 26, 2, height, 0, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24592, 0, 0, 32, 26, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23730, 0, 0, 32, 26, 2, height, 0, 0, @@ -2215,7 +2215,7 @@ static void wooden_rc_track_s_bend_left(paint_session * session, uint8 rideIndex height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24608, 0, 0, 32, 26, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -2232,7 +2232,7 @@ static void wooden_rc_track_s_bend_left(paint_session * session, uint8 rideIndex height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24594, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23732, 0, 0, 32, 25, 2, height, 0, 3, @@ -2243,14 +2243,14 @@ static void wooden_rc_track_s_bend_left(paint_session * session, uint8 rideIndex height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24610, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23725, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24591, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23729, 0, 0, 32, 25, 2, height, 0, 3, @@ -2261,7 +2261,7 @@ static void wooden_rc_track_s_bend_left(paint_session * session, uint8 rideIndex height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24607, 0, 0, 32, 25, 0, height, 0, 3, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -2297,14 +2297,14 @@ static void wooden_rc_track_s_bend_right(paint_session * session, uint8 rideInde height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24611, 0, 0, 32, 25, 0, height, 0, 3, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23737, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24603, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23736, 0, 0, 32, 25, 2, height, 0, 3, @@ -2315,14 +2315,14 @@ static void wooden_rc_track_s_bend_right(paint_session * session, uint8 rideInde height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24614, 0, 0, 32, 25, 0, height, 0, 3, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23740, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24606, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -2344,14 +2344,14 @@ static void wooden_rc_track_s_bend_right(paint_session * session, uint8 rideInde height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24612, 0, 0, 32, 26, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23738, 0, 0, 32, 26, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24604, 0, 0, 32, 26, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23735, 0, 0, 32, 26, 2, height, 0, 0, @@ -2362,14 +2362,14 @@ static void wooden_rc_track_s_bend_right(paint_session * session, uint8 rideInde height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24613, 0, 0, 32, 26, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23739, 0, 0, 32, 26, 2, height, 0, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24605, 0, 0, 32, 26, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -2390,14 +2390,14 @@ static void wooden_rc_track_s_bend_right(paint_session * session, uint8 rideInde height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24613, 0, 0, 32, 26, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23739, 0, 0, 32, 26, 2, height, 0, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24605, 0, 0, 32, 26, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23734, 0, 0, 32, 26, 2, height, 0, 6, @@ -2408,14 +2408,14 @@ static void wooden_rc_track_s_bend_right(paint_session * session, uint8 rideInde height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24612, 0, 0, 32, 26, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23738, 0, 0, 32, 26, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24604, 0, 0, 32, 26, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -2436,14 +2436,14 @@ static void wooden_rc_track_s_bend_right(paint_session * session, uint8 rideInde height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24614, 0, 0, 32, 25, 0, height, 0, 3, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23740, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24606, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23733, 0, 0, 32, 25, 2, height, 0, 3, @@ -2454,14 +2454,14 @@ static void wooden_rc_track_s_bend_right(paint_session * session, uint8 rideInde height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24611, 0, 0, 32, 25, 0, height, 0, 3, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23737, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24603, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -2887,7 +2887,7 @@ static void wooden_rc_track_left_quarter_turn_3(paint_session * session, uint8 r height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24694, 0, 6, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23831, 0, 6, 32, 20, 2, height, 0, 6, @@ -2898,14 +2898,14 @@ static void wooden_rc_track_left_quarter_turn_3(paint_session * session, uint8 r height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24706, 0, 6, 32, 20, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23834, 0, 6, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24700, 0, 6, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23825, 0, 6, 32, 20, 2, height, 0, 6, @@ -2916,7 +2916,7 @@ static void wooden_rc_track_left_quarter_turn_3(paint_session * session, uint8 r height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24703, 0, 6, 32, 20, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -2977,7 +2977,7 @@ static void wooden_rc_track_left_quarter_turn_3(paint_session * session, uint8 r height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24692, 6, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23829, 6, 0, 20, 32, 2, height, 6, 0, @@ -2988,14 +2988,14 @@ static void wooden_rc_track_left_quarter_turn_3(paint_session * session, uint8 r height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24704, 6, 0, 20, 32, 0, height, 6, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23832, 6, 0, 20, 32, 2, height, 6, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24698, 6, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23823, 6, 0, 20, 32, 2, height, 6, 0, @@ -3006,7 +3006,7 @@ static void wooden_rc_track_left_quarter_turn_3(paint_session * session, uint8 r height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24701, 6, 0, 20, 32, 0, height, 6, 0, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -3046,7 +3046,7 @@ static void wooden_rc_track_left_quarter_turn_3_bank(paint_session * session, ui height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24712, 0, 0, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23849, 0, 0, 32, 20, 2, height, 0, 6, @@ -3057,14 +3057,14 @@ static void wooden_rc_track_left_quarter_turn_3_bank(paint_session * session, ui height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24724, 0, 0, 32, 20, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23852, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24718, 0, 0, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23843, 0, 0, 32, 20, 2, height, 0, 6, @@ -3075,7 +3075,7 @@ static void wooden_rc_track_left_quarter_turn_3_bank(paint_session * session, ui height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24721, 0, 0, 32, 20, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -3136,7 +3136,7 @@ static void wooden_rc_track_left_quarter_turn_3_bank(paint_session * session, ui height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24710, 0, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23847, 0, 0, 20, 32, 2, height, 6, 0, @@ -3147,14 +3147,14 @@ static void wooden_rc_track_left_quarter_turn_3_bank(paint_session * session, ui height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24722, 0, 0, 20, 32, 0, height, 6, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23850, 0, 0, 20, 32, 2, height, 6, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24716, 0, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23841, 0, 0, 20, 32, 2, height, 6, 0, @@ -3165,7 +3165,7 @@ static void wooden_rc_track_left_quarter_turn_3_bank(paint_session * session, ui height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24719, 0, 0, 20, 32, 0, height, 6, 0, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -3205,7 +3205,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sessio height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24772, 0, 6, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23908, 0, 6, 32, 20, 2, height, 0, 6, @@ -3216,14 +3216,14 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sessio height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24785, 0, 6, 32, 20, 0, height, 0, 6, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23910, 0, 6, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24776, 0, 6, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23904, 0, 6, 32, 20, 2, height, 0, 6, @@ -3234,7 +3234,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sessio height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24783, 0, 6, 32, 20, 0, height, 0, 6, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -3260,7 +3260,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sessio height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24771, 6, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23907, 6, 0, 20, 32, 2, height, 6, 0, @@ -3271,7 +3271,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sessio height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24784, 6, 0, 20, 32, 0, height, 6, 0, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23909, 6, 0, 20, 32, 2, height, 6, 0, @@ -3282,7 +3282,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sessio height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24786, 6, 0, 20, 32, 0, height, 6, 0, height + 67); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23903, 6, 0, 20, 32, 2, height, 6, 0, @@ -3293,7 +3293,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sessio height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24782, 6, 0, 20, 32, 0, height, 6, 0, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -3329,14 +3329,14 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_up(paint_session * sessi height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24777, 0, 6, 32, 20, 0, height, 0, 6, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23897, 0, 6, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24763, 0, 6, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23899, 0, 6, 32, 20, 2, height, 0, 6, @@ -3347,14 +3347,14 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_up(paint_session * sessi height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24780, 0, 6, 32, 20, 0, height, 0, 6, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23901, 0, 6, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24767, 0, 6, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -3384,7 +3384,7 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_up(paint_session * sessi height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24778, 6, 0, 20, 32, 0, height, 6, 0, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23898, 6, 0, 20, 32, 2, height, 6, 0, @@ -3395,7 +3395,7 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_up(paint_session * sessi height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24779, 6, 0, 20, 32, 0, height, 6, 0, height + 67); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23900, 6, 0, 20, 32, 2, height, 6, 0, @@ -3406,14 +3406,14 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_up(paint_session * sessi height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24781, 6, 0, 20, 32, 0, height, 6, 0, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23902, 6, 0, 20, 32, 2, height, 6, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24768, 6, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -3461,7 +3461,7 @@ static void wooden_rc_track_left_half_banked_helix_up_small(paint_session * sess height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24748, 0, 0, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23885, 0, 0, 32, 20, 2, height, 0, 6, @@ -3472,14 +3472,14 @@ static void wooden_rc_track_left_half_banked_helix_up_small(paint_session * sess height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24760, 0, 0, 32, 20, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23888, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24754, 0, 0, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23879, 0, 0, 32, 20, 2, height, 0, 6, @@ -3490,7 +3490,7 @@ static void wooden_rc_track_left_half_banked_helix_up_small(paint_session * sess height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24757, 0, 0, 32, 20, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -3508,16 +3508,16 @@ static void wooden_rc_track_left_half_banked_helix_up_small(paint_session * sess switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_general_support_height(session, height + 32, 0x20); @@ -3570,7 +3570,7 @@ static void wooden_rc_track_left_half_banked_helix_up_small(paint_session * sess height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24746, 0, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23883, 0, 0, 20, 32, 2, height, 6, 0, @@ -3581,14 +3581,14 @@ static void wooden_rc_track_left_half_banked_helix_up_small(paint_session * sess height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24758, 0, 0, 20, 32, 0, height, 6, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23886, 0, 0, 20, 32, 2, height, 6, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24752, 0, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23877, 0, 0, 20, 32, 2, height, 6, 0, @@ -3599,7 +3599,7 @@ static void wooden_rc_track_left_half_banked_helix_up_small(paint_session * sess height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24755, 0, 0, 20, 32, 0, height, 6, 0, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -3630,14 +3630,14 @@ static void wooden_rc_track_left_half_banked_helix_up_small(paint_session * sess height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24757, 0, 0, 20, 32, 0, height, 6, 0, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23882, 0, 0, 20, 32, 2, height, 6, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24748, 0, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23885, 0, 0, 20, 32, 2, height, 6, 0, @@ -3648,14 +3648,14 @@ static void wooden_rc_track_left_half_banked_helix_up_small(paint_session * sess height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24760, 0, 0, 20, 32, 0, height, 6, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23888, 0, 0, 20, 32, 2, height, 6, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24754, 0, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -3678,16 +3678,16 @@ static void wooden_rc_track_left_half_banked_helix_up_small(paint_session * sess switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_general_support_height(session, height + 32, 0x20); @@ -3744,14 +3744,14 @@ static void wooden_rc_track_left_half_banked_helix_up_small(paint_session * sess height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24755, 0, 0, 32, 20, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23880, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24746, 0, 0, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23883, 0, 0, 32, 20, 2, height, 0, 6, @@ -3762,14 +3762,14 @@ static void wooden_rc_track_left_half_banked_helix_up_small(paint_session * sess height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24758, 0, 0, 32, 20, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23886, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24752, 0, 0, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -3804,14 +3804,14 @@ static void wooden_rc_track_right_half_banked_helix_up_small(paint_session * ses height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24737, 0, 0, 32, 20, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23862, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24728, 0, 0, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23865, 0, 0, 32, 20, 2, height, 0, 6, @@ -3822,14 +3822,14 @@ static void wooden_rc_track_right_half_banked_helix_up_small(paint_session * ses height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24740, 0, 0, 32, 20, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23868, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24734, 0, 0, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -3847,16 +3847,16 @@ static void wooden_rc_track_right_half_banked_helix_up_small(paint_session * ses switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_general_support_height(session, height + 32, 0x20); @@ -3913,14 +3913,14 @@ static void wooden_rc_track_right_half_banked_helix_up_small(paint_session * ses height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24739, 0, 0, 20, 32, 0, height, 6, 0, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23864, 0, 0, 20, 32, 2, height, 6, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24730, 0, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23867, 0, 0, 20, 32, 2, height, 6, 0, @@ -3931,14 +3931,14 @@ static void wooden_rc_track_right_half_banked_helix_up_small(paint_session * ses height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24742, 0, 0, 20, 32, 0, height, 6, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23870, 0, 0, 20, 32, 2, height, 6, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24736, 0, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -3965,7 +3965,7 @@ static void wooden_rc_track_right_half_banked_helix_up_small(paint_session * ses height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24728, 0, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23865, 0, 0, 20, 32, 2, height, 6, 0, @@ -3976,14 +3976,14 @@ static void wooden_rc_track_right_half_banked_helix_up_small(paint_session * ses height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24740, 0, 0, 20, 32, 0, height, 6, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23868, 0, 0, 20, 32, 2, height, 6, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24734, 0, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23859, 0, 0, 20, 32, 2, height, 6, 0, @@ -3994,7 +3994,7 @@ static void wooden_rc_track_right_half_banked_helix_up_small(paint_session * ses height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24737, 0, 0, 20, 32, 0, height, 6, 0, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -4017,16 +4017,16 @@ static void wooden_rc_track_right_half_banked_helix_up_small(paint_session * ses switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_general_support_height(session, height + 32, 0x20); @@ -4079,7 +4079,7 @@ static void wooden_rc_track_right_half_banked_helix_up_small(paint_session * ses height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24730, 0, 0, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23867, 0, 0, 32, 20, 2, height, 0, 6, @@ -4090,14 +4090,14 @@ static void wooden_rc_track_right_half_banked_helix_up_small(paint_session * ses height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24742, 0, 0, 32, 20, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23870, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24736, 0, 0, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23861, 0, 0, 32, 20, 2, height, 0, 6, @@ -4108,7 +4108,7 @@ static void wooden_rc_track_right_half_banked_helix_up_small(paint_session * ses height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24739, 0, 0, 32, 20, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -4166,7 +4166,7 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24570, 0, 0, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23709, 0, 0, 32, 27, 2, height, 0, 2, @@ -4177,14 +4177,14 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24590, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23714, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24580, 0, 0, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23699, 0, 0, 32, 20, 2, height, 0, 6, @@ -4195,7 +4195,7 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24585, 0, 0, 32, 20, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -4222,7 +4222,7 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24569, 0, 0, 32, 16, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23708, 0, 0, 32, 16, 2, height, 0, 0, @@ -4233,14 +4233,14 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24589, 0, 0, 32, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23713, 0, 0, 32, 16, 2, height, 0, 16, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24579, 0, 0, 32, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23698, 0, 0, 32, 16, 2, height, 0, 16, @@ -4251,7 +4251,7 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24584, 0, 0, 32, 16, 0, height, 0, 16, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -4268,7 +4268,7 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24568, 0, 0, 16, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23707, 0, 0, 16, 16, 2, height, 16, 16, @@ -4279,14 +4279,14 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height + 29); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24588, 0, 0, 16, 16, 0, height, 16, 16, height + 29); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23712, 0, 0, 16, 16, 2, height, 16, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24578, 0, 0, 16, 16, 2, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23697, 0, 0, 16, 16, 2, height, 0, 0, @@ -4297,7 +4297,7 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24583, 0, 0, 16, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -4319,7 +4319,7 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24567, 0, 0, 16, 32, 2, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23706, 0, 0, 16, 32, 2, height, 0, 0, @@ -4330,14 +4330,14 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height + 33); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24587, 0, 0, 16, 32, 0, height, 0, 0, height + 33); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23711, 0, 0, 16, 32, 2, height, 0, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24577, 0, 0, 16, 32, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23696, 0, 0, 16, 32, 2, height, 16, 0, @@ -4348,7 +4348,7 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24582, 0, 0, 16, 32, 0, height, 16, 0, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -4365,7 +4365,7 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24566, 0, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23705, 0, 0, 27, 32, 2, height, 2, 0, @@ -4376,14 +4376,14 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height + 33); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24586, 0, 0, 27, 32, 0, height, 2, 0, height + 33); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23710, 0, 0, 20, 32, 2, height, 6, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24576, 0, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23695, 0, 0, 20, 32, 2, height, 6, 0, @@ -4394,7 +4394,7 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24581, 0, 0, 20, 32, 0, height, 6, 0, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -4425,14 +4425,14 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24585, 0, 0, 20, 32, 0, height, 6, 0, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23704, 0, 0, 20, 32, 2, height, 6, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24570, 0, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23709, 0, 0, 27, 32, 2, height, 2, 0, @@ -4443,14 +4443,14 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24590, 0, 0, 27, 32, 0, height, 2, 0, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23714, 0, 0, 20, 32, 2, height, 6, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24580, 0, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -4486,14 +4486,14 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24584, 0, 0, 16, 32, 0, height, 16, 0, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23703, 0, 0, 16, 32, 2, height, 0, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24569, 0, 0, 16, 32, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23708, 0, 0, 16, 32, 2, height, 0, 0, @@ -4504,14 +4504,14 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24589, 0, 0, 16, 32, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23713, 0, 0, 16, 32, 2, height, 16, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24579, 0, 0, 16, 32, 2, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -4532,14 +4532,14 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24583, 0, 0, 16, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23702, 0, 0, 16, 16, 2, height, 16, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24568, 0, 0, 16, 16, 2, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23707, 0, 0, 16, 16, 2, height, 16, 16, @@ -4550,14 +4550,14 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height + 29); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24588, 0, 0, 16, 16, 0, height, 16, 16, height + 29); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23712, 0, 0, 16, 16, 2, height, 0, 16, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24578, 0, 0, 16, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -4583,14 +4583,14 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24582, 0, 0, 32, 16, 0, height, 0, 16, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23701, 0, 0, 32, 16, 2, height, 0, 16, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24567, 0, 0, 32, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23706, 0, 0, 32, 16, 2, height, 0, 0, @@ -4601,14 +4601,14 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height + 33); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24587, 0, 0, 32, 16, 0, height, 0, 0, height + 33); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23711, 0, 0, 32, 16, 2, height, 0, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24577, 0, 0, 32, 16, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -4629,14 +4629,14 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24581, 0, 0, 32, 20, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23700, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24566, 0, 0, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23705, 0, 0, 32, 27, 2, height, 0, 2, @@ -4647,14 +4647,14 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess height + 33); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24586, 0, 0, 32, 27, 0, height, 0, 2, height + 33); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23710, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24576, 0, 0, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -4689,14 +4689,14 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24551, 0, 0, 32, 20, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23670, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24536, 0, 0, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23675, 0, 0, 32, 27, 2, height, 0, 2, @@ -4707,14 +4707,14 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24556, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23680, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24546, 0, 0, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -4745,14 +4745,14 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24552, 0, 0, 32, 16, 0, height, 0, 16, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23671, 0, 0, 32, 16, 2, height, 0, 16, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24537, 0, 0, 32, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23676, 0, 0, 32, 16, 2, height, 0, 0, @@ -4763,14 +4763,14 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24557, 0, 0, 32, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23681, 0, 0, 32, 16, 2, height, 0, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24547, 0, 0, 32, 16, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -4791,14 +4791,14 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24553, 0, 0, 16, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23672, 0, 0, 16, 16, 2, height, 16, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24538, 0, 0, 16, 16, 2, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23677, 0, 0, 16, 16, 2, height, 16, 16, @@ -4809,14 +4809,14 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height + 29); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24558, 0, 0, 16, 16, 0, height, 16, 16, height + 29); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23682, 0, 0, 16, 16, 2, height, 0, 16, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24548, 0, 0, 16, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -4842,14 +4842,14 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24554, 0, 0, 16, 32, 0, height, 16, 0, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23673, 0, 0, 16, 32, 2, height, 0, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24539, 0, 0, 16, 32, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23678, 0, 0, 16, 32, 2, height, 0, 0, @@ -4860,14 +4860,14 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height + 33); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24559, 0, 0, 16, 32, 0, height, 0, 0, height + 33); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23683, 0, 0, 16, 32, 2, height, 16, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24549, 0, 0, 16, 32, 2, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -4888,14 +4888,14 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24555, 0, 0, 20, 32, 0, height, 6, 0, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23674, 0, 0, 20, 32, 2, height, 6, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24540, 0, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23679, 0, 0, 27, 32, 2, height, 2, 0, @@ -4906,14 +4906,14 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height + 33); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24560, 0, 0, 27, 32, 0, height, 2, 0, height + 33); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23684, 0, 0, 20, 32, 2, height, 6, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24550, 0, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -4940,7 +4940,7 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24536, 0, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23675, 0, 0, 27, 32, 2, height, 2, 0, @@ -4951,14 +4951,14 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24556, 0, 0, 27, 32, 0, height, 2, 0, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23680, 0, 0, 20, 32, 2, height, 6, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24546, 0, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23665, 0, 0, 20, 32, 2, height, 6, 0, @@ -4969,7 +4969,7 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24551, 0, 0, 20, 32, 0, height, 6, 0, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -5001,7 +5001,7 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24537, 0, 0, 16, 32, 2, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23676, 0, 0, 16, 32, 2, height, 0, 0, @@ -5012,14 +5012,14 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24557, 0, 0, 16, 32, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23681, 0, 0, 16, 32, 2, height, 0, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24547, 0, 0, 16, 32, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23666, 0, 0, 16, 32, 2, height, 16, 0, @@ -5030,7 +5030,7 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24552, 0, 0, 16, 32, 0, height, 16, 0, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -5047,7 +5047,7 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24538, 0, 0, 16, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23677, 0, 0, 16, 16, 2, height, 16, 16, @@ -5058,14 +5058,14 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height + 29); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24558, 0, 0, 16, 16, 0, height, 16, 16, height + 29); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23682, 0, 0, 16, 16, 2, height, 16, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24548, 0, 0, 16, 16, 2, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23667, 0, 0, 16, 16, 2, height, 0, 0, @@ -5076,7 +5076,7 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24553, 0, 0, 16, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -5098,7 +5098,7 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24539, 0, 0, 32, 16, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23678, 0, 0, 32, 16, 2, height, 0, 0, @@ -5109,14 +5109,14 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height + 33); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24559, 0, 0, 32, 16, 0, height, 0, 0, height + 33); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23683, 0, 0, 32, 16, 2, height, 0, 16, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24549, 0, 0, 32, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23668, 0, 0, 32, 16, 2, height, 0, 16, @@ -5127,7 +5127,7 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24554, 0, 0, 32, 16, 0, height, 0, 16, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -5144,7 +5144,7 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24540, 0, 0, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23679, 0, 0, 32, 27, 2, height, 0, 2, @@ -5155,14 +5155,14 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height + 33); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24560, 0, 0, 32, 27, 0, height, 0, 2, height + 33); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23684, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24550, 0, 0, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23669, 0, 0, 32, 20, 2, height, 0, 6, @@ -5173,7 +5173,7 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24555, 0, 0, 32, 20, 0, height, 0, 6, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -5348,7 +5348,7 @@ static void wooden_rc_track_brakes(paint_session * session, uint8 rideIndex, uin wooden_rc_track_paint(session, imageIds[direction][0], imageIds[direction][1], direction, 0, 2, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 32, 0x20); @@ -5365,7 +5365,7 @@ static void wooden_rc_track_25_deg_up_left_banked(paint_session * session, uint8 height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25115, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24250, 0, 0, 32, 25, 2, height, 0, 3, @@ -5376,7 +5376,7 @@ static void wooden_rc_track_25_deg_up_left_banked(paint_session * session, uint8 height + 5); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25123, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24251, 0, 0, 32, 25, 2, height, 0, 3, @@ -5387,14 +5387,14 @@ static void wooden_rc_track_25_deg_up_left_banked(paint_session * session, uint8 height + 5); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25124, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24252, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25118, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -5420,7 +5420,7 @@ static void wooden_rc_track_25_deg_up_right_banked(paint_session * session, uint height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25119, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24254, 0, 0, 32, 25, 2, height, 0, 3, @@ -5431,7 +5431,7 @@ static void wooden_rc_track_25_deg_up_right_banked(paint_session * session, uint height + 5); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25125, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24255, 0, 0, 32, 25, 2, height, 0, 3, @@ -5442,14 +5442,14 @@ static void wooden_rc_track_25_deg_up_right_banked(paint_session * session, uint height + 5); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25126, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24256, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25122, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -5495,7 +5495,7 @@ static void wooden_rc_track_on_ride_photo(paint_session * session, uint8 rideInd height); break; } - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); track_paint_util_onride_photo_small_paint(session, direction, height + 16, tileElement); paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -5590,7 +5590,7 @@ static void wooden_rc_track_water_splash(paint_session * session, uint8 rideInde height); break; } - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_6); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 48, 0x20); @@ -5663,7 +5663,7 @@ static void wooden_rc_track_water_splash(paint_session * session, uint8 rideInde height); break; } - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 48, 0x20); break; @@ -5705,7 +5705,7 @@ static void wooden_rc_track_water_splash(paint_session * session, uint8 rideInde height); break; } - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 48, 0x20); break; @@ -5777,7 +5777,7 @@ static void wooden_rc_track_water_splash(paint_session * session, uint8 rideInde height); break; } - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 48, 0x20); break; @@ -5849,7 +5849,7 @@ static void wooden_rc_track_water_splash(paint_session * session, uint8 rideInde height); break; } - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_6); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 48, 0x20); @@ -5871,7 +5871,7 @@ static void wooden_rc_track_left_eighth_to_diag(paint_session * session, uint8 r height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25003, 0, 0, 32, 32, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24141, 0, 0, 32, 32, 2, height, 0, 0, @@ -5882,14 +5882,14 @@ static void wooden_rc_track_left_eighth_to_diag(paint_session * session, uint8 r height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25019, 0, 0, 32, 32, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24145, 0, 0, 32, 32, 2, height, 0, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25011, 0, 0, 32, 32, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24149, 0, 0, 32, 32, 2, height, 0, 0, @@ -5900,7 +5900,7 @@ static void wooden_rc_track_left_eighth_to_diag(paint_session * session, uint8 r height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25023, 0, 0, 32, 32, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -5918,7 +5918,7 @@ static void wooden_rc_track_left_eighth_to_diag(paint_session * session, uint8 r height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25004, 0, 0, 32, 16, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24142, 0, 0, 34, 16, 2, height, 0, 0, @@ -5929,14 +5929,14 @@ static void wooden_rc_track_left_eighth_to_diag(paint_session * session, uint8 r height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25020, 0, 0, 32, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24146, 0, 0, 32, 16, 2, height, 0, 16, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25012, 0, 0, 32, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24150, 0, 0, 32, 16, 2, height, 0, 16, @@ -5947,7 +5947,7 @@ static void wooden_rc_track_left_eighth_to_diag(paint_session * session, uint8 r height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25024, 0, 0, 32, 16, 0, height, 0, 16, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -5961,7 +5961,7 @@ static void wooden_rc_track_left_eighth_to_diag(paint_session * session, uint8 r height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25005, 0, 0, 16, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24143, 0, 0, 16, 16, 2, height, 16, 16, @@ -5972,14 +5972,14 @@ static void wooden_rc_track_left_eighth_to_diag(paint_session * session, uint8 r height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25021, 0, 0, 16, 16, 0, height, 16, 16, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24147, 0, 0, 16, 16, 2, height, 16, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25013, 0, 0, 16, 16, 2, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24151, 0, 0, 16, 16, 2, height, 0, 0, @@ -5990,7 +5990,7 @@ static void wooden_rc_track_left_eighth_to_diag(paint_session * session, uint8 r height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25025, 0, 0, 16, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6000,16 +6000,16 @@ static void wooden_rc_track_left_eighth_to_diag(paint_session * session, uint8 r switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6075,14 +6075,14 @@ static void wooden_rc_track_right_eighth_to_diag(paint_session * session, uint8 height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24995, 0, 0, 32, 32, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24117, 0, 0, 32, 32, 2, height, 0, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24983, 0, 0, 32, 32, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24121, 0, 0, 32, 32, 2, height, 0, 0, @@ -6093,14 +6093,14 @@ static void wooden_rc_track_right_eighth_to_diag(paint_session * session, uint8 height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24999, 0, 0, 32, 32, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24125, 0, 0, 32, 32, 2, height, 0, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24991, 0, 0, 32, 32, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -6122,14 +6122,14 @@ static void wooden_rc_track_right_eighth_to_diag(paint_session * session, uint8 height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24996, 0, 0, 32, 16, 0, height, 0, 16, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24118, 0, 0, 32, 16, 2, height, 0, 16, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24984, 0, 0, 32, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24122, 0, 0, 34, 16, 2, height, 0, 0, @@ -6140,14 +6140,14 @@ static void wooden_rc_track_right_eighth_to_diag(paint_session * session, uint8 height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25000, 0, 0, 32, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24126, 0, 0, 32, 16, 2, height, 0, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24992, 0, 0, 32, 16, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6165,14 +6165,14 @@ static void wooden_rc_track_right_eighth_to_diag(paint_session * session, uint8 height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24997, 0, 0, 16, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24119, 0, 0, 16, 16, 2, height, 16, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24985, 0, 0, 16, 16, 2, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24123, 0, 0, 28, 28, 2, height, 4, 4, @@ -6183,14 +6183,14 @@ static void wooden_rc_track_right_eighth_to_diag(paint_session * session, uint8 height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25001, 0, 0, 28, 28, 0, height, 4, 4, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24127, 0, 0, 16, 16, 2, height, 0, 16, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24993, 0, 0, 16, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6200,16 +6200,16 @@ static void wooden_rc_track_right_eighth_to_diag(paint_session * session, uint8 switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6287,7 +6287,7 @@ static void wooden_rc_track_left_eighth_bank_to_diag(paint_session * session, ui height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25051, 0, 0, 32, 32, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24189, 0, 0, 32, 32, 2, height, 0, 0, @@ -6298,14 +6298,14 @@ static void wooden_rc_track_left_eighth_bank_to_diag(paint_session * session, ui height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25067, 0, 0, 32, 32, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24193, 0, 0, 32, 32, 2, height, 0, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25059, 0, 0, 32, 32, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24197, 0, 0, 32, 32, 2, height, 0, 0, @@ -6316,7 +6316,7 @@ static void wooden_rc_track_left_eighth_bank_to_diag(paint_session * session, ui height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25071, 0, 0, 32, 32, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -6334,7 +6334,7 @@ static void wooden_rc_track_left_eighth_bank_to_diag(paint_session * session, ui height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25052, 0, 0, 32, 16, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24190, 0, 0, 34, 16, 2, height, 0, 0, @@ -6345,14 +6345,14 @@ static void wooden_rc_track_left_eighth_bank_to_diag(paint_session * session, ui height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25068, 0, 0, 32, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24194, 0, 0, 32, 16, 2, height, 0, 16, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25060, 0, 0, 32, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24198, 0, 0, 32, 16, 2, height, 0, 16, @@ -6363,7 +6363,7 @@ static void wooden_rc_track_left_eighth_bank_to_diag(paint_session * session, ui height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25072, 0, 0, 32, 16, 0, height, 0, 16, height + 27); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6377,7 +6377,7 @@ static void wooden_rc_track_left_eighth_bank_to_diag(paint_session * session, ui height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25053, 0, 0, 16, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24191, 0, 0, 16, 16, 2, height, 16, 16, @@ -6388,14 +6388,14 @@ static void wooden_rc_track_left_eighth_bank_to_diag(paint_session * session, ui height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25069, 0, 0, 16, 16, 0, height, 16, 16, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24195, 0, 0, 16, 16, 2, height, 16, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25061, 0, 0, 16, 16, 2, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24199, 0, 0, 16, 16, 2, height, 0, 0, @@ -6406,7 +6406,7 @@ static void wooden_rc_track_left_eighth_bank_to_diag(paint_session * session, ui height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25073, 0, 0, 16, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6416,16 +6416,16 @@ static void wooden_rc_track_left_eighth_bank_to_diag(paint_session * session, ui switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6491,14 +6491,14 @@ static void wooden_rc_track_right_eighth_bank_to_diag(paint_session * session, u height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25043, 0, 0, 32, 32, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24165, 0, 0, 32, 32, 2, height, 0, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25031, 0, 0, 32, 32, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24169, 0, 0, 32, 32, 2, height, 0, 0, @@ -6509,14 +6509,14 @@ static void wooden_rc_track_right_eighth_bank_to_diag(paint_session * session, u height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25047, 0, 0, 32, 32, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24173, 0, 0, 32, 32, 2, height, 0, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25039, 0, 0, 32, 32, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -6538,14 +6538,14 @@ static void wooden_rc_track_right_eighth_bank_to_diag(paint_session * session, u height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25044, 0, 0, 32, 16, 0, height, 0, 16, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24166, 0, 0, 32, 16, 2, height, 0, 16, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25032, 0, 0, 32, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24170, 0, 0, 34, 16, 2, height, 0, 0, @@ -6556,14 +6556,14 @@ static void wooden_rc_track_right_eighth_bank_to_diag(paint_session * session, u height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25048, 0, 0, 32, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24174, 0, 0, 32, 16, 2, height, 0, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25040, 0, 0, 32, 16, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6581,14 +6581,14 @@ static void wooden_rc_track_right_eighth_bank_to_diag(paint_session * session, u height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25045, 0, 0, 16, 16, 0, height, 0, 0, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24167, 0, 0, 16, 16, 2, height, 16, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25033, 0, 0, 16, 16, 2, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24171, 0, 0, 28, 28, 2, height, 4, 4, @@ -6599,14 +6599,14 @@ static void wooden_rc_track_right_eighth_bank_to_diag(paint_session * session, u height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25049, 0, 0, 28, 28, 0, height, 4, 4, height + 27); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24175, 0, 0, 16, 16, 2, height, 0, 16, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25041, 0, 0, 16, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6616,16 +6616,16 @@ static void wooden_rc_track_right_eighth_bank_to_diag(paint_session * session, u switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -6737,16 +6737,16 @@ static void wooden_rc_track_diag_flat(paint_session * session, uint8 rideIndex, -16, -16, height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24917, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -6763,16 +6763,16 @@ static void wooden_rc_track_diag_flat(paint_session * session, uint8 rideIndex, -16, -16, height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24875, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -6785,10 +6785,10 @@ static void wooden_rc_track_diag_flat(paint_session * session, uint8 rideIndex, switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24049, -16, -16, 32, 32, 2, height, @@ -6799,10 +6799,10 @@ static void wooden_rc_track_diag_flat(paint_session * session, uint8 rideIndex, -16, -16, height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24918, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -6811,10 +6811,10 @@ static void wooden_rc_track_diag_flat(paint_session * session, uint8 rideIndex, switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24007, -16, -16, 32, 32, 2, height, @@ -6825,10 +6825,10 @@ static void wooden_rc_track_diag_flat(paint_session * session, uint8 rideIndex, -16, -16, height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24876, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -6914,16 +6914,16 @@ static void wooden_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIn -16, -16, height + 43); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24935, -16, -16, 32, 32, 0, height, -16, -16, height + 43); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -6940,16 +6940,16 @@ static void wooden_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIn -16, -16, height + 43); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24893, -16, -16, 32, 32, 0, height, -16, -16, height + 43); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -6962,10 +6962,10 @@ static void wooden_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIn switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24067, -16, -16, 32, 32, 2, height, @@ -6976,10 +6976,10 @@ static void wooden_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIn -16, -16, height + 43); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24936, -16, -16, 32, 32, 0, height, -16, -16, height + 43); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -6988,10 +6988,10 @@ static void wooden_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIn switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24025, -16, -16, 32, 32, 2, height, @@ -7002,10 +7002,10 @@ static void wooden_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIn -16, -16, height + 43); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24894, -16, -16, 32, 32, 0, height, -16, -16, height + 43); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -7074,16 +7074,16 @@ static void wooden_rc_track_diag_60_deg_up(paint_session * session, uint8 rideIn -16, -16, height + 91); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24911, -16, -16, 32, 32, 0, height, -16, -16, height + 91); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -7093,10 +7093,10 @@ static void wooden_rc_track_diag_60_deg_up(paint_session * session, uint8 rideIn switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24043, -16, -16, 32, 32, 2, height, @@ -7107,10 +7107,10 @@ static void wooden_rc_track_diag_60_deg_up(paint_session * session, uint8 rideIn -16, -16, height + 91); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24912, -16, -16, 32, 32, 0, height, -16, -16, height + 91); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -7180,16 +7180,16 @@ static void wooden_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24923, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -7206,16 +7206,16 @@ static void wooden_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24881, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -7228,10 +7228,10 @@ static void wooden_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24055, -16, -16, 32, 32, 2, height, @@ -7242,10 +7242,10 @@ static void wooden_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24924, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -7254,10 +7254,10 @@ static void wooden_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24013, -16, -16, 32, 32, 2, height, @@ -7268,10 +7268,10 @@ static void wooden_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24882, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -7340,16 +7340,16 @@ static void wooden_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, -16, -16, height + 59); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24899, -16, -16, 32, 32, 0, height, -16, -16, height + 59); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -7359,10 +7359,10 @@ static void wooden_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24031, -16, -16, 32, 32, 2, height, @@ -7373,10 +7373,10 @@ static void wooden_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, -16, -16, height + 59); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24900, -16, -16, 32, 32, 0, height, -16, -16, height + 59); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -7429,16 +7429,16 @@ static void wooden_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, -16, -16, height + 59); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24905, -16, -16, 32, 32, 0, height, -16, -16, height + 59); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -7448,10 +7448,10 @@ static void wooden_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24037, -16, -16, 32, 32, 2, height, @@ -7462,10 +7462,10 @@ static void wooden_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, -16, -16, height + 59); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24906, -16, -16, 32, 32, 0, height, -16, -16, height + 59); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -7535,16 +7535,16 @@ static void wooden_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24929, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -7561,16 +7561,16 @@ static void wooden_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24887, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -7583,10 +7583,10 @@ static void wooden_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24061, -16, -16, 32, 32, 2, height, @@ -7597,10 +7597,10 @@ static void wooden_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24930, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -7609,10 +7609,10 @@ static void wooden_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24019, -16, -16, 32, 32, 2, height, @@ -7623,10 +7623,10 @@ static void wooden_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24888, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -7712,16 +7712,16 @@ static void wooden_rc_track_diag_25_deg_down(paint_session * session, uint8 ride -16, -16, height + 43); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24936, -16, -16, 32, 32, 0, height, -16, -16, height + 43); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -7738,16 +7738,16 @@ static void wooden_rc_track_diag_25_deg_down(paint_session * session, uint8 ride -16, -16, height + 43); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24894, -16, -16, 32, 32, 0, height, -16, -16, height + 43); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -7760,10 +7760,10 @@ static void wooden_rc_track_diag_25_deg_down(paint_session * session, uint8 ride switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24065, -16, -16, 32, 32, 2, height, @@ -7774,10 +7774,10 @@ static void wooden_rc_track_diag_25_deg_down(paint_session * session, uint8 ride -16, -16, height + 43); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24935, -16, -16, 32, 32, 0, height, -16, -16, height + 43); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -7786,10 +7786,10 @@ static void wooden_rc_track_diag_25_deg_down(paint_session * session, uint8 ride switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24023, -16, -16, 32, 32, 2, height, @@ -7800,10 +7800,10 @@ static void wooden_rc_track_diag_25_deg_down(paint_session * session, uint8 ride -16, -16, height + 43); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24893, -16, -16, 32, 32, 0, height, -16, -16, height + 43); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -7872,16 +7872,16 @@ static void wooden_rc_track_diag_60_deg_down(paint_session * session, uint8 ride -16, -16, height + 91); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24912, -16, -16, 32, 32, 0, height, -16, -16, height + 91); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -7891,10 +7891,10 @@ static void wooden_rc_track_diag_60_deg_down(paint_session * session, uint8 ride switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24041, -16, -16, 32, 32, 2, height, @@ -7905,10 +7905,10 @@ static void wooden_rc_track_diag_60_deg_down(paint_session * session, uint8 ride -16, -16, height + 91); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24911, -16, -16, 32, 32, 0, height, -16, -16, height + 91); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -7976,16 +7976,16 @@ static void wooden_rc_track_diag_flat_to_25_deg_down(paint_session * session, ui -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24930, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -8002,16 +8002,16 @@ static void wooden_rc_track_diag_flat_to_25_deg_down(paint_session * session, ui -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24888, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -8022,10 +8022,10 @@ static void wooden_rc_track_diag_flat_to_25_deg_down(paint_session * session, ui switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24059, -16, -16, 32, 32, 2, height, @@ -8036,10 +8036,10 @@ static void wooden_rc_track_diag_flat_to_25_deg_down(paint_session * session, ui -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24929, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -8048,10 +8048,10 @@ static void wooden_rc_track_diag_flat_to_25_deg_down(paint_session * session, ui switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24017, -16, -16, 32, 32, 2, height, @@ -8062,10 +8062,10 @@ static void wooden_rc_track_diag_flat_to_25_deg_down(paint_session * session, ui -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24887, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -8133,16 +8133,16 @@ static void wooden_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * sess -16, -16, height + 59); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24906, -16, -16, 32, 32, 0, height, -16, -16, height + 59); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -8152,10 +8152,10 @@ static void wooden_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * sess switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24035, -16, -16, 32, 32, 2, height, @@ -8166,10 +8166,10 @@ static void wooden_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * sess -16, -16, height + 59); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24905, -16, -16, 32, 32, 0, height, -16, -16, height + 59); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -8222,16 +8222,16 @@ static void wooden_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * sess -16, -16, height + 59); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24900, -16, -16, 32, 32, 0, height, -16, -16, height + 59); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -8241,10 +8241,10 @@ static void wooden_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * sess switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24029, -16, -16, 32, 32, 2, height, @@ -8255,10 +8255,10 @@ static void wooden_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * sess -16, -16, height + 59); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24899, -16, -16, 32, 32, 0, height, -16, -16, height + 59); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -8328,16 +8328,16 @@ static void wooden_rc_track_diag_25_deg_down_to_flat(paint_session * session, ui -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24924, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -8354,16 +8354,16 @@ static void wooden_rc_track_diag_25_deg_down_to_flat(paint_session * session, ui -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24882, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -8376,10 +8376,10 @@ static void wooden_rc_track_diag_25_deg_down_to_flat(paint_session * session, ui switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24053, -16, -16, 32, 32, 2, height, @@ -8390,10 +8390,10 @@ static void wooden_rc_track_diag_25_deg_down_to_flat(paint_session * session, ui -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24923, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -8402,10 +8402,10 @@ static void wooden_rc_track_diag_25_deg_down_to_flat(paint_session * session, ui switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24011, -16, -16, 32, 32, 2, height, @@ -8416,10 +8416,10 @@ static void wooden_rc_track_diag_25_deg_down_to_flat(paint_session * session, ui -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24881, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } } @@ -8488,16 +8488,16 @@ static void wooden_rc_track_diag_flat_to_left_bank(paint_session * session, uint -16, -16, height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24947, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -8507,10 +8507,10 @@ static void wooden_rc_track_diag_flat_to_left_bank(paint_session * session, uint switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24079, -16, -16, 32, 32, 2, height, @@ -8521,10 +8521,10 @@ static void wooden_rc_track_diag_flat_to_left_bank(paint_session * session, uint -16, -16, height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24948, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -8577,16 +8577,16 @@ static void wooden_rc_track_diag_flat_to_right_bank(paint_session * session, uin -16, -16, height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24953, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -8596,10 +8596,10 @@ static void wooden_rc_track_diag_flat_to_right_bank(paint_session * session, uin switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24085, -16, -16, 32, 32, 2, height, @@ -8610,10 +8610,10 @@ static void wooden_rc_track_diag_flat_to_right_bank(paint_session * session, uin -16, -16, height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24954, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -8666,16 +8666,16 @@ static void wooden_rc_track_diag_left_bank_to_flat(paint_session * session, uint -16, -16, height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24954, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -8685,10 +8685,10 @@ static void wooden_rc_track_diag_left_bank_to_flat(paint_session * session, uint switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24083, -16, -16, 32, 32, 2, height, @@ -8699,10 +8699,10 @@ static void wooden_rc_track_diag_left_bank_to_flat(paint_session * session, uint -16, -16, height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24953, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -8755,16 +8755,16 @@ static void wooden_rc_track_diag_right_bank_to_flat(paint_session * session, uin -16, -16, height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24948, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -8774,10 +8774,10 @@ static void wooden_rc_track_diag_right_bank_to_flat(paint_session * session, uin switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24077, -16, -16, 32, 32, 2, height, @@ -8788,10 +8788,10 @@ static void wooden_rc_track_diag_right_bank_to_flat(paint_session * session, uin -16, -16, height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24947, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -8844,16 +8844,16 @@ static void wooden_rc_track_diag_left_bank_to_25_deg_up(paint_session * session, -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24971, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -8863,10 +8863,10 @@ static void wooden_rc_track_diag_left_bank_to_25_deg_up(paint_session * session, switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24103, -16, -16, 32, 32, 2, height, @@ -8877,10 +8877,10 @@ static void wooden_rc_track_diag_left_bank_to_25_deg_up(paint_session * session, -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24972, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -8933,16 +8933,16 @@ static void wooden_rc_track_diag_right_bank_to_25_deg_up(paint_session * session -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24977, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -8952,10 +8952,10 @@ static void wooden_rc_track_diag_right_bank_to_25_deg_up(paint_session * session switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24109, -16, -16, 32, 32, 2, height, @@ -8966,10 +8966,10 @@ static void wooden_rc_track_diag_right_bank_to_25_deg_up(paint_session * session -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24978, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -9022,16 +9022,16 @@ static void wooden_rc_track_diag_25_deg_up_to_left_bank(paint_session * session, -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24959, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -9041,10 +9041,10 @@ static void wooden_rc_track_diag_25_deg_up_to_left_bank(paint_session * session, switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24091, -16, -16, 32, 32, 2, height, @@ -9055,10 +9055,10 @@ static void wooden_rc_track_diag_25_deg_up_to_left_bank(paint_session * session, -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24960, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -9111,16 +9111,16 @@ static void wooden_rc_track_diag_25_deg_up_to_right_bank(paint_session * session -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24965, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -9130,10 +9130,10 @@ static void wooden_rc_track_diag_25_deg_up_to_right_bank(paint_session * session switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24097, -16, -16, 32, 32, 2, height, @@ -9144,10 +9144,10 @@ static void wooden_rc_track_diag_25_deg_up_to_right_bank(paint_session * session -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24966, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -9198,16 +9198,16 @@ static void wooden_rc_track_diag_left_bank_to_25_deg_down(paint_session * sessio -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24966, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } break; @@ -9215,10 +9215,10 @@ static void wooden_rc_track_diag_left_bank_to_25_deg_down(paint_session * sessio switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24095, -16, -16, 32, 32, 2, height, @@ -9229,10 +9229,10 @@ static void wooden_rc_track_diag_left_bank_to_25_deg_down(paint_session * sessio -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24965, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } break; @@ -9282,16 +9282,16 @@ static void wooden_rc_track_diag_right_bank_to_25_deg_down(paint_session * sessi -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24960, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } break; @@ -9299,10 +9299,10 @@ static void wooden_rc_track_diag_right_bank_to_25_deg_down(paint_session * sessi switch (direction) { case 0: - wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 4, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 5, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24089, -16, -16, 32, 32, 2, height, @@ -9313,10 +9313,10 @@ static void wooden_rc_track_diag_right_bank_to_25_deg_down(paint_session * sessi -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24959, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_b_supports_paint_setup(session, 3, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } break; @@ -9368,16 +9368,16 @@ static void wooden_rc_track_diag_25_deg_down_to_left_bank(paint_session * sessio -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24978, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -9387,10 +9387,10 @@ static void wooden_rc_track_diag_25_deg_down_to_left_bank(paint_session * sessio switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24107, -16, -16, 32, 32, 2, height, @@ -9401,10 +9401,10 @@ static void wooden_rc_track_diag_25_deg_down_to_left_bank(paint_session * sessio -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24977, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -9457,16 +9457,16 @@ static void wooden_rc_track_diag_25_deg_down_to_right_bank(paint_session * sessi -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24972, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -9476,10 +9476,10 @@ static void wooden_rc_track_diag_25_deg_down_to_right_bank(paint_session * sessi switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24101, -16, -16, 32, 32, 2, height, @@ -9490,10 +9490,10 @@ static void wooden_rc_track_diag_25_deg_down_to_right_bank(paint_session * sessi -16, -16, height + 35); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24971, -16, -16, 32, 32, 0, height, -16, -16, height + 35); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -9546,16 +9546,16 @@ static void wooden_rc_track_diag_left_bank(paint_session * session, uint8 rideIn -16, -16, height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24941, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -9565,10 +9565,10 @@ static void wooden_rc_track_diag_left_bank(paint_session * session, uint8 rideIn switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24073, -16, -16, 32, 32, 2, height, @@ -9579,10 +9579,10 @@ static void wooden_rc_track_diag_left_bank(paint_session * session, uint8 rideIn -16, -16, height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24942, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -9635,16 +9635,16 @@ static void wooden_rc_track_diag_right_bank(paint_session * session, uint8 rideI -16, -16, height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24942, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -9654,10 +9654,10 @@ static void wooden_rc_track_diag_right_bank(paint_session * session, uint8 rideI switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24071, -16, -16, 32, 32, 2, height, @@ -9668,10 +9668,10 @@ static void wooden_rc_track_diag_right_bank(paint_session * session, uint8 rideI -16, -16, height + 27); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24941, -16, -16, 32, 32, 0, height, -16, -16, height + 27); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -9708,7 +9708,7 @@ static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(paint_ses height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24824, 0, 6, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23960, 0, 6, 32, 20, 2, height, 0, 6, @@ -9719,14 +9719,14 @@ static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(paint_ses height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24837, 0, 6, 32, 20, 0, height, 0, 6, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23962, 0, 6, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24828, 0, 6, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23956, 0, 6, 32, 20, 2, height, 0, 6, @@ -9737,7 +9737,7 @@ static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(paint_ses height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24835, 0, 6, 32, 20, 0, height, 0, 6, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -9763,7 +9763,7 @@ static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(paint_ses height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24823, 6, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23959, 6, 0, 20, 32, 2, height, 6, 0, @@ -9774,7 +9774,7 @@ static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(paint_ses height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24836, 6, 0, 20, 32, 0, height, 6, 0, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23961, 6, 0, 20, 32, 2, height, 6, 0, @@ -9785,7 +9785,7 @@ static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(paint_ses height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24838, 6, 0, 20, 32, 0, height, 6, 0, height + 67); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23955, 6, 0, 20, 32, 2, height, 6, 0, @@ -9796,7 +9796,7 @@ static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(paint_ses height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24834, 6, 0, 20, 32, 0, height, 6, 0, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -9833,14 +9833,14 @@ static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(paint_s height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24829, 0, 6, 32, 20, 0, height, 0, 6, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23949, 0, 6, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24815, 0, 6, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23951, 0, 6, 32, 20, 2, height, 0, 6, @@ -9851,14 +9851,14 @@ static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(paint_s height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24832, 0, 6, 32, 20, 0, height, 0, 6, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23953, 0, 6, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24819, 0, 6, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -9888,7 +9888,7 @@ static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(paint_s height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24830, 6, 0, 20, 32, 0, height, 6, 0, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23950, 6, 0, 20, 32, 2, height, 6, 0, @@ -9899,7 +9899,7 @@ static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(paint_s height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24831, 6, 0, 20, 32, 0, height, 6, 0, height + 67); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23952, 6, 0, 20, 32, 2, height, 6, 0, @@ -9910,14 +9910,14 @@ static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(paint_s height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24833, 6, 0, 20, 32, 0, height, 6, 0, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23954, 6, 0, 20, 32, 2, height, 6, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24820, 6, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -9954,7 +9954,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(paint_s height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24831, 0, 6, 32, 20, 0, height, 0, 6, height + 67); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23952, 0, 6, 32, 20, 2, height, 0, 6, @@ -9965,14 +9965,14 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(paint_s height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24833, 0, 6, 32, 20, 0, height, 0, 6, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23954, 0, 6, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24820, 0, 6, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23948, 0, 6, 32, 20, 2, height, 0, 6, @@ -9983,7 +9983,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(paint_s height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24830, 0, 6, 32, 20, 0, height, 0, 6, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -10009,7 +10009,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(paint_s height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24815, 6, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23951, 6, 0, 20, 32, 2, height, 6, 0, @@ -10020,14 +10020,14 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(paint_s height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24832, 6, 0, 20, 32, 0, height, 6, 0, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23953, 6, 0, 20, 32, 2, height, 6, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24819, 6, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23947, 6, 0, 20, 32, 2, height, 6, 0, @@ -10038,7 +10038,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(paint_s height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24829, 6, 0, 20, 32, 0, height, 6, 0, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -10075,14 +10075,14 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(paint height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24834, 0, 6, 32, 20, 0, height, 0, 6, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23957, 0, 6, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24823, 0, 6, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23959, 0, 6, 32, 20, 2, height, 0, 6, @@ -10093,7 +10093,7 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(paint height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24836, 0, 6, 32, 20, 0, height, 0, 6, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23961, 0, 6, 32, 20, 2, height, 0, 6, @@ -10104,7 +10104,7 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(paint height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24838, 0, 6, 32, 20, 0, height, 0, 6, height + 67); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -10134,14 +10134,14 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(paint height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24835, 6, 0, 20, 32, 0, height, 6, 0, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23958, 6, 0, 20, 32, 2, height, 6, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24824, 6, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23960, 6, 0, 20, 32, 2, height, 6, 0, @@ -10152,14 +10152,14 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(paint height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24837, 6, 0, 20, 32, 0, height, 6, 0, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23962, 6, 0, 20, 32, 2, height, 6, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24828, 6, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -10183,7 +10183,7 @@ static void wooden_rc_track_block_brakes(paint_session * session, uint8 rideInde { wooden_rc_track_paint(session, _wooden_rc_block_brakes_image_ids[direction][0], _wooden_rc_block_brakes_image_ids[direction][1], direction, 0, 2, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 32, 0x20); @@ -10203,7 +10203,7 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24798, 0, 6, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23934, 0, 6, 32, 20, 2, height, 0, 6, @@ -10214,14 +10214,14 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24811, 0, 6, 32, 20, 0, height, 0, 6, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23936, 0, 6, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24802, 0, 6, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23930, 0, 6, 32, 20, 2, height, 0, 6, @@ -10232,7 +10232,7 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24809, 0, 6, 32, 20, 0, height, 0, 6, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -10258,7 +10258,7 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24797, 6, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23933, 6, 0, 20, 32, 2, height, 6, 0, @@ -10269,7 +10269,7 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24810, 6, 0, 20, 32, 0, height, 6, 0, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23935, 6, 0, 20, 32, 2, height, 6, 0, @@ -10280,7 +10280,7 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24812, 6, 0, 20, 32, 0, height, 6, 0, height + 67); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23929, 6, 0, 20, 32, 2, height, 6, 0, @@ -10291,7 +10291,7 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24808, 6, 0, 20, 32, 0, height, 6, 0, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -10327,14 +10327,14 @@ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24803, 0, 6, 32, 20, 0, height, 0, 6, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23923, 0, 6, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24789, 0, 6, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23925, 0, 6, 32, 20, 2, height, 0, 6, @@ -10345,14 +10345,14 @@ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24806, 0, 6, 32, 20, 0, height, 0, 6, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23927, 0, 6, 32, 20, 2, height, 0, 6, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24793, 0, 6, 32, 20, 2, height, 0, 6, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -10382,7 +10382,7 @@ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24804, 6, 0, 20, 32, 0, height, 6, 0, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23924, 6, 0, 20, 32, 2, height, 6, 0, @@ -10393,7 +10393,7 @@ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24805, 6, 0, 20, 32, 0, height, 6, 0, height + 67); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23926, 6, 0, 20, 32, 2, height, 6, 0, @@ -10404,14 +10404,14 @@ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24807, 6, 0, 20, 32, 0, height, 6, 0, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 23928, 6, 0, 20, 32, 2, height, 6, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 24794, 6, 0, 20, 32, 2, height, 6, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -10463,7 +10463,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25187, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24326, 0, 0, 32, 27, 2, height, 0, 2, @@ -10474,21 +10474,21 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25218, 0, 0, 32, 27, 0, height, 0, 2, height + 67); - wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24331, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25197, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24336, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25202, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -10511,7 +10511,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25188, 0, 0, 32, 16, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24327, 0, 0, 32, 16, 2, height, 0, 0, @@ -10522,14 +10522,14 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25219, 0, 0, 32, 16, 0, height, 0, 0, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24332, 0, 0, 32, 16, 2, height, 0, 16, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25198, 0, 0, 32, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24337, 0, 0, 32, 16, 2, height, 0, 16, @@ -10540,7 +10540,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25225, 0, 0, 32, 16, 0, height, 0, 16, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -10557,7 +10557,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25189, 0, 0, 16, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24328, 0, 0, 16, 16, 2, height, 16, 16, @@ -10568,14 +10568,14 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * height + 59); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25220, 0, 0, 16, 16, 0, height, 16, 16, height + 59); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24333, 0, 0, 16, 16, 2, height, 16, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25199, 0, 0, 16, 16, 2, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24338, 0, 0, 16, 16, 2, height, 0, 0, @@ -10586,7 +10586,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * height + 59); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25226, 0, 0, 16, 16, 0, height, 0, 0, height + 59); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, @@ -10609,7 +10609,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25190, 0, 0, 16, 32, 2, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24329, 0, 0, 16, 32, 2, height, 0, 0, @@ -10620,7 +10620,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25221, 0, 0, 16, 32, 0, height, 0, 0, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24334, 0, 0, 16, 32, 2, height, 0, 0, @@ -10631,7 +10631,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25223, 0, 0, 16, 32, 0, height, 0, 0, height + 67); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24339, 0, 0, 16, 32, 2, height, 16, 0, @@ -10642,7 +10642,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25227, 0, 0, 16, 32, 0, height, 16, 0, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -10659,7 +10659,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25191, 0, 0, 27, 32, 2, height, 2, 0, height); - wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24330, 0, 0, 27, 32, 2, height, 2, 0, @@ -10670,7 +10670,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25222, 0, 0, 27, 32, 0, height, 2, 0, height + 67); - wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24335, 0, 0, 27, 32, 2, height, 2, 0, @@ -10681,7 +10681,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25224, 0, 0, 27, 32, 0, height, 2, 0, height + 67); - wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24340, 0, 0, 27, 32, 2, height, 2, 0, @@ -10692,7 +10692,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25228, 0, 0, 27, 32, 0, height, 2, 0, height + 67); - wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -10724,14 +10724,14 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25167, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24306, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25172, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24311, 0, 0, 32, 27, 2, height, 0, 2, @@ -10742,14 +10742,14 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25213, 0, 0, 32, 27, 0, height, 0, 2, height + 67); - wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24316, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25182, 0, 0, 32, 27, 2, height, 0, 2, height); - wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -10776,14 +10776,14 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25207, 0, 0, 32, 16, 0, height, 0, 16, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24307, 0, 0, 32, 16, 2, height, 0, 16, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25173, 0, 0, 32, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24312, 0, 0, 32, 16, 2, height, 0, 0, @@ -10794,14 +10794,14 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25214, 0, 0, 32, 16, 0, height, 0, 0, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24317, 0, 0, 32, 16, 2, height, 0, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25183, 0, 0, 32, 16, 2, height, 0, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -10822,14 +10822,14 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session height + 59); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25208, 0, 0, 16, 16, 0, height, 0, 0, height + 59); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24308, 0, 0, 16, 16, 2, height, 16, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25174, 0, 0, 16, 16, 2, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24313, 0, 0, 16, 16, 2, height, 16, 16, @@ -10840,14 +10840,14 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session height + 59); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25215, 0, 0, 16, 16, 0, height, 16, 16, height + 59); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24318, 0, 0, 16, 16, 2, height, 0, 16, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25184, 0, 0, 16, 16, 2, height, 0, 16, height); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height(session, @@ -10874,7 +10874,7 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25209, 0, 0, 16, 32, 0, height, 16, 0, height + 67); - wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24309, 0, 0, 16, 32, 2, height, 0, 0, @@ -10885,7 +10885,7 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25211, 0, 0, 16, 32, 0, height, 0, 0, height + 67); - wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24314, 0, 0, 16, 32, 2, height, 0, 0, @@ -10896,14 +10896,14 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25216, 0, 0, 16, 32, 0, height, 0, 0, height + 67); - wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24319, 0, 0, 16, 32, 2, height, 16, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25185, 0, 0, 16, 32, 2, height, 16, 0, height); - wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } paint_util_set_segment_support_height( @@ -10924,7 +10924,7 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25210, 0, 0, 27, 32, 0, height, 2, 0, height + 67); - wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24310, 0, 0, 27, 32, 2, height, 2, 0, @@ -10935,7 +10935,7 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25212, 0, 0, 27, 32, 0, height, 2, 0, height + 67); - wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24315, 0, 0, 27, 32, 2, height, 2, 0, @@ -10946,14 +10946,14 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session height + 67); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25217, 0, 0, 27, 32, 0, height, 2, 0, height + 67); - wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24320, 0, 0, 27, 32, 2, height, 2, 0, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25186, 0, 0, 27, 32, 2, height, 2, 0, height); - wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } switch (direction) @@ -11002,28 +11002,28 @@ static void wooden_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * s height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25127, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24262, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25128, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24263, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25129, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24264, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25130, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -11049,28 +11049,28 @@ static void wooden_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session * height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25131, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24266, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25132, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24267, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25133, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24268, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25134, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -11096,28 +11096,28 @@ static void wooden_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * s height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25135, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24270, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25136, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24271, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25137, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24272, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25138, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -11143,28 +11143,28 @@ static void wooden_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session * height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25139, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24274, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25140, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24275, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25141, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24276, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25142, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -11227,7 +11227,7 @@ static void wooden_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_sess height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25143, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24278, 0, 0, 32, 25, 2, height, 0, 3, @@ -11238,7 +11238,7 @@ static void wooden_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_sess height + 5); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25159, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24279, 0, 0, 32, 25, 2, height, 0, 3, @@ -11249,14 +11249,14 @@ static void wooden_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_sess height + 5); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25160, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24280, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25146, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -11283,7 +11283,7 @@ static void wooden_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_se height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25147, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24282, 0, 0, 32, 25, 2, height, 0, 3, @@ -11294,7 +11294,7 @@ static void wooden_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_se height + 5); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25161, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24283, 0, 0, 32, 25, 2, height, 0, 3, @@ -11305,14 +11305,14 @@ static void wooden_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_se height + 5); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25162, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24284, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25150, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -11339,7 +11339,7 @@ static void wooden_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_sess height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25151, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24286, 0, 0, 32, 25, 2, height, 0, 3, @@ -11350,7 +11350,7 @@ static void wooden_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_sess height + 5); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25163, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24287, 0, 0, 32, 25, 2, height, 0, 3, @@ -11361,14 +11361,14 @@ static void wooden_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_sess height + 5); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25164, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 0, 7, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 7, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24288, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25154, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -11395,7 +11395,7 @@ static void wooden_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_se height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25155, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24290, 0, 0, 32, 25, 2, height, 0, 3, @@ -11406,7 +11406,7 @@ static void wooden_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_se height + 5); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25165, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24291, 0, 0, 32, 25, 2, height, 0, 3, @@ -11417,14 +11417,14 @@ static void wooden_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_se height + 5); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25166, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 0, 7, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 7, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24292, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25158, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -11486,7 +11486,7 @@ static void wooden_rc_track_flat_to_left_banked_25_deg_up(paint_session * sessio height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25091, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24226, 0, 0, 32, 25, 2, height, 0, 3, @@ -11497,7 +11497,7 @@ static void wooden_rc_track_flat_to_left_banked_25_deg_up(paint_session * sessio height + 5); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25107, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24227, 0, 0, 32, 25, 2, height, 0, 3, @@ -11508,14 +11508,14 @@ static void wooden_rc_track_flat_to_left_banked_25_deg_up(paint_session * sessio height + 5); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25108, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24228, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25094, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -11541,7 +11541,7 @@ static void wooden_rc_track_flat_to_right_banked_25_deg_up(paint_session * sessi height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25095, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24230, 0, 0, 32, 25, 2, height, 0, 3, @@ -11552,7 +11552,7 @@ static void wooden_rc_track_flat_to_right_banked_25_deg_up(paint_session * sessi height + 5); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25109, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24231, 0, 0, 32, 25, 2, height, 0, 3, @@ -11563,14 +11563,14 @@ static void wooden_rc_track_flat_to_right_banked_25_deg_up(paint_session * sessi height + 5); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25110, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24232, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25098, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -11596,7 +11596,7 @@ static void wooden_rc_track_left_banked_25_deg_up_to_flat(paint_session * sessio height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25099, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24234, 0, 0, 32, 25, 2, height, 0, 3, @@ -11607,7 +11607,7 @@ static void wooden_rc_track_left_banked_25_deg_up_to_flat(paint_session * sessio height + 5); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25111, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24235, 0, 0, 32, 25, 2, height, 0, 3, @@ -11618,14 +11618,14 @@ static void wooden_rc_track_left_banked_25_deg_up_to_flat(paint_session * sessio height + 5); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25112, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 0, 7, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 7, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24236, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25102, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -11651,7 +11651,7 @@ static void wooden_rc_track_right_banked_25_deg_up_to_flat(paint_session * sessi height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25103, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24238, 0, 0, 32, 25, 2, height, 0, 3, @@ -11662,7 +11662,7 @@ static void wooden_rc_track_right_banked_25_deg_up_to_flat(paint_session * sessi height + 5); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25113, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24239, 0, 0, 32, 25, 2, height, 0, 3, @@ -11673,14 +11673,14 @@ static void wooden_rc_track_right_banked_25_deg_up_to_flat(paint_session * sessi height + 5); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25114, 0, 0, 32, 1, 9, height, 0, 26, height + 5); - wooden_a_supports_paint_setup(session, 0, 7, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 7, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: sub_98197C_rotated(session, direction, wooden_rc_get_track_colour(session) | 24240, 0, 0, 32, 25, 2, height, 0, 3, height); sub_98199C_rotated(session, direction, wooden_rc_get_rails_colour(session) | 25106, 0, 0, 32, 25, 2, height, 0, 3, height); - wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } if (direction == 0 || direction == 3) @@ -12008,5 +12008,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_wooden_rc(sint32 trackType, sint32 case TRACK_ELEM_RIGHT_BANKED_25_DEG_DOWN_TO_FLAT: return wooden_rc_track_right_banked_25_deg_down_to_flat; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/coaster/WoodenWildMouse.cpp b/src/openrct2/ride/coaster/WoodenWildMouse.cpp index 6efa836931..c9daaebd22 100644 --- a/src/openrct2/ride/coaster/WoodenWildMouse.cpp +++ b/src/openrct2/ride/coaster/WoodenWildMouse.cpp @@ -141,7 +141,7 @@ static void wooden_wild_mouse_track_flat(paint_session * session, uint8 rideInde uint32 imageId = imageIds[direction] | session->TrackColours[SCHEME_TRACK]; sub_98196C_rotated(session, direction, imageId, 0, 6, 32, 20, 1, height); - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height( session, @@ -166,7 +166,7 @@ static void wooden_wild_mouse_track_station(paint_session * session, uint8 rideI height - 2, 0, 2, height); sub_98199C_rotated(session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 6, 32, 20, 1, height, 0, 0, height); - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); track_paint_util_draw_station(session, rideIndex, trackSequence, direction, height, tileElement); paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -196,7 +196,7 @@ static void wooden_wild_mouse_track_25_deg_up(paint_session * session, uint8 rid uint32 imageId = imageIds[isChained][direction] | session->TrackColours[SCHEME_TRACK]; sub_98197C_rotated(session, direction, imageId, 0, 2, 32, 25, 1, height, 0, 3, height); - wooden_a_supports_paint_setup(session, direction & 1, 9 + direction, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 9 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction == 0 || direction == 3) { @@ -242,7 +242,7 @@ static void wooden_wild_mouse_track_60_deg_up(paint_session * session, uint8 rid sub_98197C_rotated(session, direction, imageId, 0, 6, 2, 24, 93, height, 28, 4, height - 16); } - wooden_a_supports_paint_setup(session, direction & 1, 21 + direction, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 21 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction == 0 || direction == 3) { @@ -280,7 +280,7 @@ static void wooden_wild_mouse_track_flat_to_25_deg_up(paint_session * session, u uint32 imageId = imageIds[isChained][direction] | session->TrackColours[SCHEME_TRACK]; sub_98197C_rotated(session, direction, imageId, 0, 2, 32, 25, 1, height, 0, 3, height); - wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction == 0 || direction == 3) { @@ -330,7 +330,7 @@ static void wooden_wild_mouse_track_25_deg_up_to_60_deg_up(paint_session * sessi sub_98197C_rotated(session, direction, imageId, 0, 6, 32, 2, 43, height, 0, 4, height); } - wooden_a_supports_paint_setup(session, direction & 1, 13 + direction, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 13 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction == 0 || direction == 3) { @@ -379,7 +379,7 @@ static void wooden_wild_mouse_track_60_deg_to_25_deg_up(paint_session * session, sub_98197C_rotated(session, direction, imageId, 0, 6, 32, 2, 43, height, 0, 4, height); } - wooden_a_supports_paint_setup(session, direction & 1, 17 + direction, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 17 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction == 0 || direction == 3) { @@ -417,7 +417,7 @@ static void wooden_wild_mouse_track_25_deg_up_to_flat(paint_session * session, u uint32 imageId = imageIds[isChained][direction] | session->TrackColours[SCHEME_TRACK]; sub_98197C_rotated(session, direction, imageId, 0, 2, 32, 25, 1, height, 0, 3, height); - wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction == 0 || direction == 3) { @@ -509,7 +509,7 @@ static void wooden_wild_mouse_track_right_quarter_turn_3(paint_session * session { case 0: case 3: - wooden_a_supports_paint_setup(session, supportType[direction], 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, supportType[direction], 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; } @@ -564,7 +564,7 @@ static void wooden_wild_mouse_track_left_quarter_turn_1(paint_session * session, sub_98196C(session, imageId, 6, 6, 24, 24, 1, height, get_current_rotation()); break; } - wooden_a_supports_paint_setup(session, supportType[direction], 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, supportType[direction], 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); track_paint_util_left_quarter_turn_1_tile_tunnel(session, direction, height, 0, TUNNEL_0, 0, TUNNEL_0); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 32, 0x20); @@ -611,7 +611,7 @@ static void wooden_wild_mouse_track_flat_to_60_deg_up(paint_session * session, u sub_98197C_rotated(session, direction, imageId, 0, 6, 32, 2, 43, height, 0, 4, height); } - wooden_a_supports_paint_setup(session, direction & 1, 29 + direction, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 29 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction == 0 || direction == 3) { @@ -660,7 +660,7 @@ static void wooden_wild_mouse_track_60_deg_up_to_flat(paint_session * session, u sub_98197C_rotated(session, direction, imageId, 0, 6, 32, 2, 43, height, 0, 4, height); } - wooden_a_supports_paint_setup(session, direction & 1, 33 + direction, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 33 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction == 0 || direction == 3) { @@ -740,5 +740,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_wooden_wild_mouse(sint32 trackType case TRACK_ELEM_60_DEG_DOWN_TO_FLAT: return wooden_wild_mouse_track_60_deg_down_to_flat; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/gentle/CarRide.cpp b/src/openrct2/ride/gentle/CarRide.cpp index 3dc7c7694a..9fc2e4380f 100644 --- a/src/openrct2/ride/gentle/CarRide.cpp +++ b/src/openrct2/ride/gentle/CarRide.cpp @@ -372,7 +372,7 @@ static void paint_car_ride_track_right_quarter_turn_3_tiles(paint_session * sess track_paint_util_right_quarter_turn_3_tiles_paint( session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], car_ride_track_pieces_quarter_turn_3_tiles, defaultRightQuarterTurn3TilesOffsets, - defaultRightQuarterTurn3TilesBoundLengths, NULL, get_current_rotation()); + defaultRightQuarterTurn3TilesBoundLengths, nullptr, get_current_rotation()); track_paint_util_right_quarter_turn_3_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_0); switch (trackSequence) @@ -472,7 +472,7 @@ static void paint_car_ride_track_spinning_tunnel(paint_session * session, uint8 paint_util_push_tunnel_right(session, height, TUNNEL_0); } - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 32, 0x20); @@ -751,5 +751,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_car_ride(sint32 trackType, sint32 return paint_car_ride_track_spinning_tunnel; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/gentle/CircusShow.cpp b/src/openrct2/ride/gentle/CircusShow.cpp index 3751ab4da4..23d703b49f 100644 --- a/src/openrct2/ride/gentle/CircusShow.cpp +++ b/src/openrct2/ride/gentle/CircusShow.cpp @@ -63,7 +63,7 @@ static void paint_circus_show(paint_session * session, uint8 rideIndex, uint8 tr Ride * ride = get_ride(rideIndex); LocationXY16 position = session->MapPosition; - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], nullptr); track_paint_util_paint_floor(session, edges, session->TrackColours[SCHEME_TRACK], height, floorSpritesCork, get_current_rotation()); @@ -126,7 +126,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_circus_show(sint32 trackType, sint { if (trackType != FLAT_TRACK_ELEM_3_X_3) { - return NULL; + return nullptr; } return paint_circus_show; diff --git a/src/openrct2/ride/gentle/CrookedHouse.cpp b/src/openrct2/ride/gentle/CrookedHouse.cpp index 3b91a96be4..6c7b814c65 100644 --- a/src/openrct2/ride/gentle/CrookedHouse.cpp +++ b/src/openrct2/ride/gentle/CrookedHouse.cpp @@ -77,7 +77,7 @@ static void paint_crooked_house(paint_session * session, uint8 rideIndex, uint8 Ride * ride = get_ride(rideIndex); LocationXY16 position = session->MapPosition; - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], nullptr); track_paint_util_paint_floor(session, edges, session->TrackColours[SCHEME_TRACK], height, floorSpritesCork, get_current_rotation()); @@ -130,7 +130,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_crooked_house(sint32 trackType, si { if (trackType != FLAT_TRACK_ELEM_3_X_3) { - return NULL; + return nullptr; } return paint_crooked_house; diff --git a/src/openrct2/ride/gentle/Dodgems.cpp b/src/openrct2/ride/gentle/Dodgems.cpp index b8f300fed9..98ef651c34 100644 --- a/src/openrct2/ride/gentle/Dodgems.cpp +++ b/src/openrct2/ride/gentle/Dodgems.cpp @@ -52,7 +52,7 @@ static void paint_dodgems(paint_session * session, uint8 rideIndex, uint8 trackS Ride * ride = get_ride(rideIndex); LocationXY16 position = session->MapPosition; - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_MISC], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_MISC], nullptr); uint32 imageId = SPR_DODGEMS_FLOOR | session->TrackColours[SCHEME_SUPPORTS]; sub_98197C(session, imageId, 0, 0, 30, 30, 1, height, 1, 1, height, get_current_rotation()); @@ -102,7 +102,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_dodgems(sint32 trackType, sint32 d { if (trackType != FLAT_TRACK_ELEM_4_X_4) { - return NULL; + return nullptr; } return paint_dodgems; diff --git a/src/openrct2/ride/gentle/FerrisWheel.cpp b/src/openrct2/ride/gentle/FerrisWheel.cpp index fd5285b0ae..a9377767d5 100644 --- a/src/openrct2/ride/gentle/FerrisWheel.cpp +++ b/src/openrct2/ride/gentle/FerrisWheel.cpp @@ -62,7 +62,7 @@ static void paint_ferris_wheel_structure(paint_session * session, uint8 rideInde Ride * ride = get_ride(rideIndex); rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); - rct_vehicle * vehicle = NULL; + rct_vehicle * vehicle = nullptr; sint8 xOffset = !(direction & 1) ? axisOffset : 0; sint8 yOffset = (direction & 1) ? axisOffset : 0; @@ -80,7 +80,7 @@ static void paint_ferris_wheel_structure(paint_session * session, uint8 rideInde } uint32 imageOffset = 0; - if (vehicle != NULL) + if (vehicle != nullptr) { imageOffset = vehicle->vehicle_sprite_type % 8; } @@ -155,7 +155,7 @@ static void paint_ferris_wheel(paint_session * session, uint8 rideIndex, uint8 t Ride * ride = get_ride(rideIndex); LocationXY16 position = session->MapPosition; - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_MISC], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_MISC], nullptr); track_paint_util_paint_floor(session, edges, session->TrackColours[SCHEME_TRACK], height, floorSpritesCork, get_current_rotation()); @@ -212,7 +212,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_ferris_wheel(sint32 trackType, sin { if (trackType != FLAT_TRACK_ELEM_1_X_4_C) { - return NULL; + return nullptr; } return paint_ferris_wheel; diff --git a/src/openrct2/ride/gentle/FlyingSaucers.cpp b/src/openrct2/ride/gentle/FlyingSaucers.cpp index 8ded0f8c51..9288c7d91e 100644 --- a/src/openrct2/ride/gentle/FlyingSaucers.cpp +++ b/src/openrct2/ride/gentle/FlyingSaucers.cpp @@ -48,7 +48,7 @@ static void paint_flying_saucers(paint_session * session, uint8 rideIndex, uint8 Ride * ride = get_ride(rideIndex); LocationXY16 position = session->MapPosition; - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_MISC], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_MISC], nullptr); uint32 imageId = SPR_FLYING_SAUCERS_FLOOR | session->TrackColours[SCHEME_TRACK]; sub_98197C(session, imageId, 0, 0, 30, 30, 1, height, 1, 1, height, get_current_rotation()); @@ -67,7 +67,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_flying_saucers(sint32 trackType, s { if (trackType != FLAT_TRACK_ELEM_4_X_4) { - return NULL; + return nullptr; } return paint_flying_saucers; diff --git a/src/openrct2/ride/gentle/GhostTrain.cpp b/src/openrct2/ride/gentle/GhostTrain.cpp index 46114d848b..fedf692451 100644 --- a/src/openrct2/ride/gentle/GhostTrain.cpp +++ b/src/openrct2/ride/gentle/GhostTrain.cpp @@ -429,7 +429,7 @@ static void paint_ghost_train_track_right_quarter_turn_3_tiles(paint_session * s { track_paint_util_right_quarter_turn_3_tiles_paint( session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], - ghost_train_track_pieces_quarter_turn_3_tiles, NULL, defaultRightQuarterTurn3TilesBoundLengths, + ghost_train_track_pieces_quarter_turn_3_tiles, nullptr, defaultRightQuarterTurn3TilesBoundLengths, defaultRightQuarterTurn3TilesBoundOffsets, get_current_rotation()); track_paint_util_right_quarter_turn_3_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_0); @@ -515,7 +515,7 @@ static void paint_ghost_train_track_spinning_tunnel(paint_session * session, uin paint_util_push_tunnel_right(session, height, TUNNEL_0); } - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 32, 0x20); @@ -603,5 +603,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_ghost_train(sint32 trackType, sint return paint_ghost_train_track_spinning_tunnel; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/gentle/HauntedHouse.cpp b/src/openrct2/ride/gentle/HauntedHouse.cpp index 3343b4949c..5b14b22c8b 100644 --- a/src/openrct2/ride/gentle/HauntedHouse.cpp +++ b/src/openrct2/ride/gentle/HauntedHouse.cpp @@ -99,7 +99,7 @@ static void paint_haunted_house(paint_session * session, uint8 rideIndex, uint8 Ride * ride = get_ride(rideIndex); LocationXY16 position = session->MapPosition; - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], nullptr); track_paint_util_paint_floor(session, edges, session->TrackColours[SCHEME_TRACK], height, floorSpritesCork, get_current_rotation()); @@ -153,7 +153,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_haunted_house(sint32 trackType, si { if (trackType != FLAT_TRACK_ELEM_3_X_3) { - return NULL; + return nullptr; } return paint_haunted_house; diff --git a/src/openrct2/ride/gentle/Maze.cpp b/src/openrct2/ride/gentle/Maze.cpp index 879fd6014b..b17d5bcdb6 100644 --- a/src/openrct2/ride/gentle/Maze.cpp +++ b/src/openrct2/ride/gentle/Maze.cpp @@ -62,7 +62,7 @@ static void maze_paint_setup(paint_session * session, uint8 rideIndex, uint8 tra sint32 image_id = SPR_TERRAIN_DIRT | session->TrackColours[SCHEME_MISC]; sub_98196C(session, image_id, 0, 0, 32, 32, 0, height, rotation); - wooden_a_supports_paint_setup(session, (rotation & 1) ? 0 : 1, 0, height, session->TrackColours[SCHEME_3], NULL); + wooden_a_supports_paint_setup(session, (rotation & 1) ? 0 : 1, 0, height, session->TrackColours[SCHEME_3], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL & ~SEGMENT_C4, 0xFFFF, 0); @@ -186,7 +186,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_maze(sint32 trackType, sint32 dire { if (trackType != TRACK_ELEM_MAZE) { - return NULL; + return nullptr; } return maze_paint_setup; diff --git a/src/openrct2/ride/gentle/MerryGoRound.cpp b/src/openrct2/ride/gentle/MerryGoRound.cpp index 7a15297c34..2f180919df 100644 --- a/src/openrct2/ride/gentle/MerryGoRound.cpp +++ b/src/openrct2/ride/gentle/MerryGoRound.cpp @@ -37,7 +37,7 @@ static void paint_merry_go_round_structure(paint_session * session, uint8 rideIn Ride * ride = get_ride(rideIndex); rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); - rct_vehicle * vehicle = NULL; + rct_vehicle * vehicle = nullptr; if (rideEntry == nullptr) { @@ -60,7 +60,7 @@ static void paint_merry_go_round_structure(paint_session * session, uint8 rideIn } uint32 rotationOffset = 0; - if (vehicle != NULL) + if (vehicle != nullptr) { uint32 rotation = ((vehicle->sprite_direction >> 3) + get_current_rotation()) << 5; rotationOffset = (vehicle->vehicle_sprite_type + rotation) % 128; @@ -80,7 +80,7 @@ static void paint_merry_go_round_structure(paint_session * session, uint8 rideIn get_current_rotation()); rct_drawpixelinfo * dpi = session->Unk140E9A8; - if (dpi->zoom_level == 0 && ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && vehicle != NULL) + if (dpi->zoom_level == 0 && ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && vehicle != nullptr) { for (sint32 peep = 0; peep <= 14; peep += 2) @@ -122,7 +122,7 @@ static void paint_merry_go_round(paint_session * session, uint8 rideIndex, uint8 Ride * ride = get_ride(rideIndex); LocationXY16 position = session->MapPosition; - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], nullptr); track_paint_util_paint_floor(session, edges, session->TrackColours[SCHEME_TRACK], height, floorSpritesCork, get_current_rotation()); @@ -185,7 +185,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_merry_go_round(sint32 trackType, s { if (trackType != FLAT_TRACK_ELEM_3_X_3) { - return NULL; + return nullptr; } return paint_merry_go_round; diff --git a/src/openrct2/ride/gentle/MiniGolf.cpp b/src/openrct2/ride/gentle/MiniGolf.cpp index 52f1d02895..4d5d73e775 100644 --- a/src/openrct2/ride/gentle/MiniGolf.cpp +++ b/src/openrct2/ride/gentle/MiniGolf.cpp @@ -650,7 +650,7 @@ static void paint_mini_golf_station(paint_session * session, uint8 rideIndex, ui paint_util_push_tunnel_left(session, height, TUNNEL_6); } - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 32, 0x20); @@ -749,7 +749,7 @@ static void paint_mini_golf_hole_ab(paint_session * session, uint8 trackSequence LocationXY16 boundBox, boundBoxOffset; bool drewSupports = - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 32, 0x20); @@ -818,7 +818,7 @@ static void paint_mini_golf_hole_c(paint_session * session, uint8 rideIndex, uin LocationXY16 boundBox, boundBoxOffset; bool drewSupports = - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 32, 0x20); @@ -890,7 +890,7 @@ static void paint_mini_golf_hole_d(paint_session * session, uint8 rideIndex, uin if (trackSequence == 2) supportType = 1 - supportType; bool drewSupports = - wooden_a_supports_paint_setup(session, supportType, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, supportType, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 32, 0x20); @@ -982,7 +982,7 @@ static void paint_mini_golf_hole_e(paint_session * session, uint8 rideIndex, uin if (trackSequence == 2) supportType = 1 - supportType; bool drewSupports = - wooden_a_supports_paint_setup(session, supportType, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, supportType, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 32, 0x20); @@ -1109,7 +1109,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_mini_golf(sint32 trackType, sint32 return paint_mini_golf_hole_e; } - return NULL; + return nullptr; } /** diff --git a/src/openrct2/ride/gentle/MiniHelicopters.cpp b/src/openrct2/ride/gentle/MiniHelicopters.cpp index 304db66cae..d58baa4628 100644 --- a/src/openrct2/ride/gentle/MiniHelicopters.cpp +++ b/src/openrct2/ride/gentle/MiniHelicopters.cpp @@ -341,5 +341,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_mini_helicopters(sint32 trackType, return paint_mini_helicopters_track_right_quarter_turn_1_tile; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/gentle/MonorailCycles.cpp b/src/openrct2/ride/gentle/MonorailCycles.cpp index f1a4ee1dc8..d7e5c973e0 100644 --- a/src/openrct2/ride/gentle/MonorailCycles.cpp +++ b/src/openrct2/ride/gentle/MonorailCycles.cpp @@ -287,7 +287,7 @@ static void paint_monorail_cycles_track_right_quarter_turn_5_tiles(paint_session { track_paint_util_right_quarter_turn_5_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], - monorail_cycles_track_pieces_flat_quarter_turn_5_tiles, NULL, defaultRightQuarterTurn5TilesBoundLengths, + monorail_cycles_track_pieces_flat_quarter_turn_5_tiles, nullptr, defaultRightQuarterTurn5TilesBoundLengths, defaultRightQuarterTurn5TilesBoundOffsets, get_current_rotation()); sint32 supportHeight = @@ -631,5 +631,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_monorail_cycles(sint32 trackType, return paint_monorail_cycles_track_right_quarter_turn_3_tiles; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/gentle/ObservationTower.cpp b/src/openrct2/ride/gentle/ObservationTower.cpp index 03bced5fbd..f1c9e005dc 100644 --- a/src/openrct2/ride/gentle/ObservationTower.cpp +++ b/src/openrct2/ride/gentle/ObservationTower.cpp @@ -63,7 +63,7 @@ void vehicle_visual_observation_tower(paint_session * session, sint32 x, sint32 image_id = baseImage_id | (vehicle->colours.body_colour << 19) | (vehicle->colours.trim_colour << 24) | IMAGE_TYPE_REMAP_2_PLUS; paint_struct * ps = sub_98197C(session, image_id, 0, 0, 2, 2, 41, z, -11, -11, z + 1, get_current_rotation()); - if (ps != NULL) + if (ps != nullptr) { ps->tertiary_colour = vehicle->colours_extended; } @@ -71,7 +71,7 @@ void vehicle_visual_observation_tower(paint_session * session, sint32 x, sint32 image_id++; ps = sub_98197C(session, image_id, 0, 0, 16, 16, 41, z, -5, -5, z + 1, get_current_rotation()); - if (ps != NULL) + if (ps != nullptr) { ps->tertiary_colour = vehicle->colours_extended; } @@ -89,7 +89,7 @@ static void paint_observation_tower_base(paint_session * session, uint8 rideInde Ride * ride = get_ride(rideIndex); LocationXY16 position = session->MapPosition; - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], nullptr); uint32 imageId = SPR_FLOOR_METAL_B | session->TrackColours[SCHEME_SUPPORTS]; sub_98197C(session, imageId, 0, 0, 32, 32, 1, height, 0, 0, height, get_current_rotation()); @@ -191,5 +191,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_observation_tower(sint32 trackType return paint_observation_tower_section; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/gentle/SpaceRings.cpp b/src/openrct2/ride/gentle/SpaceRings.cpp index bd53559273..93134a9039 100644 --- a/src/openrct2/ride/gentle/SpaceRings.cpp +++ b/src/openrct2/ride/gentle/SpaceRings.cpp @@ -46,7 +46,7 @@ static void paint_space_rings_structure(paint_session * session, Ride * ride, ui if (ride->num_stations == 0 || vehicleIndex < ride->num_vehicles) { rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); - rct_vehicle * vehicle = NULL; + rct_vehicle * vehicle = nullptr; sint32 frameNum = direction; @@ -75,7 +75,7 @@ static void paint_space_rings_structure(paint_session * session, Ride * ride, ui uint32 imageId = (baseImageId + frameNum) | imageColourFlags; sub_98197C(session, imageId, 0, 0, 20, 20, 23, height, -10, -10, height, get_current_rotation()); - if (vehicle != NULL && vehicle->num_peeps > 0) + if (vehicle != nullptr && vehicle->num_peeps > 0) { rct_peep * rider = GET_PEEP(vehicle->peep[0]); imageColourFlags = SPRITE_ID_PALETTE_COLOUR_2(rider->tshirt_colour, rider->trousers_colour); @@ -100,7 +100,7 @@ static void paint_space_rings(paint_session * session, uint8 rideIndex, uint8 tr uint32 imageId; - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], nullptr); track_paint_util_paint_floor(session, edges, session->TrackColours[SCHEME_TRACK], height, floorSpritesCork, get_current_rotation()); @@ -184,7 +184,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_space_rings(sint32 trackType, sint { if (trackType != FLAT_TRACK_ELEM_3_X_3) { - return NULL; + return nullptr; } return paint_space_rings; diff --git a/src/openrct2/ride/gentle/SpiralSlide.cpp b/src/openrct2/ride/gentle/SpiralSlide.cpp index e3ab911054..726724c061 100644 --- a/src/openrct2/ride/gentle/SpiralSlide.cpp +++ b/src/openrct2/ride/gentle/SpiralSlide.cpp @@ -202,7 +202,7 @@ static void paint_spiral_slide(paint_session * session, uint8 rideIndex, uint8 t Ride * ride = get_ride(rideIndex); LocationXY16 position = session->MapPosition; - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_MISC], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_MISC], nullptr); // Base uint32 imageId = ((direction & 1) ? SPIRAL_SLIDE_BASE_B : SPIRAL_SLIDE_BASE_A) | session->TrackColours[SCHEME_SUPPORTS]; @@ -235,7 +235,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_spiral_slide(sint32 trackType, sin { if (trackType != FLAT_TRACK_ELEM_2_X_2) { - return NULL; + return nullptr; } return paint_spiral_slide; diff --git a/src/openrct2/ride/shops/Facility.cpp b/src/openrct2/ride/shops/Facility.cpp index e5dd825d9c..fddffb8797 100644 --- a/src/openrct2/ride/shops/Facility.cpp +++ b/src/openrct2/ride/shops/Facility.cpp @@ -32,7 +32,7 @@ static void facility_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * tileElement) { - bool hasSupports = wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_3], NULL); + bool hasSupports = wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_3], nullptr); Ride * ride = get_ride(rideIndex); rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); @@ -99,5 +99,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_facility(sint32 trackType, sint32 case FLAT_TRACK_ELEM_1_X_1_A: return facility_paint_setup; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/shops/Shop.cpp b/src/openrct2/ride/shops/Shop.cpp index 95b3167aee..987ba58372 100644 --- a/src/openrct2/ride/shops/Shop.cpp +++ b/src/openrct2/ride/shops/Shop.cpp @@ -32,13 +32,13 @@ static void shop_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * tileElement) { - bool hasSupports = wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_3], NULL); + bool hasSupports = wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_3], nullptr); Ride * ride = get_ride(rideIndex); rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); rct_ride_entry_vehicle * firstVehicleEntry = &rideEntry->vehicles[0]; - if (rideEntry == NULL || firstVehicleEntry == NULL) + if (rideEntry == nullptr || firstVehicleEntry == nullptr) { log_error("Error drawing shop, rideEntry or firstVehicleEntry is NULL."); return; @@ -78,5 +78,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_shop(sint32 trackType, sint32 dire case FLAT_TRACK_ELEM_1_X_1_B: return shop_paint_setup; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/thrill/3dCinema.cpp b/src/openrct2/ride/thrill/3dCinema.cpp index 7ae35f88c4..6ba1828bca 100644 --- a/src/openrct2/ride/thrill/3dCinema.cpp +++ b/src/openrct2/ride/thrill/3dCinema.cpp @@ -69,7 +69,7 @@ static void paint_3d_cinema(paint_session * session, uint8 rideIndex, uint8 trac Ride * ride = get_ride(rideIndex); LocationXY16 position = session->MapPosition; - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], nullptr); track_paint_util_paint_floor(session, edges, session->TrackColours[SCHEME_TRACK], height, floorSpritesCork, get_current_rotation()); @@ -130,7 +130,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_3d_cinema(sint32 trackType, sint32 { if (trackType != FLAT_TRACK_ELEM_3_X_3) { - return NULL; + return nullptr; } return paint_3d_cinema; diff --git a/src/openrct2/ride/thrill/Enterprise.cpp b/src/openrct2/ride/thrill/Enterprise.cpp index 1ff1b6e799..a68796c9c1 100644 --- a/src/openrct2/ride/thrill/Enterprise.cpp +++ b/src/openrct2/ride/thrill/Enterprise.cpp @@ -29,7 +29,7 @@ static void paint_enterprise_structure(paint_session * session, Ride * ride, sin rct_tile_element * savedTileElement = static_cast(session->CurrentlyDrawnItem); rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); - rct_vehicle * vehicle = NULL; + rct_vehicle * vehicle = nullptr; if (rideEntry == nullptr) { @@ -46,7 +46,7 @@ static void paint_enterprise_structure(paint_session * session, Ride * ride, sin } uint32 imageOffset = tile_element_get_direction_with_offset(tileElement, get_current_rotation()); - if (vehicle != NULL) + if (vehicle != nullptr) { imageOffset = (vehicle->vehicle_sprite_type << 2) + (((vehicle->sprite_direction >> 3) + get_current_rotation()) % 4); } @@ -63,7 +63,7 @@ static void paint_enterprise_structure(paint_session * session, Ride * ride, sin rct_drawpixelinfo * dpi = session->Unk140E9A8; - if (dpi->zoom_level == 0 && imageOffset < 12 && ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && vehicle != NULL) + if (dpi->zoom_level == 0 && imageOffset < 12 && ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && vehicle != nullptr) { for (sint32 i = 0; i < 15; i++) { @@ -93,7 +93,7 @@ static void paint_enterprise(paint_session * session, uint8 rideIndex, uint8 tra Ride * ride = get_ride(rideIndex); LocationXY16 position = session->MapPosition; - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_MISC], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_MISC], nullptr); track_paint_util_paint_floor(session, edges, session->TrackColours[SCHEME_TRACK], height, floorSpritesCork, get_current_rotation()); @@ -171,7 +171,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_enterprise(sint32 trackType, sint3 { if (trackType != FLAT_TRACK_ELEM_4_X_4) { - return NULL; + return nullptr; } return paint_enterprise; diff --git a/src/openrct2/ride/thrill/GoKarts.cpp b/src/openrct2/ride/thrill/GoKarts.cpp index cc7e6f7e46..7353e42212 100644 --- a/src/openrct2/ride/thrill/GoKarts.cpp +++ b/src/openrct2/ride/thrill/GoKarts.cpp @@ -156,7 +156,7 @@ static void paint_go_karts_track_flat(paint_session * session, uint8 rideIndex, paint_util_push_tunnel_right(session, height, TUNNEL_6); } - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 32, 0x20); @@ -194,19 +194,19 @@ static void paint_go_karts_track_25_deg_up(paint_session * session, uint8 rideIn switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_left(session, height - 8, TUNNEL_7); break; case 1: - wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 2: - wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; case 3: - wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_right(session, height - 8, TUNNEL_7); break; } @@ -247,19 +247,19 @@ static void paint_go_karts_track_flat_to_25_deg_up(paint_session * session, uint switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_left(session, height, TUNNEL_6); break; case 1: - wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_right(session, height, TUNNEL_8); break; case 2: - wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_left(session, height, TUNNEL_8); break; case 3: - wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_right(session, height, TUNNEL_6); break; } @@ -300,19 +300,19 @@ static void paint_go_karts_track_25_deg_up_to_flat(paint_session * session, uint switch (direction) { case 0: - wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_left(session, height - 8, TUNNEL_6); break; case 1: - wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_right(session, height + 8, TUNNEL_14); break; case 2: - wooden_a_supports_paint_setup(session, 0, 7, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 7, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_left(session, height + 8, TUNNEL_14); break; case 3: - wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_right(session, height - 8, TUNNEL_6); break; } @@ -446,7 +446,7 @@ static void paint_go_karts_station(paint_session * session, uint8 rideIndex, uin } } - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 32, 0x20); @@ -515,7 +515,7 @@ static void paint_go_karts_track_left_quarter_turn_1_tile(paint_session * sessio break; } - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 32, 0x20); @@ -563,5 +563,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_go_karts(sint32 trackType, sint32 return paint_go_karts_track_right_quarter_turn_1_tile; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/thrill/LaunchedFreefall.cpp b/src/openrct2/ride/thrill/LaunchedFreefall.cpp index bb3a3937ab..582c672d82 100644 --- a/src/openrct2/ride/thrill/LaunchedFreefall.cpp +++ b/src/openrct2/ride/thrill/LaunchedFreefall.cpp @@ -100,7 +100,7 @@ static void paint_launched_freefall_base(paint_session * session, uint8 rideInde Ride * ride = get_ride(rideIndex); LocationXY16 position = session->MapPosition; - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], nullptr); uint32 imageId = SPR_FLOOR_METAL | session->TrackColours[SCHEME_SUPPORTS]; sub_98197C(session, imageId, 0, 0, 32, 32, 1, height, 0, 0, height, get_current_rotation()); @@ -201,5 +201,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_launched_freefall(sint32 trackType return paint_launched_freefall_tower_section; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/thrill/MagicCarpet.cpp b/src/openrct2/ride/thrill/MagicCarpet.cpp index 93c2b2b36e..6f4e91fdd5 100644 --- a/src/openrct2/ride/thrill/MagicCarpet.cpp +++ b/src/openrct2/ride/thrill/MagicCarpet.cpp @@ -67,7 +67,7 @@ static rct_vehicle * get_first_vehicle(Ride * ride) return GET_VEHICLE(vehicleSpriteIndex); } } - return NULL; + return nullptr; } static void paint_magic_carpet_frame(paint_session * session, uint8 plane, uint8 direction, LocationXYZ16 offset, @@ -156,7 +156,7 @@ static void paint_magic_carpet_vehicle(paint_session * session, Ride * ride, uin if (dpi->zoom_level <= 1 && (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK)) { rct_vehicle * vehicle = get_first_vehicle(ride); - if (vehicle != NULL) + if (vehicle != nullptr) { uint32 baseImageId = IMAGE_TYPE_REMAP | IMAGE_TYPE_REMAP_2_PLUS | (vehicleImageId + 4); for (uint8 peepIndex = 0; peepIndex < vehicle->num_peeps; peepIndex += 2) @@ -178,7 +178,7 @@ static void paint_magic_carpet_structure(paint_session * session, Ride * ride, u rct_vehicle * vehicle = get_first_vehicle(ride); uint32 swingImageId = 0; - if (vehicle != NULL) + if (vehicle != nullptr) { swingImageId = vehicle->vehicle_sprite_type; session->InteractionType = VIEWPORT_INTERACTION_ITEM_SPRITE; @@ -266,5 +266,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_magic_carpet(sint32 trackType, sin case FLAT_TRACK_ELEM_1_X_4_A: return paint_magic_carpet; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/thrill/MotionSimulator.cpp b/src/openrct2/ride/thrill/MotionSimulator.cpp index 0b6f2e211d..a7480641c3 100644 --- a/src/openrct2/ride/thrill/MotionSimulator.cpp +++ b/src/openrct2/ride/thrill/MotionSimulator.cpp @@ -44,7 +44,7 @@ static void paint_motionsimulator_vehicle(paint_session * session, sint8 offsetX rct_tile_element * savedTileElement = static_cast(session->CurrentlyDrawnItem); - rct_vehicle * vehicle = NULL; + rct_vehicle * vehicle = nullptr; if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK) { uint16 spriteIndex = ride->vehicles[0]; @@ -57,7 +57,7 @@ static void paint_motionsimulator_vehicle(paint_session * session, sint8 offsetX } uint32 simulatorImageId = rideEntry->vehicles[0].base_image_id + direction; - if (vehicle != NULL) + if (vehicle != nullptr) { if (vehicle->restraints_position >= 64) { @@ -142,7 +142,7 @@ static void paint_motionsimulator(paint_session * session, uint8 rideIndex, uint Ride * ride = get_ride(rideIndex); LocationXY16 position = { session->MapPosition.x, session->MapPosition.y }; - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], nullptr); track_paint_util_paint_floor(session, edges, session->TrackColours[SCHEME_TRACK], height, floorSpritesCork, get_current_rotation()); track_paint_util_paint_fences(session, edges, position, tileElement, ride, session->TrackColours[SCHEME_SUPPORTS], height, @@ -176,5 +176,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_motionsimulator(sint32 trackType, case FLAT_TRACK_ELEM_2_X_2: return paint_motionsimulator; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/thrill/PirateShip.cpp b/src/openrct2/ride/thrill/PirateShip.cpp index f87ce2eacf..4acffee714 100644 --- a/src/openrct2/ride/thrill/PirateShip.cpp +++ b/src/openrct2/ride/thrill/PirateShip.cpp @@ -68,7 +68,7 @@ static void paint_pirate_ship_structure(paint_session * session, Ride * ride, ui rct_tile_element * savedTileElement = static_cast(session->CurrentlyDrawnItem); rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); - rct_vehicle * vehicle = NULL; + rct_vehicle * vehicle = nullptr; sint8 xOffset = !(direction & 1) ? axisOffset : 0; sint8 yOffset = (direction & 1) ? axisOffset : 0; @@ -84,7 +84,7 @@ static void paint_pirate_ship_structure(paint_session * session, Ride * ride, ui } baseImageId = rideEntry->vehicles[0].base_image_id + pirate_ship_base_sprite_offset[direction]; - if (vehicle != NULL) + if (vehicle != nullptr) { sint32 rotation = (sint8)vehicle->vehicle_sprite_type; if (rotation != 0) @@ -121,7 +121,7 @@ static void paint_pirate_ship_structure(paint_session * session, Ride * ride, ui rct_drawpixelinfo * dpi = session->Unk140E9A8; - if (dpi->zoom_level <= 1 && ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && vehicle != NULL) + if (dpi->zoom_level <= 1 && ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && vehicle != nullptr) { sint32 peep = 0; sint32 offset = 1; @@ -179,7 +179,7 @@ static void paint_pirate_ship(paint_session * session, uint8 rideIndex, uint8 tr if (relativeTrackSequence == 1 || relativeTrackSequence == 4) { - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); } else if (direction & 1) { @@ -320,7 +320,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_pirate_ship(sint32 trackType, sint { if (trackType != FLAT_TRACK_ELEM_1_X_5) { - return NULL; + return nullptr; } return paint_pirate_ship; diff --git a/src/openrct2/ride/thrill/RotoDrop.cpp b/src/openrct2/ride/thrill/RotoDrop.cpp index 935b810c05..436aaa8648 100644 --- a/src/openrct2/ride/thrill/RotoDrop.cpp +++ b/src/openrct2/ride/thrill/RotoDrop.cpp @@ -100,7 +100,7 @@ static void paint_roto_drop_base(paint_session * session, uint8 rideIndex, uint8 Ride * ride = get_ride(rideIndex); LocationXY16 position = session->MapPosition; - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], nullptr); uint32 imageId = SPR_FLOOR_METAL_B | session->TrackColours[SCHEME_SUPPORTS]; sub_98197C(session, imageId, 0, 0, 32, 32, 1, height, 0, 0, height, get_current_rotation()); @@ -206,5 +206,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_roto_drop(sint32 trackType, sint32 return paint_roto_drop_tower_section; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/thrill/SwingingInverterShip.cpp b/src/openrct2/ride/thrill/SwingingInverterShip.cpp index 52ab7f281e..8f7a4a3b71 100644 --- a/src/openrct2/ride/thrill/SwingingInverterShip.cpp +++ b/src/openrct2/ride/thrill/SwingingInverterShip.cpp @@ -58,7 +58,7 @@ static void paint_swinging_inverter_ship_structure(paint_session * session, Ride rct_tile_element * savedTileElement = static_cast(session->CurrentlyDrawnItem); rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); - rct_vehicle * vehicle = NULL; + rct_vehicle * vehicle = nullptr; sint8 xOffset = !(direction & 1) ? axisOffset : 0; sint8 yOffset = (direction & 1) ? axisOffset : 0; @@ -72,7 +72,7 @@ static void paint_swinging_inverter_ship_structure(paint_session * session, Ride } uint32 vehicleImageId = rideEntry->vehicles[0].base_image_id + swinging_inverter_ship_base_sprite_offset[direction]; - if (vehicle != NULL) + if (vehicle != nullptr) { sint32 rotation = (sint8)vehicle->vehicle_sprite_type; if (rotation != 0) @@ -196,7 +196,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_swinging_inverter_ship(sint32 trac { if (trackType != FLAT_TRACK_ELEM_1_X_4_B) { - return NULL; + return nullptr; } return paint_swinging_inverter_ship; diff --git a/src/openrct2/ride/thrill/TopSpin.cpp b/src/openrct2/ride/thrill/TopSpin.cpp index a6bbb0cc5c..ffaf059251 100644 --- a/src/openrct2/ride/thrill/TopSpin.cpp +++ b/src/openrct2/ride/thrill/TopSpin.cpp @@ -59,7 +59,7 @@ static void top_spin_paint_vehicle(paint_session * session, sint8 al, sint8 cl, Ride * ride = get_ride(rideIndex); rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); - rct_vehicle * vehicle = NULL; + rct_vehicle * vehicle = nullptr; uint8 seatRotation = 0; sint8 armRotation = 0; @@ -122,7 +122,7 @@ static void top_spin_paint_vehicle(paint_session * session, sint8 al, sint8 cl, uint32 seatImageId; - if (vehicle != NULL && vehicle->restraints_position >= 64) + if (vehicle != nullptr && vehicle->restraints_position >= 64) { // Open Restraints image_id = (vehicle->restraints_position - 64) >> 6; @@ -175,7 +175,7 @@ static void top_spin_paint_vehicle(paint_session * session, sint8 al, sint8 cl, boundBoxOffsetY, boundBoxOffsetZ, rotation); rct_drawpixelinfo * dpi = session->Unk140E9A8; - if (dpi->zoom_level < 2 && vehicle != NULL && vehicle->num_peeps != 0) + if (dpi->zoom_level < 2 && vehicle != nullptr && vehicle->num_peeps != 0) { image_id = (seatImageId + (1 * 76)) | SPRITE_ID_PALETTE_COLOUR_2(vehicle->peep_tshirt_colours[0], vehicle->peep_tshirt_colours[1]); @@ -256,7 +256,7 @@ static void paint_top_spin(paint_session * session, uint8 rideIndex, uint8 track Ride * ride = get_ride(rideIndex); LocationXY16 position = session->MapPosition; - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_MISC], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_MISC], nullptr); track_paint_util_paint_floor(session, edges, session->TrackColours[SCHEME_TRACK], height, floorSpritesCork, get_current_rotation()); @@ -317,7 +317,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_topspin(sint32 trackType, sint32 d { if (trackType != FLAT_TRACK_ELEM_3_X_3) { - return NULL; + return nullptr; } return paint_top_spin; diff --git a/src/openrct2/ride/thrill/Twist.cpp b/src/openrct2/ride/thrill/Twist.cpp index 3a4b7b4019..9bfe127d1d 100644 --- a/src/openrct2/ride/thrill/Twist.cpp +++ b/src/openrct2/ride/thrill/Twist.cpp @@ -28,7 +28,7 @@ static void paint_twist_structure(paint_session * session, Ride * ride, uint8 di rct_tile_element * savedTileElement = static_cast(session->CurrentlyDrawnItem); rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); - rct_vehicle * vehicle = NULL; + rct_vehicle * vehicle = nullptr; if (rideEntry == nullptr) { @@ -47,7 +47,7 @@ static void paint_twist_structure(paint_session * session, Ride * ride, uint8 di } uint32 frameNum = (direction * 88) % 216; - if (vehicle != NULL) + if (vehicle != nullptr) { frameNum += (vehicle->sprite_direction >> 3) << 4; frameNum += vehicle->vehicle_sprite_type; @@ -68,7 +68,7 @@ static void paint_twist_structure(paint_session * session, Ride * ride, uint8 di rct_drawpixelinfo * dpi = session->Unk140E9A8; - if (dpi->zoom_level < 1 && ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && vehicle != NULL) + if (dpi->zoom_level < 1 && ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && vehicle != nullptr) { for (sint32 i = 0; i < vehicle->num_peeps; i += 2) @@ -98,7 +98,7 @@ static void paint_twist(paint_session * session, uint8 rideIndex, uint8 trackSeq uint32 imageId; - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], nullptr); track_paint_util_paint_floor(session, edges, session->TrackColours[SCHEME_MISC], height, floorSpritesCork, get_current_rotation()); @@ -174,7 +174,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_twist(sint32 trackType, sint32 dir { if (trackType != FLAT_TRACK_ELEM_3_X_3) { - return NULL; + return nullptr; } return paint_twist; diff --git a/src/openrct2/ride/transport/Chairlift.cpp b/src/openrct2/ride/transport/Chairlift.cpp index d084593f24..c893ad2b48 100644 --- a/src/openrct2/ride/transport/Chairlift.cpp +++ b/src/openrct2/ride/transport/Chairlift.cpp @@ -118,9 +118,9 @@ static rct_tile_element * chairlift_paint_util_map_get_track_element_at_from_rid sint32 rideIndex) { rct_tile_element * tileElement = map_get_first_element_at(x >> 5, y >> 5); - if (tileElement == NULL) + if (tileElement == nullptr) { - return NULL; + return nullptr; } do @@ -135,7 +135,7 @@ static rct_tile_element * chairlift_paint_util_map_get_track_element_at_from_rid return tileElement; } while (!tile_element_is_last_for_tile(tileElement++)); - return NULL; + return nullptr; }; static bool chairlift_paint_util_is_first_track(uint8 rideIndex, const rct_tile_element * tileElement, LocationXY16 pos, @@ -155,7 +155,7 @@ static bool chairlift_paint_util_is_first_track(uint8 rideIndex, const rct_tile_ rct_tile_element * nextTrack = chairlift_paint_util_map_get_track_element_at_from_ride_fuzzy(newPos.x, newPos.y, tileElement->base_height, rideIndex); - return nextTrack == NULL; + return nextTrack == nullptr; } static bool chairlift_paint_util_is_last_track(uint8 rideIndex, const rct_tile_element * tileElement, LocationXY16 pos, @@ -175,7 +175,7 @@ static bool chairlift_paint_util_is_last_track(uint8 rideIndex, const rct_tile_e rct_tile_element * nextTrack = chairlift_paint_util_map_get_track_element_at_from_ride_fuzzy(newPos.x, newPos.y, tileElement->base_height, rideIndex); - return nextTrack == NULL; + return nextTrack == nullptr; } static void chairlift_paint_station_ne_sw(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, @@ -192,7 +192,7 @@ static void chairlift_paint_station_ne_sw(paint_session * session, uint8 rideInd const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style]; - wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_MISC], NULL); + wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_MISC], nullptr); if (!isStart && !isEnd) { @@ -283,7 +283,7 @@ static void chairlift_paint_station_se_nw(paint_session * session, uint8 rideInd const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style]; - wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_MISC], NULL); + wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_MISC], nullptr); if (!isStart && !isEnd) { @@ -668,5 +668,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_chairlift(sint32 trackType, sint32 return chairlift_paint_right_quarter_turn_1_tile; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/transport/Lift.cpp b/src/openrct2/ride/transport/Lift.cpp index 2303fe6813..9fdf4b6005 100644 --- a/src/openrct2/ride/transport/Lift.cpp +++ b/src/openrct2/ride/transport/Lift.cpp @@ -152,5 +152,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_lift(sint32 trackType, sint32 dire return paint_lift_tower_section; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/transport/MiniatureRailway.cpp b/src/openrct2/ride/transport/MiniatureRailway.cpp index cc6945faf2..d513727b93 100644 --- a/src/openrct2/ride/transport/MiniatureRailway.cpp +++ b/src/openrct2/ride/transport/MiniatureRailway.cpp @@ -601,7 +601,7 @@ static void paint_miniature_railway_track_flat(paint_session * session, uint8 ri paintGrooved = true; } - bool isSupported = wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + bool isSupported = wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); uint32 imageId, imageIdAlt; // In the following 3 calls to sub_98197C_rotated/sub_98199C_rotated, we add 1 to the @@ -662,7 +662,7 @@ static void paint_miniature_railway_station(paint_session * session, uint8 rideI { uint32 imageId; - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); imageId = miniature_railway_station_floor[direction] | session->TrackColours[SCHEME_MISC]; sub_98197C_rotated(session, direction, imageId, 0, 0, 32, 28, 2, height - 2, 0, 2, height); @@ -704,7 +704,7 @@ static void paint_miniature_railway_track_25_deg_up(paint_session * session, uin break; } - wooden_a_supports_paint_setup(session, direction & 1, 45 + direction, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 45 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 56, 0x20); @@ -735,7 +735,7 @@ static void paint_miniature_railway_track_flat_to_25_deg_up(paint_session * sess break; } - wooden_a_supports_paint_setup(session, direction & 1, 37 + direction, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 37 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 48, 0x20); @@ -766,7 +766,7 @@ static void paint_miniature_railway_track_25_deg_up_to_flat(paint_session * sess break; } - wooden_a_supports_paint_setup(session, direction & 1, 41 + direction, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 41 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 40, 0x20); @@ -906,20 +906,20 @@ static void paint_miniature_railway_track_right_quarter_turn_5_tiles(paint_sessi if (right_quarter_turn_5_supports_type[direction][trackSequence] != -1) { bool isSupported = wooden_a_supports_paint_setup(session, right_quarter_turn_5_supports_type[direction][trackSequence], - 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (isSupported == false || (trackSequence == 3 && direction == 2)) { track_paint_util_right_quarter_turn_5_tiles_paint( session, 2, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], miniature_railway_track_pieces_flat_quarter_turn_5_tiles, miniature_railway_right_quarter_turn_5_tiles_offsets, - miniature_railway_right_quarter_turn_5_tiles_bound_lengths, NULL, get_current_rotation()); + miniature_railway_right_quarter_turn_5_tiles_bound_lengths, nullptr, get_current_rotation()); } else { track_paint_util_right_quarter_turn_5_tiles_paint( session, 2, height, direction, trackSequence, session->TrackColours[SCHEME_SUPPORTS], - miniature_railway_right_quarter_turn_5_tiles_track_floor, NULL, + miniature_railway_right_quarter_turn_5_tiles_track_floor, nullptr, miniature_railway_right_quarter_turn_5_tiles_bound_lengths, miniature_railway_right_quarter_turn_5_tiles_bound_offsets, get_current_rotation()); @@ -1016,7 +1016,7 @@ static void paint_miniature_railway_track_s_bend_left(paint_session * session, u } bool isSupported = wooden_a_supports_paint_setup(session, s_bend_left_supports_type[direction][trackSequence], 0, height, - session->TrackColours[SCHEME_SUPPORTS], NULL); + session->TrackColours[SCHEME_SUPPORTS], nullptr); const LocationXY16 offsetList[] = { { 0, 2 }, @@ -1110,7 +1110,7 @@ static void paint_miniature_railway_track_s_bend_right(paint_session * session, } bool isSupported = wooden_a_supports_paint_setup(session, s_bend_right_supports_type[direction][trackSequence], 0, height, - session->TrackColours[SCHEME_SUPPORTS], NULL); + session->TrackColours[SCHEME_SUPPORTS], nullptr); const LocationXY16 offsetList[] = { { 0, 2 }, @@ -1235,14 +1235,14 @@ static void paint_miniature_railway_track_right_quarter_turn_3_tiles(paint_sessi { const uint8 supportType[] = { 4, 5, 2, 3 }; isSupported = wooden_a_supports_paint_setup(session, supportType[direction], 0, height, - session->TrackColours[SCHEME_SUPPORTS], NULL); + session->TrackColours[SCHEME_SUPPORTS], nullptr); } if (isSupported == false) { track_paint_util_right_quarter_turn_3_tiles_paint( session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], miniature_railway_track_pieces_flat_quarter_turn_3_tiles, defaultRightQuarterTurn3TilesOffsets, - defaultRightQuarterTurn3TilesBoundLengths, NULL, get_current_rotation()); + defaultRightQuarterTurn3TilesBoundLengths, nullptr, get_current_rotation()); // The following piece was missing in vanilla RCT2 if (trackSequence == 1 && direction == 0) @@ -1255,7 +1255,7 @@ static void paint_miniature_railway_track_right_quarter_turn_3_tiles(paint_sessi { track_paint_util_right_quarter_turn_3_tiles_paint( session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_SUPPORTS], - miniature_railway_right_quarter_turn_3_tile_track_floor, NULL, defaultRightQuarterTurn3TilesBoundLengths, + miniature_railway_right_quarter_turn_3_tile_track_floor, nullptr, defaultRightQuarterTurn3TilesBoundLengths, miniature_railway_right_quarter_turn_3_tile_bound_offsets, get_current_rotation()); static const sint8 right_quarter_turn_3_tiles_sprite_map[] = { 0, -1, 1, 2 }; @@ -1387,7 +1387,7 @@ static void paint_miniature_railway_track_left_eighth_to_diag(paint_session * se if (trackSequence != 4 || !isRightEighthToOrthog) { isSupported = wooden_a_supports_paint_setup(session, supportType[direction][trackSequence], 0, height, - session->TrackColours[SCHEME_SUPPORTS], NULL); + session->TrackColours[SCHEME_SUPPORTS], nullptr); } uint32 imageId; if (isSupported == false) @@ -1525,7 +1525,7 @@ static void paint_miniature_railway_track_right_eighth_to_diag(paint_session * s if (trackSequence != 4 || !isLeftEighthToOrthog) { isSupported = wooden_a_supports_paint_setup(session, supportType[direction][trackSequence], 0, height, - session->TrackColours[SCHEME_SUPPORTS], NULL); + session->TrackColours[SCHEME_SUPPORTS], nullptr); } uint32 imageId; @@ -1658,7 +1658,7 @@ static void miniature_railway_track_diag_flat(paint_session * session, uint8 rid floorBoundSize = floors[supportType].bound_size; floorBoundOffset = floors[supportType].bound_offset; isSupported = - wooden_a_supports_paint_setup(session, supportType, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, supportType, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); } if (direction == 1 && trackSequence == 3) @@ -1742,7 +1742,7 @@ static void miniature_railway_track_diag_25_deg_up(paint_session * session, uint floorBoundSize = floors[supportType].bound_size; floorBoundOffset = floors[supportType].bound_offset; hasSupports = wooden_supports_paint_setup(session, supportFunction, supportType, 0, height + heightDiff, - session->TrackColours[SCHEME_SUPPORTS], NULL); + session->TrackColours[SCHEME_SUPPORTS], nullptr); } if (direction == 1 && trackSequence == 3) @@ -1798,7 +1798,7 @@ static void miniature_railway_track_diag_flat_to_25_deg_up(paint_session * sessi floorBoundSize = floors[supportType].bound_size; floorBoundOffset = floors[supportType].bound_offset; hasSupports = - wooden_a_supports_paint_setup(session, supportType, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, supportType, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); } if (direction == 1 && trackSequence == 3) @@ -1860,7 +1860,7 @@ static void miniature_railway_track_diag_25_deg_up_to_flat(paint_session * sessi floorBoundOffset = floors[supportType].bound_offset; hasSupports = wooden_supports_paint_setup(session, supportFunction, supportType, 0, height + supportOffsets[direction][trackSequence], - session->TrackColours[SCHEME_SUPPORTS], NULL); + session->TrackColours[SCHEME_SUPPORTS], nullptr); } if (direction == 1 && trackSequence == 3) @@ -1932,7 +1932,7 @@ static void miniature_railway_track_diag_25_deg_down(paint_session * session, ui floorBoundOffset = floors[supportType].bound_offset; hasSupports = wooden_supports_paint_setup(session, supportFunction, supportType, 0, height + supportOffsets[direction][trackSequence], - session->TrackColours[SCHEME_SUPPORTS], NULL); + session->TrackColours[SCHEME_SUPPORTS], nullptr); } if (direction == 1 && trackSequence == 3) @@ -2002,7 +2002,7 @@ static void miniature_railway_track_diag_flat_to_25_deg_down(paint_session * ses floorBoundOffset = floors[supportType].bound_offset; hasSupports = wooden_supports_paint_setup(session, supportFunction, supportType, 0, height + supportOffsets[direction][trackSequence], - session->TrackColours[SCHEME_SUPPORTS], NULL); + session->TrackColours[SCHEME_SUPPORTS], nullptr); } if (direction == 1 && trackSequence == 3) @@ -2057,7 +2057,7 @@ static void miniature_railway_track_diag_25_deg_down_to_flat(paint_session * ses floorBoundSize = floors[supportType].bound_size; floorBoundOffset = floors[supportType].bound_offset; hasSupports = - wooden_a_supports_paint_setup(session, supportType, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, supportType, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); } if (direction == 1 && trackSequence == 3) @@ -2157,5 +2157,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_miniature_railway(sint32 trackType return miniature_railway_track_diag_25_deg_down_to_flat; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/transport/Monorail.cpp b/src/openrct2/ride/transport/Monorail.cpp index 51d49d0908..5d57cc5f28 100644 --- a/src/openrct2/ride/transport/Monorail.cpp +++ b/src/openrct2/ride/transport/Monorail.cpp @@ -670,7 +670,7 @@ static void paint_monorail_track_right_quarter_turn_5_tiles(paint_session * sess track_paint_util_right_quarter_turn_5_tiles_paint( session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], monorail_track_pieces_flat_quarter_turn_5_tiles, defaultRightQuarterTurn5TilesOffsets, - defaultRightQuarterTurn5TilesBoundLengths, NULL, get_current_rotation()); + defaultRightQuarterTurn5TilesBoundLengths, nullptr, get_current_rotation()); switch (trackSequence) { @@ -934,7 +934,7 @@ static void paint_monorail_track_right_quarter_turn_3_tiles(paint_session * sess track_paint_util_right_quarter_turn_3_tiles_paint( session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], monorail_track_pieces_flat_quarter_turn_3_tiles, defaultRightQuarterTurn3TilesOffsets, - defaultRightQuarterTurn3TilesBoundLengths, NULL, get_current_rotation()); + defaultRightQuarterTurn3TilesBoundLengths, nullptr, get_current_rotation()); track_paint_util_right_quarter_turn_3_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_6); switch (trackSequence) @@ -1352,5 +1352,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_monorail(sint32 trackType, sint32 return paint_monorail_track_diag_25_deg_down_to_flat; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/transport/SuspendedMonorail.cpp b/src/openrct2/ride/transport/SuspendedMonorail.cpp index eb2f3ea686..6c218e6e8d 100644 --- a/src/openrct2/ride/transport/SuspendedMonorail.cpp +++ b/src/openrct2/ride/transport/SuspendedMonorail.cpp @@ -1758,5 +1758,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_suspended_monorail(sint32 trackTyp case TRACK_ELEM_DIAG_25_DEG_DOWN_TO_FLAT: return suspended_monorail_track_diag_25_deg_down_to_flat; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/water/BoatHire.cpp b/src/openrct2/ride/water/BoatHire.cpp index e0ae831b8e..ad10ddaf04 100644 --- a/src/openrct2/ride/water/BoatHire.cpp +++ b/src/openrct2/ride/water/BoatHire.cpp @@ -159,5 +159,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_boat_hire(sint32 trackType, sint32 return paint_boat_hire_track_right_quarter_turn_1_tile; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/water/DingySlide.cpp b/src/openrct2/ride/water/DingySlide.cpp index 1e4ee5a47d..a4690217cb 100644 --- a/src/openrct2/ride/water/DingySlide.cpp +++ b/src/openrct2/ride/water/DingySlide.cpp @@ -1854,5 +1854,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_dinghy_slide(sint32 trackType, sin return dinghy_slide_track_right_quarter_turn_3_covered; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/water/LogFlume.cpp b/src/openrct2/ride/water/LogFlume.cpp index 9dd2ad7af1..6a3baa7f7c 100644 --- a/src/openrct2/ride/water/LogFlume.cpp +++ b/src/openrct2/ride/water/LogFlume.cpp @@ -833,5 +833,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_log_flume(sint32 trackType, sint32 return paint_log_flume_track_reverser; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/water/RiverRapids.cpp b/src/openrct2/ride/water/RiverRapids.cpp index fe7de42036..e4fdcfb2ac 100644 --- a/src/openrct2/ride/water/RiverRapids.cpp +++ b/src/openrct2/ride/water/RiverRapids.cpp @@ -297,7 +297,7 @@ static void paint_river_rapids_track_flat(paint_session * session, uint8 rideInd sub_98197C(session, imageId, 0, 0, 32, 1, 3, height, 0, 27, height + 17, get_current_rotation()); } - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction & 1) { @@ -337,7 +337,7 @@ static void paint_river_rapids_track_25_deg(paint_session * session, uint8 direc imageId = sprites[direction][1] | session->TrackColours[SCHEME_TRACK]; sub_98197C(session, imageId, 0, 0, 32, 1, 34, height, 0, 27, height + 16, get_current_rotation()); - wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_left(session, height - 8, TUNNEL_7); break; @@ -349,7 +349,7 @@ static void paint_river_rapids_track_25_deg(paint_session * session, uint8 direc imageId = sprites[direction][1] | session->TrackColours[SCHEME_TRACK]; sub_98197C(session, imageId, 0, 0, 1, 32, 34, height, 27, 0, height + 16, get_current_rotation()); - wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; @@ -361,7 +361,7 @@ static void paint_river_rapids_track_25_deg(paint_session * session, uint8 direc imageId = sprites[direction][1] | session->TrackColours[SCHEME_TRACK]; sub_98197C(session, imageId, 0, 0, 32, 1, 34, height, 0, 27, height + 16, get_current_rotation()); - wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; @@ -372,7 +372,7 @@ static void paint_river_rapids_track_25_deg(paint_session * session, uint8 direc imageId = sprites[direction][1] | session->TrackColours[SCHEME_TRACK]; sub_98197C(session, imageId, 0, 0, 1, 32, 34, height, 27, 0, height + 16, get_current_rotation()); - wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_right(session, height - 8, TUNNEL_7); break; } @@ -396,7 +396,7 @@ static void paint_river_rapids_track_25_deg_to_flat_a(paint_session * session, u imageId = sprites[direction][1] | session->TrackColours[SCHEME_TRACK]; sub_98197C(session, imageId, 0, 0, 32, 1, 18, height, 0, 27, height + 16, get_current_rotation()); - wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_left(session, height - 8, TUNNEL_6); break; @@ -408,7 +408,7 @@ static void paint_river_rapids_track_25_deg_to_flat_a(paint_session * session, u imageId = sprites[direction][1] | session->TrackColours[SCHEME_TRACK]; sub_98197C(session, imageId, 0, 0, 1, 32, 18, height, 27, 0, height + 16, get_current_rotation()); - wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_right(session, height + 8, TUNNEL_14); break; @@ -420,7 +420,7 @@ static void paint_river_rapids_track_25_deg_to_flat_a(paint_session * session, u imageId = sprites[direction][1] | session->TrackColours[SCHEME_TRACK]; sub_98197C(session, imageId, 0, 0, 32, 1, 18, height, 0, 27, height + 16, get_current_rotation()); - wooden_a_supports_paint_setup(session, 0, 7, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 7, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_left(session, height + 8, TUNNEL_14); break; @@ -431,7 +431,7 @@ static void paint_river_rapids_track_25_deg_to_flat_a(paint_session * session, u imageId = sprites[direction][1] | session->TrackColours[SCHEME_TRACK]; sub_98197C(session, imageId, 0, 0, 1, 32, 18, height, 27, 0, height + 16, get_current_rotation()); - wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_right(session, height - 8, TUNNEL_6); break; } @@ -455,7 +455,7 @@ static void paint_river_rapids_track_25_deg_to_flat_b(paint_session * session, u imageId = sprites[direction][1] | session->TrackColours[SCHEME_TRACK]; sub_98197C(session, imageId, 0, 0, 32, 1, 26, height, 0, 27, height + 16, get_current_rotation()); - wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_left(session, height, TUNNEL_6); break; @@ -467,7 +467,7 @@ static void paint_river_rapids_track_25_deg_to_flat_b(paint_session * session, u imageId = sprites[direction][1] | session->TrackColours[SCHEME_TRACK]; sub_98197C(session, imageId, 0, 0, 1, 32, 26, height, 27, 0, height + 16, get_current_rotation()); - wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_right(session, height, TUNNEL_8); break; @@ -479,7 +479,7 @@ static void paint_river_rapids_track_25_deg_to_flat_b(paint_session * session, u imageId = sprites[direction][1] | session->TrackColours[SCHEME_TRACK]; sub_98197C(session, imageId, 0, 0, 32, 1, 26, height, 0, 27, height + 16, get_current_rotation()); - wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_left(session, height, TUNNEL_8); break; @@ -490,7 +490,7 @@ static void paint_river_rapids_track_25_deg_to_flat_b(paint_session * session, u imageId = sprites[direction][1] | session->TrackColours[SCHEME_TRACK]; sub_98197C(session, imageId, 0, 0, 1, 32, 26, height, 27, 0, height + 16, get_current_rotation()); - wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_right(session, height, TUNNEL_6); break; } @@ -593,7 +593,7 @@ static void paint_river_rapids_track_left_quarter_turn_1_tile(paint_session * se break; } - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 32, 0x20); } @@ -649,7 +649,7 @@ static void paint_river_rapids_track_right_quarter_turn_1_tile(paint_session * s break; } - wooden_a_supports_paint_setup(session, 1 - (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, 1 - (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(session, height + 32, 0x20); } @@ -701,7 +701,7 @@ static void paint_river_rapids_track_waterfall(paint_session * session, uint8 ri sub_98199C(session, imageId, 0, 0, 32, 1, 27, height, 0, 27, height + 17, get_current_rotation()); } - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction & 1) { @@ -741,7 +741,7 @@ static void paint_river_rapids_track_rapids(paint_session * session, uint8 rideI sub_98197C(session, imageId, 0, 0, 32, 1, 11, height, 0, 27, height + 17, get_current_rotation()); } - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction & 1) { @@ -800,7 +800,7 @@ static void paint_river_rapids_track_whirlpool(paint_session * session, uint8 ri sub_98197C(session, imageId, 0, 0, 32, 1, 3, height, 0, 27, height + 17, get_current_rotation()); } - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction & 1) { @@ -862,5 +862,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_river_rapids(sint32 trackType, sin return paint_river_rapids_track_whirlpool; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/water/SplashBoats.cpp b/src/openrct2/ride/water/SplashBoats.cpp index 4b55c14c8d..4264161e9b 100644 --- a/src/openrct2/ride/water/SplashBoats.cpp +++ b/src/openrct2/ride/water/SplashBoats.cpp @@ -490,7 +490,7 @@ static void paint_splash_boats_track_25_deg_up(paint_session * session, uint8 ri sub_98197C_rotated(session, direction, frontImageId, 0, 0, 32, 1, 50, height, 0, 27, height); wooden_a_supports_paint_setup(session, (direction & 1), 9 + direction, height, session->TrackColours[SCHEME_SUPPORTS], - NULL); + nullptr); if (direction == 0 || direction == 3) { @@ -514,7 +514,7 @@ static void paint_splash_boats_track_60_deg_up(paint_session * session, uint8 ri sub_98197C_rotated(session, direction, frontImageId, 0, 0, 32, 1, 98, height, 0, 27, height); wooden_a_supports_paint_setup(session, (direction & 1), 21 + direction, height, session->TrackColours[SCHEME_SUPPORTS], - NULL); + nullptr); if (direction == 0 || direction == 3) { @@ -538,7 +538,7 @@ static void paint_splash_boats_track_flat_to_25_deg_up(paint_session * session, sub_98197C_rotated(session, direction, frontImageId, 0, 0, 32, 1, 42, height, 0, 27, height); wooden_a_supports_paint_setup(session, (direction & 1), 1 + direction, height, session->TrackColours[SCHEME_SUPPORTS], - NULL); + nullptr); if (direction == 0 || direction == 3) { @@ -562,7 +562,7 @@ static void paint_splash_boats_track_25_deg_up_to_flat(paint_session * session, sub_98197C_rotated(session, direction, frontImageId, 0, 0, 32, 1, 34, height, 0, 27, height); wooden_a_supports_paint_setup(session, (direction & 1), 5 + direction, height, session->TrackColours[SCHEME_SUPPORTS], - NULL); + nullptr); if (direction == 0 || direction == 3) { @@ -586,7 +586,7 @@ static void paint_splash_boats_track_25_deg_up_to_60_deg_up(paint_session * sess sub_98197C_rotated(session, direction, frontImageId, 0, 0, 32, 1, 66, height, 0, 27, height); wooden_a_supports_paint_setup(session, (direction & 1), 13 + direction, height, session->TrackColours[SCHEME_SUPPORTS], - NULL); + nullptr); if (direction == 0 || direction == 3) { @@ -610,7 +610,7 @@ static void paint_splash_boats_track_60_deg_up_to_25_deg_up(paint_session * sess sub_98197C_rotated(session, direction, frontImageId, 0, 0, 32, 1, 66, height, 0, 27, height); wooden_a_supports_paint_setup(session, (direction & 1), 17 + direction, height, session->TrackColours[SCHEME_SUPPORTS], - NULL); + nullptr); if (direction == 0 || direction == 3) { @@ -635,7 +635,7 @@ static void paint_splash_boats_track_25_deg_down(paint_session * session, uint8 static const uint8 specialSupport[] = { 11, 12, 9, 10 }; wooden_a_supports_paint_setup(session, (direction & 1), specialSupport[direction], height, - session->TrackColours[SCHEME_SUPPORTS], NULL); + session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction == 0 || direction == 3) { @@ -666,7 +666,7 @@ static void paint_splash_boats_track_flat_to_25_deg_down(paint_session * session static const uint8 specialSupport[] = { 7, 8, 5, 6 }; wooden_a_supports_paint_setup(session, (direction & 1), specialSupport[direction], height, - session->TrackColours[SCHEME_SUPPORTS], NULL); + session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction == 0 || direction == 3) { @@ -703,7 +703,7 @@ static void paint_splash_boats_track_25_deg_down_to_flat(paint_session * session static const uint8 specialSupport[] = { 3, 4, 1, 2 }; wooden_a_supports_paint_setup(session, (direction & 1), specialSupport[direction], height, - session->TrackColours[SCHEME_SUPPORTS], NULL); + session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction == 0 || direction == 3) { @@ -755,7 +755,7 @@ static void paint_splash_boats_track_flat(paint_session * session, uint8 rideInd sub_98197C(session, imageId, 0, 0, 32, 1, 26, height, 0, 27, height, get_current_rotation()); } - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); if (direction & 1) { @@ -795,7 +795,7 @@ static void paint_splash_boats_station(paint_session * session, uint8 rideIndex, sub_98196C(session, imageId, 0, 0, 32, 32, 1, height, get_current_rotation()); } - wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); track_paint_util_draw_station_platform(session, ride, direction, height, 7, tileElement); @@ -823,7 +823,7 @@ static void paint_splash_boats_track_left_quarter_turn_5_tiles(paint_session * s { 1, 0xFF, 4, 2, 0xFF, 4, 0 }, }; uint8 supportType = supportTypes[direction][trackSequence]; - wooden_a_supports_paint_setup(session, supportType, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, supportType, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); } switch (trackSequence) @@ -900,7 +900,7 @@ static void paint_splash_boats_track_right_quarter_turn_5_tiles(paint_session * { 1, 0xFF, 3, 5, 0xFF, 3, 0 }, }; uint8 supportType = supportTypes[direction][trackSequence]; - wooden_a_supports_paint_setup(session, supportType, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, supportType, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); } switch (trackSequence) @@ -993,7 +993,7 @@ static void paint_splash_boats_track_s_bend_left(paint_session * session, uint8 case 0: sub_98197C_rotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); break; case 1: @@ -1002,7 +1002,7 @@ static void paint_splash_boats_track_s_bend_left(paint_session * session, uint8 sub_98197C_rotated(session, direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27); wooden_a_supports_paint_setup(session, supportTypes1[direction], 0, height, session->TrackColours[SCHEME_SUPPORTS], - NULL); + nullptr); paint_util_set_segment_support_height( session, @@ -1015,7 +1015,7 @@ static void paint_splash_boats_track_s_bend_left(paint_session * session, uint8 sub_98197C_rotated(session, direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27); wooden_a_supports_paint_setup(session, supportTypes2[direction], 0, height, session->TrackColours[SCHEME_SUPPORTS], - NULL); + nullptr); paint_util_set_segment_support_height( session, @@ -1025,7 +1025,7 @@ static void paint_splash_boats_track_s_bend_left(paint_session * session, uint8 case 3: sub_98197C_rotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); break; } @@ -1083,7 +1083,7 @@ static void paint_splash_boats_track_s_bend_right(paint_session * session, uint8 case 0: sub_98197C_rotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); break; case 1: @@ -1092,7 +1092,7 @@ static void paint_splash_boats_track_s_bend_right(paint_session * session, uint8 sub_98197C_rotated(session, direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27); wooden_a_supports_paint_setup(session, supportTypes1[direction], 0, height, session->TrackColours[SCHEME_SUPPORTS], - NULL); + nullptr); paint_util_set_segment_support_height( session, @@ -1105,7 +1105,7 @@ static void paint_splash_boats_track_s_bend_right(paint_session * session, uint8 sub_98197C_rotated(session, direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27); wooden_a_supports_paint_setup(session, supportTypes2[direction], 0, height, session->TrackColours[SCHEME_SUPPORTS], - NULL); + nullptr); paint_util_set_segment_support_height( session, @@ -1115,7 +1115,7 @@ static void paint_splash_boats_track_s_bend_right(paint_session * session, uint8 case 3: sub_98197C_rotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(session, direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27); - wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], NULL); + wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); break; } @@ -1220,7 +1220,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_splash_boats(sint32 trackType, sin return paint_splash_boats_track_on_ride_photo; } - return NULL; + return nullptr; } #ifndef NO_VEHICLES diff --git a/src/openrct2/ride/water/SubmarineRide.cpp b/src/openrct2/ride/water/SubmarineRide.cpp index d5faa9388e..d6feb3266f 100644 --- a/src/openrct2/ride/water/SubmarineRide.cpp +++ b/src/openrct2/ride/water/SubmarineRide.cpp @@ -63,7 +63,7 @@ void vehicle_visual_submarine(paint_session * session, sint32 x, sint32 imageDir baseImage_id | (vehicle->colours.body_colour << 19) | (vehicle->colours.trim_colour << 24) | IMAGE_TYPE_REMAP_2_PLUS; paint_struct * ps = sub_98197C(session, image_id, 0, 0, bb.length_x, bb.length_y, bb.length_z, z, bb.offset_x, bb.offset_y, bb.offset_z + z, get_current_rotation()); - if (ps != NULL) + if (ps != nullptr) { ps->tertiary_colour = vehicle->colours_extended; } @@ -72,7 +72,7 @@ void vehicle_visual_submarine(paint_session * session, sint32 x, sint32 imageDir IMAGE_TYPE_REMAP_2_PLUS; ps = sub_98197C(session, image_id, 0, 0, bb.length_x, bb.length_y, 2, z, bb.offset_x, bb.offset_y, bb.offset_z + z - 10, get_current_rotation()); - if (ps != NULL) + if (ps != nullptr) { ps->tertiary_colour = vehicle->colours_extended; } @@ -228,5 +228,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_submarine_ride(sint32 trackType, s return submarine_ride_paint_track_right_quarter_turn_1_tile; } - return NULL; + return nullptr; } diff --git a/src/openrct2/ride/water/WaterCoaster.cpp b/src/openrct2/ride/water/WaterCoaster.cpp index 0cf18e0fb6..4368d49a4a 100644 --- a/src/openrct2/ride/water/WaterCoaster.cpp +++ b/src/openrct2/ride/water/WaterCoaster.cpp @@ -433,5 +433,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_water_rc(sint32 trackType, sint32 case TRACK_ELEM_RIGHT_QUARTER_TURN_5_TILES_COVERED: return get_track_paint_function_splash_boats(TRACK_ELEM_RIGHT_QUARTER_TURN_5_TILES, direction); } - return NULL; + return nullptr; } diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index cf018f29d0..dfe2767bbf 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -137,19 +137,19 @@ void scenario_begin() } else { rct_stex_entry* stex = g_stexEntries[0]; - if (stex != NULL) { + if (stex != nullptr) { char *buffer = gCommonStringFormatBuffer; // Set localised park name - format_string(buffer, 256, stex->park_name, 0); + format_string(buffer, 256, stex->park_name, nullptr); park_set_name(buffer); // Set localised scenario name - format_string(buffer, 256, stex->scenario_name, 0); + format_string(buffer, 256, stex->scenario_name, nullptr); safe_strcpy(gScenarioName, buffer, 64); // Set localised scenario details - format_string(buffer, 256, stex->details, 0); + format_string(buffer, 256, stex->details, nullptr); safe_strcpy(gScenarioDetails, buffer, 256); } } @@ -223,7 +223,7 @@ void scenario_success() gScenarioCompletedCompanyValue = companyValue; peep_applause(); - if (scenario_repository_try_record_highscore(gScenarioFileName, companyValue, NULL)) + if (scenario_repository_try_record_highscore(gScenarioFileName, companyValue, nullptr)) { // Allow name entry gParkFlags |= PARK_FLAGS_SCENARIO_COMPLETE_NAME_INPUT; @@ -335,7 +335,7 @@ static void scenario_week_update() rct_water_type* water_type = (rct_water_type*)object_entry_groups[OBJECT_TYPE_WATER].chunks[0]; - if (month <= MONTH_APRIL && water_type != NULL && water_type->flags & WATER_FLAGS_ALLOW_DUCKS) { + if (month <= MONTH_APRIL && water_type != nullptr && water_type->flags & WATER_FLAGS_ALLOW_DUCKS) { // 100 attempts at finding some water to create a few ducks at for (sint32 i = 0; i < 100; i++) { if (scenario_create_ducks()) @@ -582,7 +582,7 @@ static bool scenario_prepare_rides_for_save() // If there are more than 5 roller coasters, only mark the first five. if (isFiveCoasterObjective && - rideEntry != NULL && + rideEntry != nullptr && (ride_entry_has_category(rideEntry, RIDE_CATEGORY_ROLLERCOASTER) && rcs < 5)) { @@ -615,7 +615,7 @@ static bool scenario_prepare_rides_for_save() ride = get_ride(track_element_get_ride_index(it.element)); // In the previous step, this flag was set on the first five roller coasters. - if (ride != NULL && ride->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE_TRACK) + if (ride != nullptr && ride->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE_TRACK) { markTrackAsIndestructible = true; } @@ -645,9 +645,9 @@ bool scenario_prepare_for_save() gS6Info.entry.flags = 255; rct_stex_entry* stex = g_stexEntries[0]; - if (stex != NULL) { + if (stex != nullptr) { char buffer[256]; - format_string(buffer, 256, stex->scenario_name, NULL); + format_string(buffer, 256, stex->scenario_name, nullptr); safe_strcpy(gS6Info.name, buffer, sizeof(gS6Info.name)); memcpy(&gS6Info.entry, &object_entry_groups[OBJECT_TYPE_SCENARIO_TEXT].entries[0], sizeof(rct_object_entry)); @@ -776,11 +776,11 @@ static void scenario_objective_check_10_rollercoasters() FOR_ALL_RIDES(i, ride) { uint8 subtype_id = ride->subtype; rct_ride_entry *rideEntry = get_ride_entry(subtype_id); - if (rideEntry == NULL) { + if (rideEntry == nullptr) { continue; } - if (rideEntry != NULL && + if (rideEntry != nullptr && ride_entry_has_category(rideEntry, RIDE_CATEGORY_ROLLERCOASTER) && ride->status == RIDE_STATUS_OPEN && ride->excitement >= RIDE_RATING(6,00) && type_already_counted[subtype_id] == 0){ @@ -857,7 +857,7 @@ static void scenario_objective_check_10_rollercoasters_length() FOR_ALL_RIDES(i, ride) { uint8 subtype_id = ride->subtype; rct_ride_entry *rideEntry = get_ride_entry(subtype_id); - if (rideEntry == NULL) { + if (rideEntry == nullptr) { continue; } if (ride_entry_has_category(rideEntry, RIDE_CATEGORY_ROLLERCOASTER) && @@ -887,7 +887,7 @@ static void scenario_objective_check_finish_5_rollercoasters() FOR_ALL_RIDES(i, ride) { const rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); - if (rideEntry == NULL) + if (rideEntry == nullptr) { continue; } diff --git a/src/openrct2/util/Util.cpp b/src/openrct2/util/Util.cpp index b9833465a5..fa7f704976 100644 --- a/src/openrct2/util/Util.cpp +++ b/src/openrct2/util/Util.cpp @@ -71,8 +71,8 @@ utf8 *path_get_directory(const utf8 *path) filename = filename < filename_posix ? filename_posix : filename; // If the path is invalid (e.g. just a file name), return NULL - if (filename == NULL) { - return NULL; + if (filename == nullptr) { + return nullptr; } char *directory = _strdup(path); @@ -89,7 +89,7 @@ const char *path_get_filename(const utf8 *path) filename = filename < filename_posix ? filename_posix : filename; // Checks if the path is valid (e.g. not just a file name) - if (filename == NULL) + if (filename == nullptr) { // Return the input string to keep things working return path; @@ -112,7 +112,7 @@ const char *path_get_extension(const utf8 *path) char * extension = (char *)strrchr(filename, '.'); // When no dot was found, return a pointer to the null-terminator - if (extension == NULL) + if (extension == nullptr) extension = (char *)strrchr(filename, '\0'); return extension; @@ -141,7 +141,7 @@ void path_remove_extension(utf8 *path) { // Find last dot in filename, and replace it with a null-terminator char * lastDot = (char *)strrchr(path_get_filename(path), '.'); - if (lastDot != NULL) + if (lastDot != nullptr) *lastDot = '\0'; else log_warning("No extension found. (path = %s)", path); @@ -471,7 +471,7 @@ bool utf8_is_bom(const char *str) bool str_is_null_or_empty(const char *str) { - return str == NULL || str[0] == 0; + return str == nullptr || str[0] == 0; } void util_srand(sint32 source) { @@ -516,11 +516,11 @@ uint8 *util_zlib_inflate(uint8 *data, size_t data_in_size, size_t *data_out_size } else if (ret == Z_STREAM_ERROR) { log_error("Your build is shipped with broken zlib. Please use the official build."); free(buffer); - return NULL; + return nullptr; } else if (ret < 0) { log_error("Error uncompressing data."); free(buffer); - return NULL; + return nullptr; } ret = uncompress(buffer, &out_size, data, (uLong)data_in_size); } while (ret != Z_OK); @@ -552,7 +552,7 @@ uint8 *util_zlib_deflate(const uint8 *data, size_t data_in_size, size_t *data_ou } else if (ret == Z_STREAM_ERROR) { log_error("Your build is shipped with broken zlib. Please use the official build."); free(buffer); - return NULL; + return nullptr; } ret = compress(buffer, &out_size, data, (uLong)data_in_size); } while (ret != Z_OK); diff --git a/src/openrct2/world/Entrance.cpp b/src/openrct2/world/Entrance.cpp index 1499a6d996..701d55f507 100644 --- a/src/openrct2/world/Entrance.cpp +++ b/src/openrct2/world/Entrance.cpp @@ -695,7 +695,7 @@ extern "C" if (map_get_park_entrance_element_at( entrance.x, entrance.y, - entrance.z >> 3, false) == NULL) + entrance.z >> 3, false) == nullptr) { entrance.x = LOCATION_NULL; } diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index 28bde1da2c..9a5f10ef2e 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -181,7 +181,7 @@ void tile_element_iterator_begin(tile_element_iterator *it) sint32 tile_element_iterator_next(tile_element_iterator *it) { - if (it->element == NULL) { + if (it->element == nullptr) { it->element = map_get_first_element_at(it->x, it->y); return 1; } @@ -209,14 +209,14 @@ sint32 tile_element_iterator_next(tile_element_iterator *it) void tile_element_iterator_restart_for_tile(tile_element_iterator *it) { - it->element = NULL; + it->element = nullptr; } rct_tile_element *map_get_first_element_at(sint32 x, sint32 y) { if (x < 0 || y < 0 || x > (MAXIMUM_MAP_SIZE_TECHNICAL - 1) || y > (MAXIMUM_MAP_SIZE_TECHNICAL - 1)) { log_error("Trying to access element outside of range"); - return NULL; + return nullptr; } return gTileElementTilePointers[x + y * MAXIMUM_MAP_SIZE_TECHNICAL]; } @@ -224,8 +224,8 @@ rct_tile_element *map_get_first_element_at(sint32 x, sint32 y) rct_tile_element *map_get_nth_element_at(sint32 x, sint32 y, sint32 n) { rct_tile_element * tileElement = map_get_first_element_at(x, y); - if (tileElement == NULL) { - return NULL; + if (tileElement == nullptr) { + return nullptr; } // Iterate through elements on this tile. This has to be walked, rather than // jumped directly to, because n may exceed element count for given tile, @@ -241,7 +241,7 @@ rct_tile_element *map_get_nth_element_at(sint32 x, sint32 y, sint32 n) n--; } // The element sought for is not within given tile. - return NULL; + return nullptr; } void map_set_tile_elements(sint32 x, sint32 y, rct_tile_element *elements) @@ -329,13 +329,13 @@ rct_tile_element *map_get_surface_element_at(sint32 x, sint32 y) { rct_tile_element *tileElement = map_get_first_element_at(x, y); - if (tileElement == NULL) - return NULL; + if (tileElement == nullptr) + return nullptr; // Find the first surface element while (tile_element_get_type(tileElement) != TILE_ELEMENT_TYPE_SURFACE) { if (tile_element_is_last_for_tile(tileElement)) - return NULL; + return nullptr; tileElement++; } @@ -346,8 +346,8 @@ rct_tile_element *map_get_surface_element_at(sint32 x, sint32 y) rct_tile_element* map_get_path_element_at(sint32 x, sint32 y, sint32 z){ rct_tile_element *tileElement = map_get_first_element_at(x, y); - if (tileElement == NULL) - return NULL; + if (tileElement == nullptr) + return nullptr; // Find the path element at known z do { @@ -361,14 +361,14 @@ rct_tile_element* map_get_path_element_at(sint32 x, sint32 y, sint32 z){ return tileElement; } while (!tile_element_is_last_for_tile(tileElement++)); - return NULL; + return nullptr; } rct_tile_element* map_get_banner_element_at(sint32 x, sint32 y, sint32 z, uint8 position) { rct_tile_element *tileElement = map_get_first_element_at(x, y); - if (tileElement == NULL) - return NULL; + if (tileElement == nullptr) + return nullptr; // Find the banner element at known z and position do { @@ -382,7 +382,7 @@ rct_tile_element* map_get_banner_element_at(sint32 x, sint32 y, sint32 z, uint8 return tileElement; } while (!tile_element_is_last_for_tile(tileElement++)); - return NULL; + return nullptr; } /** @@ -442,7 +442,7 @@ void map_count_remaining_land_rights() { rct_tile_element *element = map_get_surface_element_at(x, y); // Surface elements are sometimes hacked out to save some space for other map elements - if (element == NULL) + if (element == nullptr) { continue; } @@ -530,7 +530,7 @@ sint32 tile_element_height(sint32 x, sint32 y) // Get the surface element for the tile tileElement = map_get_surface_element_at(x_tile / 32, y_tile / 32); - if (tileElement == NULL) { + if (tileElement == nullptr) { return 16; } @@ -825,7 +825,7 @@ bool map_is_location_owned(sint32 x, sint32 y, sint32 z) // This check is to avoid throwing lots of messages in logs. if (map_is_location_valid(x, y)) { rct_tile_element *tileElement = map_get_surface_element_at(x / 32, y / 32); - if (tileElement != NULL) { + if (tileElement != nullptr) { if (tileElement->properties.surface.ownership & OWNERSHIP_OWNED) return true; @@ -849,7 +849,7 @@ bool map_is_location_in_park(sint32 x, sint32 y) { if (map_is_location_valid(x, y)) { rct_tile_element *tileElement = map_get_surface_element_at(x / 32, y / 32); - if (tileElement == NULL) + if (tileElement == nullptr) return false; if (tileElement->properties.surface.ownership & OWNERSHIP_OWNED) return true; @@ -863,7 +863,7 @@ bool map_is_location_owned_or_has_rights(sint32 x, sint32 y) { if (map_is_location_valid(x, y)) { rct_tile_element *tileElement = map_get_surface_element_at(x / 32, y / 32); - if (tileElement == NULL) { + if (tileElement == nullptr) { return false; } if (tileElement->properties.surface.ownership & OWNERSHIP_OWNED) return true; @@ -898,7 +898,7 @@ void game_command_remove_large_scenery(sint32* eax, sint32* ebx, sint32* ecx, si bool element_found = false; rct_tile_element* tile_element = map_get_first_element_at(x / 32, y / 32); - if (tile_element == NULL) + if (tile_element == nullptr) { log_warning("Invalid game command for scenery removal, x = %d, y = %d", x, y); *ebx = MONEY32_UNDEFINED; @@ -1046,7 +1046,7 @@ void game_command_set_large_scenery_colour(sint32* eax, sint32* ebx, sint32* ecx rct_tile_element *tile_element = map_get_large_scenery_segment(x, y, base_height, tile_element_direction, tileIndex); - if(tile_element == NULL){ + if(tile_element == nullptr){ *ebx = 0; return; } @@ -1597,10 +1597,10 @@ static money32 map_set_land_height(sint32 flags, sint32 x, sint32 y, sint32 heig { sint32 rideIndex = track_element_get_ride_index(tileElement); Ride * ride = get_ride(rideIndex); - if (ride != NULL) + if (ride != nullptr) { rct_ride_entry * rideEntry = get_ride_entry_by_ride(ride); - if (rideEntry != NULL) + if (rideEntry != nullptr) { sint32 maxHeight = rideEntry->max_height; if (maxHeight == 0) @@ -1655,7 +1655,7 @@ static money32 map_set_land_height(sint32 flags, sint32 x, sint32 y, sint32 heig } if (!gCheatsDisableClearanceChecks) { - if (!map_can_construct_with_clear_at(x, y, height, zCorner, &map_set_land_height_clear_func, 0xF, 0, NULL, CREATE_CROSSING_MODE_NONE)) { + if (!map_can_construct_with_clear_at(x, y, height, zCorner, &map_set_land_height_clear_func, 0xF, 0, nullptr, CREATE_CROSSING_MODE_NONE)) { return MONEY32_UNDEFINED; } } @@ -1794,7 +1794,7 @@ static uint8 map_get_lowest_land_height(sint32 xMin, sint32 xMax, sint32 yMin, s for (sint32 yi = yMin; yi <= yMax; yi += 32) { for (sint32 xi = xMin; xi <= xMax; xi += 32) { rct_tile_element *tile_element = map_get_surface_element_at(xi / 32, yi / 32); - if (tile_element != NULL && min_height > tile_element->base_height) { + if (tile_element != nullptr && min_height > tile_element->base_height) { min_height = tile_element->base_height; } } @@ -1813,7 +1813,7 @@ static uint8 map_get_highest_land_height(sint32 xMin, sint32 xMax, sint32 yMin, for (sint32 yi = yMin; yi <= yMax; yi += 32) { for (sint32 xi = xMin; xi <= xMax; xi += 32) { rct_tile_element *tile_element = map_get_surface_element_at(xi / 32, yi / 32); - if (tile_element != NULL) { + if (tile_element != nullptr) { uint8 base_height = tile_element->base_height; if (tile_element->properties.surface.slope & TILE_ELEMENT_SLOPE_ALL_CORNERS_UP) base_height += 2; @@ -1846,7 +1846,7 @@ static money32 raise_land(sint32 flags, sint32 x, sint32 y, sint32 z, sint32 ax, for (sint32 yi = ay; yi <= by; yi += 32) { for (sint32 xi = ax; xi <= bx; xi += 32) { rct_tile_element *tile_element = map_get_surface_element_at(xi / 32, yi / 32); - if (tile_element != NULL) { + if (tile_element != nullptr) { uint8 height = tile_element->base_height; if (height <= min_height){ uint8 newStyle = tile_element_raise_styles[selectionType][tile_element->properties.surface.slope & TILE_ELEMENT_SURFACE_SLOPE_MASK]; @@ -1893,7 +1893,7 @@ static money32 lower_land(sint32 flags, sint32 x, sint32 y, sint32 z, sint32 ax, for (sint32 yi = ay; yi <= by; yi += 32) { for (sint32 xi = ax; xi <= bx; xi += 32) { rct_tile_element *tile_element = map_get_surface_element_at(xi / 32, yi / 32); - if (tile_element != NULL) { + if (tile_element != nullptr) { uint8 height = tile_element->base_height; if (tile_element->properties.surface.slope & TILE_ELEMENT_SLOPE_ALL_CORNERS_UP) height += 2; @@ -1946,7 +1946,7 @@ money32 raise_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) for (sint32 yi = y0; yi <= y1; yi += 32) { for (sint32 xi = x0; xi <= x1; xi += 32) { rct_tile_element* tile_element = map_get_surface_element_at(xi / 32, yi / 32); - if (tile_element != NULL) { + if (tile_element != nullptr) { uint8 height = tile_element->base_height; if (map_get_water_height(tile_element) > 0) height = map_get_water_height(tile_element) * 2; @@ -1959,7 +1959,7 @@ money32 raise_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) for (sint32 yi = y0; yi <= y1; yi += 32) { for (sint32 xi = x0; xi <= x1; xi += 32) { rct_tile_element* tile_element = map_get_surface_element_at(xi / 32, yi / 32); - if (tile_element != NULL) { + if (tile_element != nullptr) { if (tile_element->base_height <= max_height){ uint8 height = map_get_water_height(tile_element); if (height != 0) { @@ -2027,7 +2027,7 @@ money32 lower_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) for (sint32 yi = y0; yi <= y1; yi += 32){ for (sint32 xi = x0; xi <= x1; xi += 32){ rct_tile_element* tile_element = map_get_surface_element_at(xi / 32, yi / 32); - if (tile_element != NULL) { + if (tile_element != nullptr) { uint8 height = map_get_water_height(tile_element); if (height != 0) { height *= 2; @@ -2041,7 +2041,7 @@ money32 lower_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) for (sint32 yi = y0; yi <= y1; yi += 32) { for (sint32 xi = x0; xi <= x1; xi += 32) { rct_tile_element* tile_element = map_get_surface_element_at(xi / 32, yi / 32); - if (tile_element != NULL) { + if (tile_element != nullptr) { uint8 height = map_get_water_height(tile_element); if (height != 0) { height *= 2; @@ -2161,7 +2161,7 @@ static money32 smooth_land_row_by_edge(sint32 flags, sint32 x, sint32 y, sint32 } tileElement = map_get_surface_element_at(x >> 5, y >> 5); nextTileElement = map_get_surface_element_at((x + stepX) >> 5, (y + stepY) >> 5); - if (tileElement == NULL || nextTileElement == NULL) { + if (tileElement == nullptr || nextTileElement == nullptr) { return 0; } if (tile_element_get_corner_height(tileElement, checkDirection1) != expectedLandHeight1 + (raiseLand ? -2 : 2)) { @@ -2190,7 +2190,7 @@ static money32 smooth_land_row_by_edge(sint32 flags, sint32 x, sint32 y, sint32 { tileElement = nextTileElement; nextTileElement = map_get_surface_element_at((x + stepX) >> 5, (y + stepY) >> 5); - if (nextTileElement == NULL) { + if (nextTileElement == nullptr) { shouldContinue &= ~0x3; } if (tile_element_get_corner_height(tileElement, direction1) + landChangePerTile != tile_element_get_corner_height(tileElement, checkDirection1)) { @@ -2281,7 +2281,7 @@ static money32 smooth_land_row_by_corner(sint32 flags, sint32 x, sint32 y, sint3 } tileElement = map_get_surface_element_at(x >> 5, y >> 5); nextTileElement = map_get_surface_element_at((x + stepX) >> 5, (y + stepY) >> 5); - if (tileElement == NULL || nextTileElement == NULL) { + if (tileElement == nullptr || nextTileElement == nullptr) { return 0; } if (tile_element_get_corner_height(tileElement, checkDirection) != expectedLandHeight + (raiseLand ? -2 : 2)) { @@ -2303,7 +2303,7 @@ static money32 smooth_land_row_by_corner(sint32 flags, sint32 x, sint32 y, sint3 { tileElement = nextTileElement; nextTileElement = map_get_surface_element_at((x + stepX) >> 5, (y + stepY) >> 5); - if (nextTileElement == NULL) { + if (nextTileElement == nullptr) { shouldContinue = false; } if (tile_element_get_corner_height(tileElement, direction) + landChangePerTile != tile_element_get_corner_height(tileElement, checkDirection)) { @@ -2352,7 +2352,7 @@ static money32 smooth_land(sint32 flags, sint32 centreX, sint32 centreY, sint32 money32 result; rct_tile_element *tileElement = map_get_surface_element_at(mapLeft >> 5, mapTop >> 5); - if (tileElement == NULL) + if (tileElement == nullptr) { log_warning("Invalid coordinates for land smoothing, x = %d, y = %d", mapLeft, mapTop); return MONEY32_UNDEFINED; @@ -2705,7 +2705,7 @@ void game_command_place_large_scenery(sint32* eax, sint32* ebx, sint32* ecx, sin } rct_scenery_entry *scenery_entry = get_large_scenery_entry(entry_index); - if (scenery_entry == NULL) + if (scenery_entry == nullptr) { log_warning("Invalid game command for scenery placement, entry_index = %u", entry_index); *ebx = MONEY32_UNDEFINED; @@ -2756,7 +2756,7 @@ void game_command_place_large_scenery(sint32* eax, sint32* ebx, sint32* ecx, sin } rct_tile_element * tile_element = map_get_surface_element_at(curTile.x / 32, curTile.y / 32); - if(tile_element != NULL) + if(tile_element != nullptr) { sint32 height = tile_element->base_height * 8; sint32 slope = tile_element->properties.surface.slope; @@ -3049,7 +3049,7 @@ void map_reorganise_elements() rct_tile_element* new_tile_elements = (rct_tile_element *)malloc(3 * (MAXIMUM_MAP_SIZE_TECHNICAL * MAXIMUM_MAP_SIZE_TECHNICAL) * sizeof(rct_tile_element)); rct_tile_element* new_elements_pointer = new_tile_elements; - if (new_tile_elements == NULL) { + if (new_tile_elements == nullptr) { log_fatal("Unable to allocate memory for map elements."); return; } @@ -3114,7 +3114,7 @@ rct_tile_element *tile_element_insert(sint32 x, sint32 y, sint32 z, sint32 flags if (!map_check_free_elements_and_reorganise(1)) { log_error("Cannot insert new element"); - return NULL; + return nullptr; } newTileElement = gNextFreeTileElement; @@ -3333,7 +3333,7 @@ sint32 map_can_construct_with_clear_at(sint32 x, sint32 y, sint32 zLow, sint32 z continue; } loc_68BABC: - if (clearFunc != NULL) { + if (clearFunc != nullptr) { if (!clearFunc(&tile_element, x, y, flags, price)) { continue; } @@ -3364,19 +3364,19 @@ sint32 map_can_construct_with_clear_at(sint32 x, sint32 y, sint32 zLow, sint32 z } - if (tile_element != NULL) + if (tile_element != nullptr) { map_obstruction_set_error_text(tile_element); } return false; loc_68BAE6: - if (clearFunc != NULL) { + if (clearFunc != nullptr) { if (!clearFunc(&tile_element, x, y, flags, price)) { goto loc_68B9B7; } } - if (tile_element != NULL) { + if (tile_element != nullptr) { gGameCommandErrorText = STR_CANNOT_BUILD_PARTLY_ABOVE_AND_PARTLY_BELOW_WATER; } return false; @@ -3392,7 +3392,7 @@ sint32 map_can_construct_with_clear_at(sint32 x, sint32 y, sint32 zLow, sint32 z */ sint32 map_can_construct_at(sint32 x, sint32 y, sint32 zLow, sint32 zHigh, uint8 bl) { - return gCheatsDisableClearanceChecks || map_can_construct_with_clear_at(x, y, zLow, zHigh, NULL, bl, 0, NULL, CREATE_CROSSING_MODE_NONE); + return gCheatsDisableClearanceChecks || map_can_construct_with_clear_at(x, y, zLow, zHigh, nullptr, bl, 0, nullptr, CREATE_CROSSING_MODE_NONE); } /** @@ -3420,7 +3420,7 @@ void map_update_tiles() } rct_tile_element *tileElement = map_get_surface_element_at(x, y); - if (tileElement != NULL) { + if (tileElement != nullptr) { map_update_grass_length(x * 32, y * 32, tileElement); scenery_update_tile(x * 32, y * 32); } @@ -3518,7 +3518,7 @@ void map_remove_provisional_elements() footpath_provisional_remove(); gFootpathProvisionalFlags |= PROVISIONAL_PATH_FLAG_1; } - if (window_find_by_class(WC_RIDE_CONSTRUCTION ) != NULL) + if (window_find_by_class(WC_RIDE_CONSTRUCTION ) != nullptr) { ride_remove_provisional_track_piece(); ride_entrance_exit_remove_ghost(); @@ -3536,7 +3536,7 @@ void map_restore_provisional_elements() gFootpathProvisionalPosition.z, gFootpathProvisionalSlope); } - if (window_find_by_class(WC_RIDE_CONSTRUCTION) != NULL) + if (window_find_by_class(WC_RIDE_CONSTRUCTION) != nullptr) { ride_restore_provisional_track_piece(); ride_entrance_exit_place_provisional_ghost(); @@ -3556,7 +3556,7 @@ sint32 tile_element_get_banner_index(rct_tile_element *tileElement) return scenery_large_get_banner_id(tileElement); case TILE_ELEMENT_TYPE_WALL: sceneryEntry = get_wall_entry(tileElement->properties.wall.type); - if (sceneryEntry == NULL || sceneryEntry->wall.scrolling_mode == 0xFF) + if (sceneryEntry == nullptr || sceneryEntry->wall.scrolling_mode == 0xFF) return -1; return tileElement->properties.wall.banner_index; @@ -3775,7 +3775,7 @@ sint32 map_get_highest_z(sint32 tileX, sint32 tileY) sint32 z; tileElement = map_get_surface_element_at(tileX, tileY); - if (tileElement == NULL) + if (tileElement == nullptr) return -1; z = tileElement->base_height * 8; @@ -3803,9 +3803,9 @@ bool tile_element_is_underground(rct_tile_element *tileElement) rct_tile_element *map_get_large_scenery_segment(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 sequence) { rct_tile_element *tileElement = map_get_first_element_at(x >> 5, y >> 5); - if (tileElement == NULL) + if (tileElement == nullptr) { - return NULL; + return nullptr; } do { if (tile_element_get_type(tileElement) != TILE_ELEMENT_TYPE_LARGE_SCENERY) @@ -3819,13 +3819,13 @@ rct_tile_element *map_get_large_scenery_segment(sint32 x, sint32 y, sint32 z, si return tileElement; } while (!tile_element_is_last_for_tile(tileElement++)); - return NULL; + return nullptr; } rct_tile_element * map_get_park_entrance_element_at(sint32 x, sint32 y, sint32 z, bool ghost) { rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); - if (tileElement != NULL) + if (tileElement != nullptr) { do { @@ -3845,13 +3845,13 @@ rct_tile_element * map_get_park_entrance_element_at(sint32 x, sint32 y, sint32 z } while (!tile_element_is_last_for_tile(tileElement++)); } - return NULL; + return nullptr; } rct_tile_element * map_get_ride_entrance_element_at(sint32 x, sint32 y, sint32 z, bool ghost) { rct_tile_element * tileElement = map_get_first_element_at(x >> 5, y >> 5); - if (tileElement != NULL) + if (tileElement != nullptr) { do { @@ -3871,13 +3871,13 @@ rct_tile_element * map_get_ride_entrance_element_at(sint32 x, sint32 y, sint32 z } while (!tile_element_is_last_for_tile(tileElement++)); } - return NULL; + return nullptr; } rct_tile_element * map_get_ride_exit_element_at(sint32 x, sint32 y, sint32 z, bool ghost) { rct_tile_element * tileElement = map_get_first_element_at(x >> 5, y >> 5); - if (tileElement != NULL) + if (tileElement != nullptr) { do { @@ -3897,13 +3897,13 @@ rct_tile_element * map_get_ride_exit_element_at(sint32 x, sint32 y, sint32 z, bo } while (!tile_element_is_last_for_tile(tileElement++)); } - return NULL; + return nullptr; } rct_tile_element *map_get_small_scenery_element_at(sint32 x, sint32 y, sint32 z, sint32 type, uint8 quadrant) { rct_tile_element *tileElement = map_get_first_element_at(x >> 5, y >> 5); - if (tileElement != NULL) + if (tileElement != nullptr) { do { @@ -3920,7 +3920,7 @@ rct_tile_element *map_get_small_scenery_element_at(sint32 x, sint32 y, sint32 z, } while (!tile_element_is_last_for_tile(tileElement++)); } - return NULL; + return nullptr; } bool map_large_scenery_get_origin( @@ -3933,7 +3933,7 @@ bool map_large_scenery_get_origin( sint16 offsetX, offsetY; tileElement = map_get_large_scenery_segment(x, y, z, direction, sequence); - if (tileElement == NULL) + if (tileElement == nullptr) return false; sceneryEntry = get_large_scenery_entry(scenery_large_get_type(tileElement)); @@ -3946,7 +3946,7 @@ bool map_large_scenery_get_origin( *outX = x - offsetX; *outY = y - offsetY; *outZ = (z * 8) - tile->z_offset; - if (outElement != NULL) + if (outElement != nullptr) *outElement = tileElement; return true; } @@ -3981,7 +3981,7 @@ bool sign_set_colour(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 sequ y = y0 + offsetY; z = (z0 + tile->z_offset) / 8; tileElement = map_get_large_scenery_segment(x, y, z, direction, sequence); - if (tileElement != NULL) + if (tileElement != nullptr) { scenery_large_set_primary_colour(tileElement, mainColour); scenery_large_set_secondary_colour(tileElement, textColour); @@ -4140,7 +4140,7 @@ bool map_surface_is_blocked(sint16 x, sint16 y){ tileElement = map_get_surface_element_at(x / 32, y / 32); - if (tileElement == NULL) { + if (tileElement == nullptr) { return true; } @@ -4169,7 +4169,7 @@ bool map_surface_is_blocked(sint16 x, sint16 y){ return true; rct_scenery_entry* scenery = get_small_scenery_entry(tileElement->properties.scenery.type); - if (scenery == NULL) + if (scenery == nullptr) { return false; } @@ -4304,7 +4304,7 @@ void game_command_set_sign_style(sint32* eax, sint32* ebx, sint32* ecx, sint32* map_invalidate_tile(x, y, tile_element->base_height * 8, tile_element->clearance_height * 8); } else { // large sign rct_tile_element *tileElement = banner_get_tile_element(bannerId); - if (tileElement == NULL || tile_element_get_type(tileElement) != TILE_ELEMENT_TYPE_LARGE_SCENERY) { + if (tileElement == nullptr || tile_element_get_type(tileElement) != TILE_ELEMENT_TYPE_LARGE_SCENERY) { gGameCommandErrorText = STR_ERR_CANT_SET_BANNER_TEXT; *ebx = MONEY32_UNDEFINED; return; @@ -4507,7 +4507,7 @@ rct_tile_element *map_get_track_element_at(sint32 x, sint32 y, sint32 z) return tileElement; } while (!tile_element_is_last_for_tile(tileElement++)); - return NULL; + return nullptr; } /** @@ -4528,7 +4528,7 @@ rct_tile_element *map_get_track_element_at_of_type(sint32 x, sint32 y, sint32 z, return tileElement; } while (!tile_element_is_last_for_tile(tileElement++)); - return NULL; + return nullptr; } /** @@ -4543,7 +4543,7 @@ rct_tile_element *map_get_track_element_at_of_type_seq(sint32 x, sint32 y, sint3 { rct_tile_element *tileElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (tileElement == NULL) break; + if (tileElement == nullptr) break; if (tile_element_get_type(tileElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (tileElement->base_height != z) continue; if (track_element_get_type(tileElement) != trackType) continue; @@ -4552,7 +4552,7 @@ rct_tile_element *map_get_track_element_at_of_type_seq(sint32 x, sint32 y, sint3 return tileElement; } while (!tile_element_is_last_for_tile(tileElement++)); - return NULL; + return nullptr; } /** @@ -4574,7 +4574,7 @@ rct_tile_element *map_get_track_element_at_of_type_from_ride(sint32 x, sint32 y, return tileElement; } while (!tile_element_is_last_for_tile(tileElement++)); - return NULL; + return nullptr; }; /** @@ -4594,7 +4594,7 @@ rct_tile_element *map_get_track_element_at_from_ride(sint32 x, sint32 y, sint32 return tileElement; } while (!tile_element_is_last_for_tile(tileElement++)); - return NULL; + return nullptr; }; /** @@ -4617,7 +4617,7 @@ rct_tile_element *map_get_track_element_at_with_direction_from_ride(sint32 x, si return tileElement; } while (!tile_element_is_last_for_tile(tileElement++)); - return NULL; + return nullptr; }; void map_offset_with_rotation(sint16 *x, sint16 *y, sint16 offsetX, sint16 offsetY, uint8 rotation) @@ -4655,7 +4655,7 @@ rct_tile_element *map_get_wall_element_at(sint32 x, sint32 y, sint32 z, sint32 d return tileElement; } while (!tile_element_is_last_for_tile(tileElement++)); - return NULL; + return nullptr; } uint32 map_get_available_peep_spawn_index_list(uint32* peepSpawnIndexList) @@ -4675,7 +4675,7 @@ uint16 check_max_allowable_land_rights_for_tile(uint8 x, uint8 y, uint8 base_z) uint16 destOwnership = OWNERSHIP_OWNED; // Sometimes done deliberately. - if (tileElement == NULL) + if (tileElement == nullptr) { return OWNERSHIP_OWNED; } diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index 66917402d3..a7f72636a6 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -141,7 +141,7 @@ void park_init() award_reset(); gS6Info.name[0] = '\0'; - format_string(gS6Info.details, 256, STR_NO_DETAILS_YET, NULL); + format_string(gS6Info.details, 256, STR_NO_DETAILS_YET, nullptr); } /** @@ -482,13 +482,13 @@ static uint32 get_random_peep_spawn_index() rct_peep *park_generate_new_guest() { - rct_peep *peep = NULL; + rct_peep *peep = nullptr; rct2_peep_spawn spawn = gPeepSpawns[get_random_peep_spawn_index()]; if (spawn.x != 0xFFFF) { spawn.direction ^= 2; peep = peep_generate(spawn.x, spawn.y, spawn.z * 16); - if (peep != NULL) { + if (peep != nullptr) { peep->sprite_direction = spawn.direction << 3; // Get the centre point of the tile the peep is on @@ -509,7 +509,7 @@ rct_peep *park_generate_new_guest() static rct_peep *park_generate_new_guest_due_to_campaign(sint32 campaign) { rct_peep *peep = park_generate_new_guest(); - if (peep != NULL) + if (peep != nullptr) marketing_set_guest_campaign(peep, campaign); return peep; } @@ -703,7 +703,7 @@ void update_park_fences(sint32 x, sint32 y) return; rct_tile_element* sufaceElement = map_get_surface_element_at(x / 32, y / 32); - if (sufaceElement == NULL)return; + if (sufaceElement == nullptr)return; uint8 newOwnership = sufaceElement->properties.surface.ownership & 0xF0; if ((sufaceElement->properties.surface.ownership & OWNERSHIP_OWNED) == 0) { @@ -858,7 +858,7 @@ void game_command_set_park_name(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *e static money32 map_buy_land_rights_for_tile(sint32 x, sint32 y, sint32 setting, sint32 flags) { rct_tile_element* surfaceElement = map_get_surface_element_at(x / 32, y / 32); - if (surfaceElement == NULL) + if (surfaceElement == nullptr) return MONEY32_UNDEFINED; switch (setting) {