mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-30 18:25:16 +01:00
Code Issues Releases Wiki Activity

Use nullptr where possible

Browse Source
This commit is contained in:
Michał Janiszewski
2018-01-04 06:58:44 +01:00
committed by GitHub
parent 56ab7e9c09
commit b2bc974fe7
110 changed files with 2602 additions and 2602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/ride/thrill/MotionSimulator.cpp
View File

@@ -44,7 +44,7 @@ static void paint_motionsimulator_vehicle(paint_session * session, sint8 offsetX
rct_tile_element * savedTileElement = static_cast<rct_tile_element *>(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;
}