mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 05:53:02 +01:00
Code Issues Releases Wiki Activity

Remove unused bits from rct_ride_data_5

Browse Source
This commit is contained in:
Gymnasiast
2020-04-19 18:10:50 +02:00
parent 02d3be4d4f
commit 9503672730
2 changed files with 91 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

182
src/openrct2/ride/RideData.cpp
View File

@@ -1172,97 +1172,97 @@ const ride_cost RideTrackCosts[RIDE_TYPE_COUNT] = {
// 0x0097D218
const rct_ride_data_5 RideData5[RIDE_TYPE_COUNT] = {
{ 19, 24, 9, 31, 11, 50, 85, 0 }, // RIDE_TYPE_SPIRAL_ROLLER_COASTER
{ 25, 24, 9, 18, 11, 50, 90, 0 }, // RIDE_TYPE_STAND_UP_ROLLER_COASTER
{ 24, 40, 29, 26, 8, 50, 90, 0 }, // RIDE_TYPE_SUSPENDED_SWINGING_COASTER
{ 38, 40, 29, 27, 8, 50, 100, 0 }, // RIDE_TYPE_INVERTED_ROLLER_COASTER
{ 15, 24, 4, 18, 7, 40, 60, 0 }, // RIDE_TYPE_JUNIOR_ROLLER_COASTER
{ 7, 32, 5, 39, 9, 50, 50, 0 }, // RIDE_TYPE_MINIATURE_RAILWAY
{ 8, 32, 8, 78, 9, 50, 60, 0 }, // RIDE_TYPE_MONORAIL
{ 10, 24, 24, 3, 8, 40, 50, 0 }, // RIDE_TYPE_MINI_SUSPENDED_COASTER
{ 255, 16, 0, 255, 3, 5, 40, 0 }, // RIDE_TYPE_BOAT_HIRE
{ 14, 24, 4, 4, 7, 40, 55, 0 }, // RIDE_TYPE_WOODEN_WILD_MOUSE
{ 14, 24, 7, 4, 7, 40, 60, 0 }, // RIDE_TYPE_STEEPLECHASE
{ 6, 24, 4, 2, 7, 30, 50, 0 }, // RIDE_TYPE_CAR_RIDE
{ 255, 32, 3, 15, 2, 4, 65, 0 }, // RIDE_TYPE_LAUNCHED_FREEFALL
{ 19, 24, 5, 25, 7, 45, 75, 0 }, // RIDE_TYPE_BOBSLEIGH_COASTER
{ 255, 32, 3, 15, 2, 4, 45, 0 }, // RIDE_TYPE_OBSERVATION_TOWER
{ 35, 24, 5, 18, 7, 50, 95, 0 }, // RIDE_TYPE_LOOPING_ROLLER_COASTER
{ 15, 24, 5, 5, 7, 40, 55, 0 }, // RIDE_TYPE_DINGHY_SLIDE
{ 21, 24, 4, 15, 7, 50, 85, 0 }, // RIDE_TYPE_MINE_TRAIN_COASTER
{ 40, 32, 28, 18, 2, 30, 55, 0 }, // RIDE_TYPE_CHAIRLIFT
{ 28, 24, 8, 18, 11, 50, 100, 0 }, // RIDE_TYPE_CORKSCREW_ROLLER_COASTER
{ 6, 24, 0, 18, 1, 8, 40, 0 }, // RIDE_TYPE_MAZE
{ 15, 128, 0, 255, 2, 1, 40, 0 }, // RIDE_TYPE_SPIRAL_SLIDE
{ 7, 24, 2, 255, 1, 20, 55, 0 }, // RIDE_TYPE_GO_KARTS
{ 9, 24, 7, 255, 9, 40, 65, 0 }, // RIDE_TYPE_LOG_FLUME
{ 9, 32, 14, 255, 15, 40, 70, 0 }, // RIDE_TYPE_RIVER_RAPIDS
{ 9, 48, 2, 255, 2, 1, 35, 0 }, // RIDE_TYPE_DODGEMS
{ 12, 112, 7, 255, 11, 1, 35, 0 }, // RIDE_TYPE_SWINGING_SHIP
{ 15, 176, 7, 255, 11, 1, 35, 0 }, // RIDE_TYPE_SWINGING_INVERTER_SHIP
{ 12, 64, 0, 255, 0, 1, 15, 0 }, // RIDE_TYPE_FOOD_STALL
{ 12, 64, 0, 255, 0, 1, 15, 0 }, // RIDE_TYPE_1D
{ 12, 64, 0, 255, 0, 1, 15, 0 }, // RIDE_TYPE_DRINK_STALL
{ 12, 64, 0, 255, 0, 1, 15, 0 }, // RIDE_TYPE_1F
{ 12, 64, 0, 255, 0, 1, 15, 0 }, // RIDE_TYPE_SHOP
{ 12, 64, 3, 255, 2, 1, 45, 0 }, // RIDE_TYPE_MERRY_GO_ROUND
{ 12, 64, 0, 255, 0, 1, 15, 0 }, // RIDE_TYPE_22
{ 12, 48, 0, 255, 0, 1, 15, 0 }, // RIDE_TYPE_INFORMATION_KIOSK
{ 12, 32, 0, 255, 0, 1, 5, 0 }, // RIDE_TYPE_TOILETS
{ 16, 176, 3, 255, 2, 1, 45, 0 }, // RIDE_TYPE_FERRIS_WHEEL
{ 12, 64, 3, 255, 2, 1, 45, 0 }, // RIDE_TYPE_MOTION_SIMULATOR
{ 12, 128, 3, 255, 2, 1, 45, 0 }, // RIDE_TYPE_3D_CINEMA
{ 16, 112, 3, 255, 2, 1, 55, 0 }, // RIDE_TYPE_TOP_SPIN
{ 16, 48, 3, 255, 2, 1, 30, 0 }, // RIDE_TYPE_SPACE_RINGS
{ 255, 32, 4, 255, 7, 45, 70, 0 }, // RIDE_TYPE_REVERSE_FREEFALL_COASTER
{ 255, 32, 3, 15, 2, 4, 45, 0 }, // RIDE_TYPE_LIFT
{ 53, 24, 8, 25, 11, 42, 95, 0 }, // RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER
{ 12, 32, 0, 255, 0, 1, 5, 0 }, // RIDE_TYPE_CASH_MACHINE
{ 12, 64, 3, 255, 2, 1, 40, 0 }, // RIDE_TYPE_TWIST
{ 16, 160, 3, 255, 2, 1, 22, 0 }, // RIDE_TYPE_HAUNTED_HOUSE
{ 12, 48, 0, 255, 0, 1, 5, 0 }, // RIDE_TYPE_FIRST_AID
{ 12, 128, 3, 255, 2, 1, 39, 0 }, // RIDE_TYPE_CIRCUS
{ 8, 24, 6, 2, 7, 30, 50, 0 }, // RIDE_TYPE_GHOST_TRAIN
{ 54, 24, 8, 31, 9, 55, 120, 0 }, // RIDE_TYPE_TWISTER_ROLLER_COASTER
{ 41, 24, 8, 19, 11, 50, 105, 0 }, // RIDE_TYPE_WOODEN_ROLLER_COASTER
{ 15, 24, 4, 15, 11, 37, 65, 0 }, // RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER
{ 16, 24, 4, 4, 7, 40, 55, 0 }, // RIDE_TYPE_STEEL_WILD_MOUSE
{ 40, 24, 8, 78, 11, 50, 100, 0 }, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER
{ 40, 24, 8, 78, 11, 50, 100, 0 }, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT
{ 30, 24, 8, 35, 11, 50, 100, 0 }, // RIDE_TYPE_FLYING_ROLLER_COASTER
{ 30, 24, 8, 35, 11, 50, 100, 0 }, // RIDE_TYPE_FLYING_ROLLER_COASTER_ALT
{ 14, 24, 6, 15, 7, 25, 50, 0 }, // RIDE_TYPE_VIRGINIA_REEL
{ 16, 24, 7, 255, 11, 30, 65, 0 }, // RIDE_TYPE_SPLASH_BOATS
{ 7, 24, 4, 2, 7, 30, 45, 0 }, // RIDE_TYPE_MINI_HELICOPTERS
{ 26, 24, 8, 25, 11, 50, 100, 0 }, // RIDE_TYPE_LAY_DOWN_ROLLER_COASTER
{ 12, 40, 32, 78, 8, 50, 60, 0 }, // RIDE_TYPE_SUSPENDED_MONORAIL
{ 26, 24, 8, 25, 11, 50, 100, 0 }, // RIDE_TYPE_LAY_DOWN_ROLLER_COASTER_ALT
{ 18, 24, 8, 15, 11, 37, 65, 0 }, // RIDE_TYPE_REVERSER_ROLLER_COASTER
{ 22, 24, 15, 18, 9, 30, 35, 0 }, // RIDE_TYPE_HEARTLINE_TWISTER_COASTER
{ 7, 32, 2, 255, 2, 20, 23, 0 }, // RIDE_TYPE_MINI_GOLF
{ 86, 24, 9, 31, 11, 55, 120, 0 }, // RIDE_TYPE_GIGA_COASTER
{ 255, 32, 3, 15, 2, 4, 45, 0 }, // RIDE_TYPE_ROTO_DROP
{ 9, 48, 2, 255, 2, 1, 35, 0 }, // RIDE_TYPE_FLYING_SAUCERS
{ 16, 96, 3, 255, 2, 1, 22, 0 }, // RIDE_TYPE_CROOKED_HOUSE
{ 5, 24, 8, 2, 7, 30, 45, 0 }, // RIDE_TYPE_MONORAIL_CYCLES
{ 27, 40, 29, 18, 8, 50, 80, 0 }, // RIDE_TYPE_COMPACT_INVERTED_COASTER
{ 18, 24, 4, 13, 7, 40, 60, 0 }, // RIDE_TYPE_WATER_COASTER
{ 255, 32, 4, 255, 7, 45, 70, 0 }, // RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER
{ 16, 24, 24, 4, 7, 40, 55, 0 }, // RIDE_TYPE_INVERTED_HAIRPIN_COASTER
{ 15, 176, 7, 255, 11, 1, 35, 0 }, // RIDE_TYPE_MAGIC_CARPET
{ 255, 16, 0, 255, 3, 5, 40, 0 }, // RIDE_TYPE_SUBMARINE_RIDE
{ 12, 24, 7, 255, 11, 30, 65, 0 }, // RIDE_TYPE_RIVER_RAFTS
{ 12, 64, 0, 255, 0, 1, 15, 0 }, // RIDE_TYPE_50
{ 16, 160, 3, 255, 2, 1, 45, 0 }, // RIDE_TYPE_ENTERPRISE
{ 12, 48, 0, 255, 0, 1, 15, 0 }, // RIDE_TYPE_52
{ 12, 64, 0, 255, 0, 1, 15, 0 }, // RIDE_TYPE_53
{ 12, 48, 0, 255, 0, 1, 15, 0 }, // RIDE_TYPE_54
{ 44, 24, 8, 18, 11, 50, 100, 0 }, // RIDE_TYPE_55
{ 45, 40, 29, 23, 8, 25, 75, 0 }, // RIDE_TYPE_INVERTED_IMPULSE_COASTER
{ 16, 24, 9, 10, 11, 40, 60, 0 }, // RIDE_TYPE_MINI_ROLLER_COASTER
{ 13, 24, 9, 27, 11, 40, 70, 0 }, // RIDE_TYPE_MINE_RIDE
{ 16, 24, 4, 4, 7, 40, 55, 0 }, // RIDE_TYPE_59
{ 35, 24, 5, 18, 7, 50, 95, 0 }, // RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER
{ 19, 24, 9, 31, 11, 50, }, // RIDE_TYPE_SPIRAL_ROLLER_COASTER
{ 25, 24, 9, 18, 11, 50, }, // RIDE_TYPE_STAND_UP_ROLLER_COASTER
{ 24, 40, 29, 26, 8, 50, }, // RIDE_TYPE_SUSPENDED_SWINGING_COASTER
{ 38, 40, 29, 27, 8, 50, }, // RIDE_TYPE_INVERTED_ROLLER_COASTER
{ 15, 24, 4, 18, 7, 40, }, // RIDE_TYPE_JUNIOR_ROLLER_COASTER
{ 7, 32, 5, 39, 9, 50, }, // RIDE_TYPE_MINIATURE_RAILWAY
{ 8, 32, 8, 78, 9, 50, }, // RIDE_TYPE_MONORAIL
{ 10, 24, 24, 3, 8, 40, }, // RIDE_TYPE_MINI_SUSPENDED_COASTER
{ 255, 16, 0, 255, 3, 5, }, // RIDE_TYPE_BOAT_HIRE
{ 14, 24, 4, 4, 7, 40, }, // RIDE_TYPE_WOODEN_WILD_MOUSE
{ 14, 24, 7, 4, 7, 40, }, // RIDE_TYPE_STEEPLECHASE
{ 6, 24, 4, 2, 7, 30, }, // RIDE_TYPE_CAR_RIDE
{ 255, 32, 3, 15, 2, 4, }, // RIDE_TYPE_LAUNCHED_FREEFALL
{ 19, 24, 5, 25, 7, 45, }, // RIDE_TYPE_BOBSLEIGH_COASTER
{ 255, 32, 3, 15, 2, 4, }, // RIDE_TYPE_OBSERVATION_TOWER
{ 35, 24, 5, 18, 7, 50, }, // RIDE_TYPE_LOOPING_ROLLER_COASTER
{ 15, 24, 5, 5, 7, 40, }, // RIDE_TYPE_DINGHY_SLIDE
{ 21, 24, 4, 15, 7, 50, }, // RIDE_TYPE_MINE_TRAIN_COASTER
{ 40, 32, 28, 18, 2, 30, }, // RIDE_TYPE_CHAIRLIFT
{ 28, 24, 8, 18, 11, 50, }, // RIDE_TYPE_CORKSCREW_ROLLER_COASTER
{ 6, 24, 0, 18, 1, 8, }, // RIDE_TYPE_MAZE
{ 15, 128, 0, 255, 2, 1, }, // RIDE_TYPE_SPIRAL_SLIDE
{ 7, 24, 2, 255, 1, 20, }, // RIDE_TYPE_GO_KARTS
{ 9, 24, 7, 255, 9, 40, }, // RIDE_TYPE_LOG_FLUME
{ 9, 32, 14, 255, 15, 40, }, // RIDE_TYPE_RIVER_RAPIDS
{ 9, 48, 2, 255, 2, 1, }, // RIDE_TYPE_DODGEMS
{ 12, 112, 7, 255, 11, 1, }, // RIDE_TYPE_SWINGING_SHIP
{ 15, 176, 7, 255, 11, 1, }, // RIDE_TYPE_SWINGING_INVERTER_SHIP
{ 12, 64, 0, 255, 0, 1, }, // RIDE_TYPE_FOOD_STALL
{ 12, 64, 0, 255, 0, 1, }, // RIDE_TYPE_1D
{ 12, 64, 0, 255, 0, 1, }, // RIDE_TYPE_DRINK_STALL
{ 12, 64, 0, 255, 0, 1, }, // RIDE_TYPE_1F
{ 12, 64, 0, 255, 0, 1, }, // RIDE_TYPE_SHOP
{ 12, 64, 3, 255, 2, 1, }, // RIDE_TYPE_MERRY_GO_ROUND
{ 12, 64, 0, 255, 0, 1, }, // RIDE_TYPE_22
{ 12, 48, 0, 255, 0, 1, }, // RIDE_TYPE_INFORMATION_KIOSK
{ 12, 32, 0, 255, 0, 1, }, // RIDE_TYPE_TOILETS
{ 16, 176, 3, 255, 2, 1, }, // RIDE_TYPE_FERRIS_WHEEL
{ 12, 64, 3, 255, 2, 1, }, // RIDE_TYPE_MOTION_SIMULATOR
{ 12, 128, 3, 255, 2, 1, }, // RIDE_TYPE_3D_CINEMA
{ 16, 112, 3, 255, 2, 1, }, // RIDE_TYPE_TOP_SPIN
{ 16, 48, 3, 255, 2, 1, }, // RIDE_TYPE_SPACE_RINGS
{ 255, 32, 4, 255, 7, 45, }, // RIDE_TYPE_REVERSE_FREEFALL_COASTER
{ 255, 32, 3, 15, 2, 4, }, // RIDE_TYPE_LIFT
{ 53, 24, 8, 25, 11, 42, }, // RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER
{ 12, 32, 0, 255, 0, 1, }, // RIDE_TYPE_CASH_MACHINE
{ 12, 64, 3, 255, 2, 1, }, // RIDE_TYPE_TWIST
{ 16, 160, 3, 255, 2, 1, }, // RIDE_TYPE_HAUNTED_HOUSE
{ 12, 48, 0, 255, 0, 1, }, // RIDE_TYPE_FIRST_AID
{ 12, 128, 3, 255, 2, 1, }, // RIDE_TYPE_CIRCUS
{ 8, 24, 6, 2, 7, 30, }, // RIDE_TYPE_GHOST_TRAIN
{ 54, 24, 8, 31, 9, 55, }, // RIDE_TYPE_TWISTER_ROLLER_COASTER
{ 41, 24, 8, 19, 11, 50, }, // RIDE_TYPE_WOODEN_ROLLER_COASTER
{ 15, 24, 4, 15, 11, 37, }, // RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER
{ 16, 24, 4, 4, 7, 40, }, // RIDE_TYPE_STEEL_WILD_MOUSE
{ 40, 24, 8, 78, 11, 50, }, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER
{ 40, 24, 8, 78, 11, 50, }, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT
{ 30, 24, 8, 35, 11, 50, }, // RIDE_TYPE_FLYING_ROLLER_COASTER
{ 30, 24, 8, 35, 11, 50, }, // RIDE_TYPE_FLYING_ROLLER_COASTER_ALT
{ 14, 24, 6, 15, 7, 25, }, // RIDE_TYPE_VIRGINIA_REEL
{ 16, 24, 7, 255, 11, 30, }, // RIDE_TYPE_SPLASH_BOATS
{ 7, 24, 4, 2, 7, 30, }, // RIDE_TYPE_MINI_HELICOPTERS
{ 26, 24, 8, 25, 11, 50, }, // RIDE_TYPE_LAY_DOWN_ROLLER_COASTER
{ 12, 40, 32, 78, 8, 50, }, // RIDE_TYPE_SUSPENDED_MONORAIL
{ 26, 24, 8, 25, 11, 50, }, // RIDE_TYPE_LAY_DOWN_ROLLER_COASTER_ALT
{ 18, 24, 8, 15, 11, 37, }, // RIDE_TYPE_REVERSER_ROLLER_COASTER
{ 22, 24, 15, 18, 9, 30, }, // RIDE_TYPE_HEARTLINE_TWISTER_COASTER
{ 7, 32, 2, 255, 2, 20, }, // RIDE_TYPE_MINI_GOLF
{ 86, 24, 9, 31, 11, 55, }, // RIDE_TYPE_GIGA_COASTER
{ 255, 32, 3, 15, 2, 4, }, // RIDE_TYPE_ROTO_DROP
{ 9, 48, 2, 255, 2, 1, }, // RIDE_TYPE_FLYING_SAUCERS
{ 16, 96, 3, 255, 2, 1, }, // RIDE_TYPE_CROOKED_HOUSE
{ 5, 24, 8, 2, 7, 30, }, // RIDE_TYPE_MONORAIL_CYCLES
{ 27, 40, 29, 18, 8, 50, }, // RIDE_TYPE_COMPACT_INVERTED_COASTER
{ 18, 24, 4, 13, 7, 40, }, // RIDE_TYPE_WATER_COASTER
{ 255, 32, 4, 255, 7, 45, }, // RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER
{ 16, 24, 24, 4, 7, 40, }, // RIDE_TYPE_INVERTED_HAIRPIN_COASTER
{ 15, 176, 7, 255, 11, 1, }, // RIDE_TYPE_MAGIC_CARPET
{ 255, 16, 0, 255, 3, 5, }, // RIDE_TYPE_SUBMARINE_RIDE
{ 12, 24, 7, 255, 11, 30, }, // RIDE_TYPE_RIVER_RAFTS
{ 12, 64, 0, 255, 0, 1, }, // RIDE_TYPE_50
{ 16, 160, 3, 255, 2, 1, }, // RIDE_TYPE_ENTERPRISE
{ 12, 48, 0, 255, 0, 1, }, // RIDE_TYPE_52
{ 12, 64, 0, 255, 0, 1, }, // RIDE_TYPE_53
{ 12, 48, 0, 255, 0, 1, }, // RIDE_TYPE_54
{ 44, 24, 8, 18, 11, 50, }, // RIDE_TYPE_55
{ 45, 40, 29, 23, 8, 25, }, // RIDE_TYPE_INVERTED_IMPULSE_COASTER
{ 16, 24, 9, 10, 11, 40, }, // RIDE_TYPE_MINI_ROLLER_COASTER
{ 13, 24, 9, 27, 11, 40, }, // RIDE_TYPE_MINE_RIDE
{ 16, 24, 4, 4, 7, 40, }, // RIDE_TYPE_59
{ 35, 24, 5, 18, 7, 50, }, // RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER
};
const rct_ride_entry_vehicle CableLiftVehicle = {

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

@@ -74,8 +74,6 @@ struct rct_ride_data_5
uint8_t max_mass;
uint8_t z;
uint8_t price;
uint8_t bonus_value; // Deprecated. Use rideBonusValue instead
uint8_t pad = 0;
};
struct rct_ride_lift_data