mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 06:23:04 +01:00
Code Issues Releases Wiki Activity

Rename SPRITE_LIST_TRAIN_HEAD to reduce car head confusion (#11105)

Browse Source 
A single car on a coaster can comprise of multiple vehicles. One of those vehicles will be the car head vehicle. The train can comprise of multiple cars. Therefore not all vehicle->IsHead 's will be in SPRITE_LIST_TRAIN_HEAD. This rename makes that slightly more clear
This commit is contained in:
Duncan
2020-03-29 09:23:24 +01:00
committed by GitHub
parent 7d18b647be
commit f64ea65d03
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/windows/Map.cpp
View File

@@ -1102,7 +1102,7 @@ static void window_map_paint_train_overlay(rct_drawpixelinfo* dpi)
Vehicle *train, *vehicle;
uint16_t train_index, vehicle_index;
for (train_index = gSpriteListHead[SPRITE_LIST_VEHICLE_HEAD]; train_index != SPRITE_INDEX_NULL; train_index = train->next)
for (train_index = gSpriteListHead[SPRITE_LIST_TRAIN_HEAD]; train_index != SPRITE_INDEX_NULL; train_index = train->next)
{
train = GET_VEHICLE(train_index);
for (vehicle_index = train_index; vehicle_index != SPRITE_INDEX_NULL; vehicle_index = vehicle->next_vehicle_on_train)

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

@@ -1123,7 +1123,7 @@ private:
// If vehicle is the first car on a train add to train list
if (vehicle->IsHead())
{
move_sprite_to_list(vehicle, SPRITE_LIST_VEHICLE_HEAD);
move_sprite_to_list(vehicle, SPRITE_LIST_TRAIN_HEAD);
}
}
}

2
src/openrct2/ride/CableLift.cpp
View File

@@ -35,7 +35,7 @@ Vehicle* cable_lift_segment_create(
current->ride_subtype = RIDE_ENTRY_INDEX_NULL;
if (head)
{
move_sprite_to_list(current, SPRITE_LIST_VEHICLE_HEAD);
move_sprite_to_list(current, SPRITE_LIST_TRAIN_HEAD);
ride.cable_lift = current->sprite_index;
}
current->type = head ? VEHICLE_TYPE_HEAD : VEHICLE_TYPE_TAIL;

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

@@ -4561,7 +4561,7 @@ static void vehicle_create_trains(ride_id_t rideIndex, int32_t x, int32_t y, int
lastTrain = train;
// Add train to ride vehicle list
move_sprite_to_list(train.head, SPRITE_LIST_VEHICLE_HEAD);
move_sprite_to_list(train.head, SPRITE_LIST_TRAIN_HEAD);
for (int32_t i = 0; i <= MAX_VEHICLES_PER_RIDE; i++)
{
if (ride->vehicles[i] == SPRITE_INDEX_NULL)

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

@@ -1284,7 +1284,7 @@ void vehicle_sounds_update()
vehicle_sounds_update_window_setup();
for (uint16_t i = gSpriteListHead[SPRITE_LIST_VEHICLE_HEAD]; i != SPRITE_INDEX_NULL; i = get_sprite(i)->vehicle.next)
for (uint16_t i = gSpriteListHead[SPRITE_LIST_TRAIN_HEAD]; i != SPRITE_INDEX_NULL; i = get_sprite(i)->vehicle.next)
{
get_sprite(i)->vehicle.UpdateSoundParams(vehicleSoundParamsList);
}
@@ -1365,7 +1365,7 @@ void vehicle_update_all()
if ((gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER) && gS6Info.editor_step != EDITOR_STEP_ROLLERCOASTER_DESIGNER)
return;
sprite_index = gSpriteListHead[SPRITE_LIST_VEHICLE_HEAD];
sprite_index = gSpriteListHead[SPRITE_LIST_TRAIN_HEAD];
while (sprite_index != SPRITE_INDEX_NULL)
{
vehicle = GET_VEHICLE(sprite_index);

2
src/openrct2/world/Sprite.cpp
View File

@@ -855,7 +855,7 @@ static bool sprite_should_tween(rct_sprite* sprite)
switch (sprite->generic.linked_list_index)
{
case SPRITE_LIST_PEEP:
case SPRITE_LIST_VEHICLE_HEAD:
case SPRITE_LIST_TRAIN_HEAD:
case SPRITE_LIST_VEHICLE:
return true;
}

2
src/openrct2/world/Sprite.h
View File

@@ -31,7 +31,7 @@ enum SPRITE_IDENTIFIER
enum SPRITE_LIST
{
SPRITE_LIST_FREE,
SPRITE_LIST_VEHICLE_HEAD,
SPRITE_LIST_TRAIN_HEAD,
SPRITE_LIST_PEEP,
SPRITE_LIST_MISC,
SPRITE_LIST_LITTER,