mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 10:21:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Make doors work with every vehicle, closes #5951

Browse source
This commit is contained in:
Gymnasiast 2017-07-25 12:40:18 +02:00 committed by Michael Steenbeek
parent e9e8068dff
commit 603735f86d
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
distribution/changelog.txt
View file

@ -19,6 +19,7 @@
- Improved: [#4301] Leading and trailing whitespace in player name is now removed.
- Improved: [#5859] OpenGL rendering performance
- Improved: [#5863] Switching drawing engines no longer requires the application to restart.
- Improved: [#6003] Doors placed on tracks will now work with all vehicles
- Improved: The land tool buttons can now be held down to increase/decrease size.
- Improved: Dropdowns longer than 32 items overflow into columns.
- Improved: Ride Type option in ride window is now a dropdown.

2
src/openrct2/network/network.h
View file

@ -55,7 +55,7 @@ extern "C" {
// This define specifies which version of network stream current build uses.
// It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "6"
#define NETWORK_STREAM_VERSION "7"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
#ifdef __cplusplus

15
src/openrct2/ride/vehicle.c
View file

@ -7351,12 +7351,9 @@ static bool vehicle_update_track_motion_forwards_get_new_track(rct_vehicle *vehi
}
}
// TODO check if getting the vehicle entry again is necessary
rct_ride_entry_vehicle* vehicleEntry = vehicle_get_vehicle_entry(vehicle);
// Change from original: this used to check if the vehicle allowed doors.
vehicle_update_scenery_door(vehicle);
if (vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_ALLOW_DOORS) {
vehicle_update_scenery_door(vehicle);
}
switch (vehicle->var_CD) {
default:
@ -7433,7 +7430,7 @@ loc_6DB41D:
vehicle->track_z = regs.dx;
// TODO check if getting the vehicle entry again is necessary
vehicleEntry = vehicle_get_vehicle_entry(vehicle);
rct_ride_entry_vehicle * vehicleEntry = vehicle_get_vehicle_entry(vehicle);
if ((vehicleEntry->flags_b & VEHICLE_ENTRY_FLAG_B_14) && vehicle->var_CD < 7) {
trackType = mapElement->properties.track.type;
@ -7483,9 +7480,9 @@ loc_6DB41D:
if (trackType == TRACK_ELEM_ROTATION_CONTROL_TOGGLE && rideType == RIDE_TYPE_WILD_MOUSE) {
vehicle->update_flags ^= VEHICLE_UPDATE_FLAG_13;
}
if (vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_ALLOW_DOORS) {
vehicle_update_handle_scenery_door(vehicle);
}
// Change from original: this used to check if the vehicle allowed doors.
vehicle_update_handle_scenery_door(vehicle);
return true;
}

2
src/openrct2/ride/vehicle.h
View file

@ -229,7 +229,7 @@ enum {
VEHICLE_ENTRY_FLAG_A_5 = 1 << 5,
VEHICLE_ENTRY_FLAG_A_6 = 1 << 6,
VEHICLE_ENTRY_FLAG_A_7 = 1 << 7,
VEHICLE_ENTRY_FLAG_A_ALLOW_DOORS = 1 << 8,
VEHICLE_ENTRY_FLAG_A_ALLOW_DOORS_DEPRECATED = 1 << 8, // Not used any more - every vehicle will now work with doors
VEHICLE_ENTRY_FLAG_A_ENABLE_ADDITIONAL_COLOUR_2 = 1 << 9,
VEHICLE_ENTRY_FLAG_A_10 = 1 << 10,
VEHICLE_ENTRY_FLAG_A_11 = 1 << 11,