From e3e435c9f75a9c0e6ec6a11a9240859e6beeae19 Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Sat, 7 Jan 2017 14:52:01 +0000 Subject: [PATCH] Fix trains splitting up into multiple vehicles --- src/openrct2/rct1/S4Importer.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 9069ca8d70..a7ac4bccb5 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -831,11 +831,16 @@ private: if (srcVehicle->x != (sint16)0x8000) { rct_vehicle * vehicle = (rct_vehicle *)create_sprite(SPRITE_IDENTIFIER_VEHICLE); - move_sprite_to_list((rct_sprite *)vehicle, SPRITE_LIST_VEHICLE * 2); spriteIndexMap[i] = vehicle->sprite_index; vehicles.push_back(vehicle); ImportVehicle(vehicle, srcVehicle); + + // If vehicle is the first car on a train add to train list + if (!vehicle->is_child) + { + move_sprite_to_list((rct_sprite *)vehicle, SPRITE_LIST_TRAIN * 2); + } } } }