mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 08:14:38 +01:00
Code Issues Releases Wiki Activity

Merge pull request #20110 from ZeeMaji/rct1buildheights

Browse Source 
Fix a few RCT1 build height discrepancies
This commit is contained in:
Matthias Moninger
2023-05-09 19:44:07 +03:00
committed by GitHub
parent 037e103e93 7118249715
commit 8c165dd455
7 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -1,5 +1,6 @@
0.4.6 (in development)
------------------------------------------------------------------------
- Change: [#20110] Fix a few RCT1 build height parity discrepancies.
0.4.5 (2023-05-08)
------------------------------------------------------------------------

2
src/openrct2/network/NetworkBase.cpp
View File

@@ -43,7 +43,7 @@
// It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "0"
#define NETWORK_STREAM_VERSION "1"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION

2
src/openrct2/ride/coaster/meta/ClassicWoodenRollerCoaster.h
View File

@@ -35,7 +35,7 @@ constexpr const RideTypeDescriptor ClassicWoodenRollerCoasterRTD =
SET_FIELD(NameConvention, { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }),
SET_FIELD(EnumName, nameof(RIDE_TYPE_CLASSIC_WOODEN_ROLLER_COASTER)),
SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)),
SET_FIELD(Heights, { 41, 24, 8, 11, }),
SET_FIELD(Heights, { 24, 24, 8, 11, }),
SET_FIELD(MaxMass, 19),
SET_FIELD(LiftData, { OpenRCT2::Audio::SoundId::LiftWood, 3, 5 }),
SET_FIELD(RatingsMultipliers, { 52, 33, 4 }),

2
src/openrct2/ride/coaster/meta/HyperTwister.h
View File

@@ -36,7 +36,7 @@ constexpr const RideTypeDescriptor HyperTwisterRTD =
SET_FIELD(NameConvention, { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station}),
SET_FIELD(EnumName, nameof(RIDE_TYPE_HYPER_TWISTER)),
SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)),
SET_FIELD(Heights, { 54, 24, 8, 9, }),
SET_FIELD(Heights, { 61, 24, 8, 9, }),
SET_FIELD(MaxMass, 31),
SET_FIELD(LiftData, { OpenRCT2::Audio::SoundId::LiftBM, 5, 8 }),
SET_FIELD(RatingsMultipliers, { 52, 36, 10 }),

2
src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h
View File

@@ -35,7 +35,7 @@ constexpr const RideTypeDescriptor InvertedRollerCoasterRTD =
SET_FIELD(NameConvention, { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }),
SET_FIELD(EnumName, nameof(RIDE_TYPE_INVERTED_ROLLER_COASTER)),
SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)),
SET_FIELD(Heights, { 38, 40, 29, 8, }),
SET_FIELD(Heights, { 42, 40, 29, 8, }),
SET_FIELD(MaxMass, 27),
SET_FIELD(LiftData, { OpenRCT2::Audio::SoundId::LiftBM, 5, 7 }),
SET_FIELD(RatingsMultipliers, { 50, 30, 10 }),

2
src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h
View File

@@ -35,7 +35,7 @@ constexpr const RideTypeDescriptor SideFrictionRollerCoasterRTD =
SET_FIELD(NameConvention, { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }),
SET_FIELD(EnumName, nameof(RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER)),
SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)),
SET_FIELD(Heights, { 15, 24, 4, 11, }),
SET_FIELD(Heights, { 18, 24, 4, 11, }),
SET_FIELD(MaxMass, 15),
SET_FIELD(LiftData, { OpenRCT2::Audio::SoundId::LiftWood, 3, 4 }),
SET_FIELD(RatingsMultipliers, { 48, 28, 7 }),

2
src/openrct2/ride/coaster/meta/VerticalDropCoaster.h
View File

@@ -36,7 +36,7 @@ constexpr const RideTypeDescriptor VerticalDropCoasterRTD =
SET_FIELD(NameConvention, { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }),
SET_FIELD(EnumName, nameof(RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER)),
SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)),
SET_FIELD(Heights, { 53, 24, 8, 11, }),
SET_FIELD(Heights, { 55, 24, 8, 11, }),
SET_FIELD(MaxMass, 25),
SET_FIELD(LiftData, { OpenRCT2::Audio::SoundId::LiftBM, 4, 5 }),
SET_FIELD(RatingsMultipliers, { 52, 38, 10 }),