mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename variable as its technically new

This commit is contained in:
duncanspumpkin 2019-12-24 11:46:56 +00:00
parent 370a9b1113
commit 0f90b2c353
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/rct1/S4Importer.cpp
View File

@ -964,11 +964,11 @@ private:
if (src->cur_test_track_location.isNull())
{
dst->cur_test_track_location.setNull();
dst->CurTestTrackLocation.setNull();
}
else
{
dst->cur_test_track_location = { src->cur_test_track_location.x, src->cur_test_track_location.y,
dst->CurTestTrackLocation = { src->cur_test_track_location.x, src->cur_test_track_location.y,
src->cur_test_track_z / 2 };
}
dst->testing_flags = src->testing_flags;

8
src/openrct2/rct2/S6Exporter.cpp
View File

@ -610,15 +610,15 @@ void S6Exporter::ExportRide(rct2_ride* dst, const Ride* src)
// pad_106[0x2];
dst->testing_flags = src->testing_flags;
if (src->cur_test_track_location.isNull())
if (src->CurTestTrackLocation.isNull())
{
dst->cur_test_track_location.setNull();
}
else
{
dst->cur_test_track_location = { static_cast<uint8_t>(src->cur_test_track_location.x),
static_cast<uint8_t>(src->cur_test_track_location.y) };
dst->cur_test_track_z = static_cast<uint8_t>(src->cur_test_track_location.z);
dst->cur_test_track_location = { static_cast<uint8_t>(src->CurTestTrackLocation.x),
static_cast<uint8_t>(src->CurTestTrackLocation.y) };
dst->cur_test_track_z = static_cast<uint8_t>(src->CurTestTrackLocation.z);
}
dst->turn_count_default = src->turn_count_default;

4
src/openrct2/rct2/S6Importer.cpp
View File

@ -617,11 +617,11 @@ public:
if (src->cur_test_track_location.isNull())
{
dst->cur_test_track_location.setNull();
dst->CurTestTrackLocation.setNull();
}
else
{
dst->cur_test_track_location = { src->cur_test_track_location.x, src->cur_test_track_location.y,
dst->CurTestTrackLocation = { src->cur_test_track_location.x, src->cur_test_track_location.y,
src->cur_test_track_z };
}

2
src/openrct2/ride/Ride.h
View File

@ -266,7 +266,7 @@ struct Ride
uint32_t testing_flags;
// x y z map location of the current track piece during a test
// this is to prevent counting special tracks multiple times
TileCoordsXYZ cur_test_track_location;
TileCoordsXYZ CurTestTrackLocation;
// Next 3 variables are related (XXXX XYYY ZZZa aaaa)
uint16_t turn_count_default; // X = current turn count
uint16_t turn_count_banked;

6
src/openrct2/ride/Vehicle.cpp
View File

@ -1595,9 +1595,9 @@ static void vehicle_update_measurements(rct_vehicle* vehicle)
// If we have already evaluated this track piece skip to next section
TileCoordsXYZ curTrackLoc{ CoordsXYZ{ vehicle->track_x, vehicle->track_y, vehicle->track_z } };
if (curTrackLoc != ride->cur_test_track_location)
if (curTrackLoc != ride->CurTestTrackLocation)
{
ride->cur_test_track_location = curTrackLoc;
ride->CurTestTrackLocation = curTrackLoc;
if (ride_get_entrance_location(ride, ride->current_test_station).isNull())
return;
@ -3073,7 +3073,7 @@ void vehicle_test_reset(rct_vehicle* vehicle)
ride->previous_vertical_g = 0;
ride->previous_lateral_g = 0;
ride->testing_flags = 0;
ride->cur_test_track_location.setNull();
ride->CurTestTrackLocation.setNull();
ride->turn_count_default = 0;
ride->turn_count_banked = 0;
ride->turn_count_sloped = 0;