Use table for ride names

This commit is contained in:
Marijn van der Werf 2016-07-27 00:02:10 +02:00
parent 63eb3580c4
commit bc3ec1b871
9 changed files with 324 additions and 44 deletions

View File

@ -533,76 +533,76 @@ STR_0528 :Riders travel in inflatable dinghies down a twisting semi-circular
STR_0529 :Mine train themed roller coaster trains career along steel roller coaster track made to look like old railway track
STR_0530 :Cars hang from a steel cable which runs continuously from one end of the ride to the other and back again
STR_0531 :A compact steel-tracked roller coaster where the train travels through corkscrews and loops
STR_0532 :
STR_0533 :
STR_0532 :Maze is constructed from 6-foot tall hedges or walls, and guests wander around the maze leaving only when they find the exit
STR_0533 :Wooden building with an internal staircase and an external spiral slide for use with slide mats
STR_0534 :Self-drive petrol-engined go karts
STR_0535 :Log-shaped boats travel along a water channel, splashing down steep slopes to soak the riders
STR_0536 :Circular boats meander along a wide water channel, splashing through waterfalls and thrilling riders through foaming rapids
STR_0537 :
STR_0538 :
STR_0539 :
STR_0540 :
STR_0541 :
STR_0542 :
STR_0543 :
STR_0544 :
STR_0545 :
STR_0546 :
STR_0547 :
STR_0548 :
STR_0549 :
STR_0550 :
STR_0551 :
STR_0552 :
STR_0553 :
STR_0537 :Self-drive electric dodgem cars
STR_0538 :Large swinging pirate ship
STR_0539 :Ship is attached to an arm with a counterweight at the opposite end, and swings through a complete 360 degrees
STR_0540 :STR_RIDE_DESCRIPTION_FOOD_STALL
STR_0541 :<removed string - do not use>
STR_0542 :STR_RIDE_DESCRIPTION_DRINK_STALL
STR_0543 :<removed string - do not use>
STR_0544 :STR_RIDE_DESCRIPTION_SHOP
STR_0545 :Traditional rotating carousel with carved wooden horses
STR_0546 :<removed string - do not use>
STR_0547 :A stall where guests can obtain park maps and purchase umbrellas
STR_0548 :STR_RIDE_DESCRIPTION_TOILETS
STR_0549 :Rotating big wheel with open chairs
STR_0550 :Riders view a film inside the motion simulator pod while it is twisted and moved around by a hydraulic arm
STR_0551 :Cinema showing 3D films inside a geodesic sphere shaped building
STR_0552 :Passengers ride in a gondola suspended by large rotating arms, rotating forwards and backwards head-over-heals
STR_0553 :Concentric pivoting rings allowing the riders free rotation in all directions
STR_0554 :The car is accelerated out of the station along a long level track using Linear Induction Motors, then heads straight up a vertical spike of track, freefalling back down to return to the station
STR_0555 :Guests ride in an elevator up or down a vertical tower to get from one level to another
STR_0556 :Extra-wide cars descend completely vertical sloped track for the ultimate freefall roller coaster experience
STR_0557 :
STR_0558 :
STR_0559 :
STR_0560 :
STR_0561 :
STR_0557 :An A.T.M. (Cash Machine) for guests to use if they run low on funds
STR_0558 :Riders ride in pairs of seats rotating around the ends of three long rotating arms
STR_0559 :Large themed building containing scary corridors and spooky rooms
STR_0560 :A place for sick guests to go for faster recovery
STR_0561 :Circus animal show inside a big-top tent
STR_0562 :Powered cars travel along a multi-level track past spooky scenery and special effects
STR_0563 :Sitting in comfortable trains with only simple lap restraints riders enjoy giant smooth drops and twisting track as well as plenty of 'air time' over the hills
STR_0564 :Running on wooden track, this coaster is fast, rough, noisy, and gives an 'out of control' riding experience with plenty of 'air time'
STR_0565 :A simple wooden roller coaster capable of only gentle slopes and turns, where the cars are only kept on the track by side friction wheels and gravity
STR_0566 :Individual roller coaster cars zip around a tight zig-zag layout of track with sharp corners and short sharp drops
STR_0567 :Sitting in seats suspended either side of the track, riders are pitched head-over-heels while they plunge down steep drops and travel through various inversions
STR_0568 :
STR_0568 :<removed string - do not use>
STR_0569 :Riding in special harnesses below the track, riders experience the feeling of flight as they swoop through the air
STR_0570 :
STR_0570 :<removed string - do not use>
STR_0571 :Circular cars spin around as they travel along the zig-zagging wooden track
STR_0572 :Large capacity boats travel along a wide water channel, propelled up slopes by a conveyor belt, accelerating down steep slopes to soak the riders with a giant splash
STR_0573 :Powered helicopter shaped cars running on a steel track, controlled by the pedalling of the riders
STR_0574 :Riders are held in special harnesses in a lying-down position, travelling through twisted track and inversions either on their backs or facing the ground
STR_0575 :Powered trains hanging from a single rail transport people around the park
STR_0576 :
STR_0576 :<removed string - do not use>
STR_0577 :Bogied cars run on wooden tracks, turning around on special reversing sections
STR_0578 :Cars run along track enclosed by circular hoops, traversing steep drops and heartline twists
STR_0579 :
STR_0579 :A gentle game of miniature golf
STR_0580 :A giant steel roller coaster capable of smooth drops and hills of over 300ft
STR_0581 :A ring of seats is pulled to the top of a tall tower while gently rotating, then allowed to free-fall down, stopping gently at the bottom using magnetic brakes
STR_0582 :
STR_0583 :
STR_0582 :Self-drive hovercraft vehicles
STR_0583 :Building containing warped rooms and angled corridors to disorientate people walking through it
STR_0584 :Special bicycles run on a steel monorail track, propelled by the pedalling of the riders
STR_0585 :Riders sit in pairs of seats suspended beneath the track as they loop and twist through tight inversions
STR_0586 :Boat shaped cars run on roller coaster track to allow twisting curves and steep drops, splashing down into sections of water for gentle river sections
STR_0587 :After an exhilarating air-powered launch, the train speeds up a vertical track, over the top, and vertically down the other side to return to the station
STR_0588 :Individual cars run beneath a zig-zagging track with hairpin turns and sharp drops
STR_0589 :
STR_0589 :A large flying-carpet themed car which moves up and down cyclically on the ends of 4 arms
STR_0590 :Riders ride in a submerged submarine through an underwater course
STR_0591 :Raft-shaped boats gently meander around a river track
STR_0592 :
STR_0593 :
STR_0594 :
STR_0595 :
STR_0596 :
STR_0597 :
STR_0592 :<removed string - do not use>
STR_0593 :Rotating wheel with suspended passenger pods, which first starts spinning and is then tilted up by a supporting arm
STR_0594 :<removed string - do not use>
STR_0595 :<removed string - do not use>
STR_0596 :<removed string - do not use>
STR_0597 :<removed string - do not use>
STR_0598 :Inverted roller coaster trains are accelerated out of the station to travel up a vertical spike of track, then reverse back through the station to travel backwards up another vertical spike of track
STR_0599 :A compact roller coaster with individual cars and smooth twisting drops
STR_0600 :Powered mine trains career along a smooth and twisted track layout
STR_0601 :
STR_0601 :<removed string - do not use>
STR_0602 :Roller coaster trains are accelerated out of the station by linear induction motors to speed through twisting inversions
STR_0603 :Guest {INT32}
STR_0604 :Guest {INT32}
@ -4222,6 +4222,7 @@ STR_5910 :Apply
STR_5911 :See-Through Paths
STR_5912 :See-through paths toggle
STR_5913 :Chat
STR_5914 :Unknown ride
#############
# Scenarios #

View File

@ -25,8 +25,185 @@ enum {
STR_EMPTY = 0,
// STR_0001 :{STRINGID} {COMMA16}
STR_RIDE_NAME_SPIRAL_ROLLER_COASTER = 2,
STR_RIDE_NAME_STAND_UP_ROLLER_COASTER = 3,
STR_RIDE_NAME_SUSPENDED_SWINGING_COASTER = 4,
STR_RIDE_NAME_INVERTED_ROLLER_COASTER = 5,
STR_RIDE_NAME_JUNIOR_ROLLER_COASTER = 6,
STR_RIDE_NAME_MINIATURE_RAILWAY = 7,
STR_RIDE_NAME_MONORAIL = 8,
STR_RIDE_NAME_MINI_SUSPENDED_COASTER = 9,
STR_RIDE_NAME_BOAT_RIDE = 10,
STR_RIDE_NAME_WOODEN_WILD_MOUSE = 11,
STR_RIDE_NAME_STEEPLECHASE = 12,
STR_RIDE_NAME_CAR_RIDE = 13,
STR_RIDE_NAME_LAUNCHED_FREEFALL = 14,
STR_RIDE_NAME_BOBSLEIGH_COASTER = 15,
STR_RIDE_NAME_OBSERVATION_TOWER = 16,
STR_RIDE_NAME_LOOPING_ROLLER_COASTER = 17,
STR_RIDE_NAME_DINGHY_SLIDE = 18,
STR_RIDE_NAME_MINE_TRAIN_COASTER = 19,
STR_RIDE_NAME_CHAIRLIFT = 20,
STR_RIDE_NAME_CORKSCREW_ROLLER_COASTER = 21,
STR_RIDE_NAME_MAZE = 22,
STR_RIDE_NAME_SPIRAL_SLIDE = 23,
STR_RIDE_NAME_GO_KARTS = 24,
STR_RIDE_NAME_LOG_FLUME = 25,
STR_RIDE_NAME_RIVER_RAPIDS = 26,
STR_RIDE_NAME_DODGEMS = 27,
STR_RIDE_NAME_PIRATE_SHIP = 28,
STR_RIDE_NAME_SWINGING_INVERTER_SHIP = 29,
STR_RIDE_NAME_FOOD_STALL = 30,
STR_RIDE_NAME_1D = 31,
STR_RIDE_NAME_DRINK_STALL = 32,
STR_RIDE_NAME_1F = 33,
STR_RIDE_NAME_SHOP = 34,
STR_RIDE_NAME_MERRY_GO_ROUND = 35,
STR_RIDE_NAME_22 = 36,
STR_RIDE_NAME_INFORMATION_KIOSK = 37,
STR_RIDE_NAME_TOILETS = 38,
STR_RIDE_NAME_FERRIS_WHEEL = 39,
STR_RIDE_NAME_MOTION_SIMULATOR = 40,
STR_RIDE_NAME_3D_CINEMA = 41,
STR_RIDE_NAME_TOP_SPIN = 42,
STR_RIDE_NAME_SPACE_RINGS = 43,
STR_RIDE_NAME_REVERSE_FREEFALL_COASTER = 44,
STR_RIDE_NAME_LIFT = 45,
STR_RIDE_NAME_VERTICAL_DROP_ROLLER_COASTER = 46,
STR_RIDE_NAME_CASH_MACHINE = 47,
STR_RIDE_NAME_TWIST = 48,
STR_RIDE_NAME_HAUNTED_HOUSE = 49,
STR_RIDE_NAME_FIRST_AID = 50,
STR_RIDE_NAME_CIRCUS_SHOW = 51,
STR_RIDE_NAME_GHOST_TRAIN = 52,
STR_RIDE_NAME_TWISTER_ROLLER_COASTER = 53,
STR_RIDE_NAME_WOODEN_ROLLER_COASTER = 54,
STR_RIDE_NAME_SIDE_FRICTION_ROLLER_COASTER = 55,
STR_RIDE_NAME_WILD_MOUSE = 56,
STR_RIDE_NAME_MULTI_DIMENSION_ROLLER_COASTER = 57,
STR_RIDE_NAME_38 = 58,
STR_RIDE_NAME_FLYING_ROLLER_COASTER = 59,
STR_RIDE_NAME_3A = 60,
STR_RIDE_NAME_VIRGINIA_REEL = 61,
STR_RIDE_NAME_SPLASH_BOATS = 62,
STR_RIDE_NAME_MINI_HELICOPTERS = 63,
STR_RIDE_NAME_LAY_DOWN_ROLLER_COASTER = 64,
STR_RIDE_NAME_SUSPENDED_MONORAIL = 65,
STR_RIDE_NAME_40 = 66,
STR_RIDE_NAME_REVERSER_ROLLER_COASTER = 67,
STR_RIDE_NAME_HEARTLINE_TWISTER_COASTER = 68,
STR_RIDE_NAME_MINI_GOLF = 69,
STR_RIDE_NAME_GIGA_COASTER = 70,
STR_RIDE_NAME_ROTO_DROP = 71,
STR_RIDE_NAME_FLYING_SAUCERS = 72,
STR_RIDE_NAME_CROOKED_HOUSE = 73,
STR_RIDE_NAME_MONORAIL_CYCLES = 74,
STR_RIDE_NAME_COMPACT_INVERTED_COASTER = 75,
STR_RIDE_NAME_WATER_COASTER = 76,
STR_RIDE_NAME_AIR_POWERED_VERTICAL_COASTER = 77,
STR_RIDE_NAME_INVERTED_HAIRPIN_COASTER = 78,
STR_RIDE_NAME_MAGIC_CARPET = 79,
STR_RIDE_NAME_SUBMARINE_RIDE = 80,
STR_RIDE_NAME_RIVER_RAFTS = 81,
STR_RIDE_NAME_50 = 82,
STR_RIDE_NAME_ENTERPRISE = 83,
STR_RIDE_NAME_52 = 84,
STR_RIDE_NAME_53 = 85,
STR_RIDE_NAME_54 = 86,
STR_RIDE_NAME_55 = 87,
STR_RIDE_NAME_INVERTED_IMPULSE_COASTER = 88,
STR_RIDE_NAME_MINI_ROLLER_COASTER = 89,
STR_RIDE_NAME_MINE_RIDE = 90,
STR_RIDE_NAME_59 = 91,
STR_RIDE_NAME_LIM_LAUNCHED_ROLLER_COASTER = 92,
STR_RIDE_DESCRIPTION_SPIRAL_ROLLER_COASTER = 512,
STR_RIDE_DESCRIPTION_STAND_UP_ROLLER_COASTER = 513,
STR_RIDE_DESCRIPTION_SUSPENDED_SWINGING_COASTER = 514,
STR_RIDE_DESCRIPTION_INVERTED_ROLLER_COASTER = 515,
STR_RIDE_DESCRIPTION_JUNIOR_ROLLER_COASTER = 516,
STR_RIDE_DESCRIPTION_MINIATURE_RAILWAY = 517,
STR_RIDE_DESCRIPTION_MONORAIL = 518,
STR_RIDE_DESCRIPTION_MINI_SUSPENDED_COASTER = 519,
STR_RIDE_DESCRIPTION_BOAT_RIDE = 520,
STR_RIDE_DESCRIPTION_WOODEN_WILD_MOUSE = 521,
STR_RIDE_DESCRIPTION_STEEPLECHASE = 522,
STR_RIDE_DESCRIPTION_CAR_RIDE = 523,
STR_RIDE_DESCRIPTION_LAUNCHED_FREEFALL = 524,
STR_RIDE_DESCRIPTION_BOBSLEIGH_COASTER = 525,
STR_RIDE_DESCRIPTION_OBSERVATION_TOWER = 526,
STR_RIDE_DESCRIPTION_LOOPING_ROLLER_COASTER = 527,
STR_RIDE_DESCRIPTION_DINGHY_SLIDE = 528,
STR_RIDE_DESCRIPTION_MINE_TRAIN_COASTER = 529,
STR_RIDE_DESCRIPTION_CHAIRLIFT = 530,
STR_RIDE_DESCRIPTION_CORKSCREW_ROLLER_COASTER = 531,
STR_RIDE_DESCRIPTION_MAZE = 532,
STR_RIDE_DESCRIPTION_SPIRAL_SLIDE = 533,
STR_RIDE_DESCRIPTION_GO_KARTS = 534,
STR_RIDE_DESCRIPTION_LOG_FLUME = 535,
STR_RIDE_DESCRIPTION_RIVER_RAPIDS = 536,
STR_RIDE_DESCRIPTION_DODGEMS = 537,
STR_RIDE_DESCRIPTION_PIRATE_SHIP = 538,
STR_RIDE_DESCRIPTION_SWINGING_INVERTER_SHIP = 539,
STR_RIDE_DESCRIPTION_FOOD_STALL = 540,
STR_RIDE_DESCRIPTION_DRINK_STALL = 542,
STR_RIDE_DESCRIPTION_SHOP = 544,
STR_RIDE_DESCRIPTION_MERRY_GO_ROUND = 545,
STR_RIDE_DESCRIPTION_INFORMATION_KIOSK = 547,
STR_RIDE_DESCRIPTION_TOILETS = 548,
STR_RIDE_DESCRIPTION_FERRIS_WHEEL = 549,
STR_RIDE_DESCRIPTION_MOTION_SIMULATOR = 550,
STR_RIDE_DESCRIPTION_3D_CINEMA = 551,
STR_RIDE_DESCRIPTION_TOP_SPIN = 552,
STR_RIDE_DESCRIPTION_SPACE_RINGS = 553,
STR_RIDE_DESCRIPTION_REVERSE_FREEFALL_COASTER = 554,
STR_RIDE_DESCRIPTION_LIFT = 555,
STR_RIDE_DESCRIPTION_VERTICAL_DROP_ROLLER_COASTER = 556,
STR_RIDE_DESCRIPTION_CASH_MACHINE = 557,
STR_RIDE_DESCRIPTION_TWIST = 558,
STR_RIDE_DESCRIPTION_HAUNTED_HOUSE = 559,
STR_RIDE_DESCRIPTION_FIRST_AID = 560,
STR_RIDE_DESCRIPTION_CIRCUS_SHOW = 561,
STR_RIDE_DESCRIPTION_GHOST_TRAIN = 562,
STR_RIDE_DESCRIPTION_TWISTER_ROLLER_COASTER = 563,
STR_RIDE_DESCRIPTION_WOODEN_ROLLER_COASTER = 564,
STR_RIDE_DESCRIPTION_SIDE_FRICTION_ROLLER_COASTER = 565,
STR_RIDE_DESCRIPTION_WILD_MOUSE = 566,
STR_RIDE_DESCRIPTION_MULTI_DIMENSION_ROLLER_COASTER = 567,
STR_RIDE_DESCRIPTION_FLYING_ROLLER_COASTER = 569,
STR_RIDE_DESCRIPTION_VIRGINIA_REEL = 571,
STR_RIDE_DESCRIPTION_SPLASH_BOATS = 572,
STR_RIDE_DESCRIPTION_MINI_HELICOPTERS = 573,
STR_RIDE_DESCRIPTION_LAY_DOWN_ROLLER_COASTER = 574,
STR_RIDE_DESCRIPTION_SUSPENDED_MONORAIL = 575,
STR_RIDE_DESCRIPTION_REVERSER_ROLLER_COASTER = 577,
STR_RIDE_DESCRIPTION_HEARTLINE_TWISTER_COASTER = 578,
STR_RIDE_DESCRIPTION_MINI_GOLF = 579,
STR_RIDE_DESCRIPTION_GIGA_COASTER = 580,
STR_RIDE_DESCRIPTION_ROTO_DROP = 581,
STR_RIDE_DESCRIPTION_FLYING_SAUCERS = 582,
STR_RIDE_DESCRIPTION_CROOKED_HOUSE = 583,
STR_RIDE_DESCRIPTION_MONORAIL_CYCLES = 584,
STR_RIDE_DESCRIPTION_COMPACT_INVERTED_COASTER = 585,
STR_RIDE_DESCRIPTION_WATER_COASTER = 586,
STR_RIDE_DESCRIPTION_AIR_POWERED_VERTICAL_COASTER = 587,
STR_RIDE_DESCRIPTION_INVERTED_HAIRPIN_COASTER = 588,
STR_RIDE_DESCRIPTION_MAGIC_CARPET = 589,
STR_RIDE_DESCRIPTION_SUBMARINE_RIDE = 590,
STR_RIDE_DESCRIPTION_RIVER_RAFTS = 591,
STR_RIDE_DESCRIPTION_ENTERPRISE = 593,
STR_RIDE_DESCRIPTION_INVERTED_IMPULSE_COASTER = 598,
STR_RIDE_DESCRIPTION_MINI_ROLLER_COASTER = 599,
STR_RIDE_DESCRIPTION_MINE_RIDE = 600,
STR_RIDE_DESCRIPTION_LIM_LAUNCHED_ROLLER_COASTER = 602,
STR_GUEST_X = 767,
STR_HANDYMAN_X = 768,
@ -3346,6 +3523,7 @@ enum {
STR_SEE_THROUGH_PATHS = 5911,
STR_SHORTCUT_SEE_THROUGH_PATHS_TOGGLE = 5912,
STR_CHAT = 5913,
STR_RIDE_DESCRIPTION_UNKNOWN = 5914,
// Have to include resource strings (from scenarios and objects) for the time being now that language is partially working
STR_COUNT = 32768

View File

@ -221,7 +221,7 @@ void research_finish_item(sint32 entryIndex)
// I don't think 0x009AC06C is ever not 0, so probably redundant
if (RCT2_GLOBAL(0x009AC06C, uint8) == 0) {
set_format_arg(0, rct_string_id, ((rideEntry->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME)) ?
rideEntry->name : base_ride_type + STR_RIDE_NAME_SPIRAL_ROLLER_COASTER); // TODO: remove string addition
rideEntry->name : RideNaming[base_ride_type].name);
if (!gSilentResearch) {
if (gConfigNotifications.ride_researched) {
news_item_add_to_queue(NEWS_ITEM_RESEARCH, STR_NEWS_ITEM_RESEARCH_NEW_RIDE_AVAILABLE, entryIndex);

View File

@ -810,6 +810,100 @@ const rct_ride_name_convention RideNameConvention[96] = {
{ RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }
};
const rct_ride_name RideNaming[] = {
{ STR_RIDE_NAME_SPIRAL_ROLLER_COASTER, STR_RIDE_DESCRIPTION_SPIRAL_ROLLER_COASTER }, // RIDE_TYPE_SPIRAL_ROLLER_COASTER
{ STR_RIDE_NAME_STAND_UP_ROLLER_COASTER, STR_RIDE_DESCRIPTION_STAND_UP_ROLLER_COASTER }, // RIDE_TYPE_STAND_UP_ROLLER_COASTER
{ STR_RIDE_NAME_SUSPENDED_SWINGING_COASTER, STR_RIDE_DESCRIPTION_SUSPENDED_SWINGING_COASTER }, // RIDE_TYPE_SUSPENDED_SWINGING_COASTER
{ STR_RIDE_NAME_INVERTED_ROLLER_COASTER, STR_RIDE_DESCRIPTION_INVERTED_ROLLER_COASTER }, // RIDE_TYPE_INVERTED_ROLLER_COASTER
{ STR_RIDE_NAME_JUNIOR_ROLLER_COASTER, STR_RIDE_DESCRIPTION_JUNIOR_ROLLER_COASTER }, // RIDE_TYPE_JUNIOR_ROLLER_COASTER
{ STR_RIDE_NAME_MINIATURE_RAILWAY, STR_RIDE_DESCRIPTION_MINIATURE_RAILWAY }, // RIDE_TYPE_MINIATURE_RAILWAY
{ STR_RIDE_NAME_MONORAIL, STR_RIDE_DESCRIPTION_MONORAIL }, // RIDE_TYPE_MONORAIL
{ STR_RIDE_NAME_MINI_SUSPENDED_COASTER, STR_RIDE_DESCRIPTION_MINI_SUSPENDED_COASTER }, // RIDE_TYPE_MINI_SUSPENDED_COASTER
{ STR_RIDE_NAME_BOAT_RIDE, STR_RIDE_DESCRIPTION_BOAT_RIDE }, // RIDE_TYPE_BOAT_RIDE
{ STR_RIDE_NAME_WOODEN_WILD_MOUSE, STR_RIDE_DESCRIPTION_WOODEN_WILD_MOUSE }, // RIDE_TYPE_WOODEN_WILD_MOUSE
{ STR_RIDE_NAME_STEEPLECHASE, STR_RIDE_DESCRIPTION_STEEPLECHASE }, // RIDE_TYPE_STEEPLECHASE
{ STR_RIDE_NAME_CAR_RIDE, STR_RIDE_DESCRIPTION_CAR_RIDE }, // RIDE_TYPE_CAR_RIDE
{ STR_RIDE_NAME_LAUNCHED_FREEFALL, STR_RIDE_DESCRIPTION_LAUNCHED_FREEFALL }, // RIDE_TYPE_LAUNCHED_FREEFALL
{ STR_RIDE_NAME_BOBSLEIGH_COASTER, STR_RIDE_DESCRIPTION_BOBSLEIGH_COASTER }, // RIDE_TYPE_BOBSLEIGH_COASTER
{ STR_RIDE_NAME_OBSERVATION_TOWER, STR_RIDE_DESCRIPTION_OBSERVATION_TOWER }, // RIDE_TYPE_OBSERVATION_TOWER
{ STR_RIDE_NAME_LOOPING_ROLLER_COASTER, STR_RIDE_DESCRIPTION_LOOPING_ROLLER_COASTER }, // RIDE_TYPE_LOOPING_ROLLER_COASTER
{ STR_RIDE_NAME_DINGHY_SLIDE, STR_RIDE_DESCRIPTION_DINGHY_SLIDE }, // RIDE_TYPE_DINGHY_SLIDE
{ STR_RIDE_NAME_MINE_TRAIN_COASTER, STR_RIDE_DESCRIPTION_MINE_TRAIN_COASTER }, // RIDE_TYPE_MINE_TRAIN_COASTER
{ STR_RIDE_NAME_CHAIRLIFT, STR_RIDE_DESCRIPTION_CHAIRLIFT }, // RIDE_TYPE_CHAIRLIFT
{ STR_RIDE_NAME_CORKSCREW_ROLLER_COASTER, STR_RIDE_DESCRIPTION_CORKSCREW_ROLLER_COASTER }, // RIDE_TYPE_CORKSCREW_ROLLER_COASTER
{ STR_RIDE_NAME_MAZE, STR_RIDE_DESCRIPTION_MAZE }, // RIDE_TYPE_MAZE
{ STR_RIDE_NAME_SPIRAL_SLIDE, STR_RIDE_DESCRIPTION_SPIRAL_SLIDE }, // RIDE_TYPE_SPIRAL_SLIDE
{ STR_RIDE_NAME_GO_KARTS, STR_RIDE_DESCRIPTION_GO_KARTS }, // RIDE_TYPE_GO_KARTS
{ STR_RIDE_NAME_LOG_FLUME, STR_RIDE_DESCRIPTION_LOG_FLUME }, // RIDE_TYPE_LOG_FLUME
{ STR_RIDE_NAME_RIVER_RAPIDS, STR_RIDE_DESCRIPTION_RIVER_RAPIDS }, // RIDE_TYPE_RIVER_RAPIDS
{ STR_RIDE_NAME_DODGEMS, STR_RIDE_DESCRIPTION_DODGEMS }, // RIDE_TYPE_DODGEMS
{ STR_RIDE_NAME_PIRATE_SHIP, STR_RIDE_DESCRIPTION_PIRATE_SHIP }, // RIDE_TYPE_PIRATE_SHIP
{ STR_RIDE_NAME_SWINGING_INVERTER_SHIP, STR_RIDE_DESCRIPTION_SWINGING_INVERTER_SHIP }, // RIDE_TYPE_SWINGING_INVERTER_SHIP
{ STR_RIDE_NAME_FOOD_STALL, STR_RIDE_DESCRIPTION_FOOD_STALL }, // RIDE_TYPE_FOOD_STALL
{ STR_RIDE_NAME_1D, STR_RIDE_DESCRIPTION_UNKNOWN }, // RIDE_TYPE_1D
{ STR_RIDE_NAME_DRINK_STALL, STR_RIDE_DESCRIPTION_DRINK_STALL }, // RIDE_TYPE_DRINK_STALL
{ STR_RIDE_NAME_1F, STR_RIDE_DESCRIPTION_UNKNOWN }, // RIDE_TYPE_1F
{ STR_RIDE_NAME_SHOP, STR_RIDE_DESCRIPTION_SHOP }, // RIDE_TYPE_SHOP
{ STR_RIDE_NAME_MERRY_GO_ROUND, STR_RIDE_DESCRIPTION_MERRY_GO_ROUND }, // RIDE_TYPE_MERRY_GO_ROUND
{ STR_RIDE_NAME_22, STR_RIDE_DESCRIPTION_UNKNOWN }, // RIDE_TYPE_22
{ STR_RIDE_NAME_INFORMATION_KIOSK, STR_RIDE_DESCRIPTION_INFORMATION_KIOSK }, // RIDE_TYPE_INFORMATION_KIOSK
{ STR_RIDE_NAME_TOILETS, STR_RIDE_DESCRIPTION_TOILETS }, // RIDE_TYPE_TOILETS
{ STR_RIDE_NAME_FERRIS_WHEEL, STR_RIDE_DESCRIPTION_FERRIS_WHEEL }, // RIDE_TYPE_FERRIS_WHEEL
{ STR_RIDE_NAME_MOTION_SIMULATOR, STR_RIDE_DESCRIPTION_MOTION_SIMULATOR }, // RIDE_TYPE_MOTION_SIMULATOR
{ STR_RIDE_NAME_3D_CINEMA, STR_RIDE_DESCRIPTION_3D_CINEMA }, // RIDE_TYPE_3D_CINEMA
{ STR_RIDE_NAME_TOP_SPIN, STR_RIDE_DESCRIPTION_TOP_SPIN }, // RIDE_TYPE_TOP_SPIN
{ STR_RIDE_NAME_SPACE_RINGS, STR_RIDE_DESCRIPTION_SPACE_RINGS }, // RIDE_TYPE_SPACE_RINGS
{ STR_RIDE_NAME_REVERSE_FREEFALL_COASTER, STR_RIDE_DESCRIPTION_REVERSE_FREEFALL_COASTER }, // RIDE_TYPE_REVERSE_FREEFALL_COASTER
{ STR_RIDE_NAME_LIFT, STR_RIDE_DESCRIPTION_LIFT }, // RIDE_TYPE_LIFT
{ STR_RIDE_NAME_VERTICAL_DROP_ROLLER_COASTER, STR_RIDE_DESCRIPTION_VERTICAL_DROP_ROLLER_COASTER }, // RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER
{ STR_RIDE_NAME_CASH_MACHINE, STR_RIDE_DESCRIPTION_CASH_MACHINE }, // RIDE_TYPE_CASH_MACHINE
{ STR_RIDE_NAME_TWIST, STR_RIDE_DESCRIPTION_TWIST }, // RIDE_TYPE_TWIST
{ STR_RIDE_NAME_HAUNTED_HOUSE, STR_RIDE_DESCRIPTION_HAUNTED_HOUSE }, // RIDE_TYPE_HAUNTED_HOUSE
{ STR_RIDE_NAME_FIRST_AID, STR_RIDE_DESCRIPTION_FIRST_AID }, // RIDE_TYPE_FIRST_AID
{ STR_RIDE_NAME_CIRCUS_SHOW, STR_RIDE_DESCRIPTION_CIRCUS_SHOW }, // RIDE_TYPE_CIRCUS_SHOW
{ STR_RIDE_NAME_GHOST_TRAIN, STR_RIDE_DESCRIPTION_GHOST_TRAIN }, // RIDE_TYPE_GHOST_TRAIN
{ STR_RIDE_NAME_TWISTER_ROLLER_COASTER, STR_RIDE_DESCRIPTION_TWISTER_ROLLER_COASTER }, // RIDE_TYPE_TWISTER_ROLLER_COASTER
{ STR_RIDE_NAME_WOODEN_ROLLER_COASTER, STR_RIDE_DESCRIPTION_WOODEN_ROLLER_COASTER }, // RIDE_TYPE_WOODEN_ROLLER_COASTER
{ STR_RIDE_NAME_SIDE_FRICTION_ROLLER_COASTER, STR_RIDE_DESCRIPTION_SIDE_FRICTION_ROLLER_COASTER }, // RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER
{ STR_RIDE_NAME_WILD_MOUSE, STR_RIDE_DESCRIPTION_WILD_MOUSE }, // RIDE_TYPE_WILD_MOUSE
{ STR_RIDE_NAME_MULTI_DIMENSION_ROLLER_COASTER, STR_RIDE_DESCRIPTION_MULTI_DIMENSION_ROLLER_COASTER }, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER
{ STR_RIDE_NAME_38, STR_RIDE_DESCRIPTION_UNKNOWN }, // RIDE_TYPE_38
{ STR_RIDE_NAME_FLYING_ROLLER_COASTER, STR_RIDE_DESCRIPTION_FLYING_ROLLER_COASTER }, // RIDE_TYPE_FLYING_ROLLER_COASTER
{ STR_RIDE_NAME_3A, STR_RIDE_DESCRIPTION_UNKNOWN }, // RIDE_TYPE_3A
{ STR_RIDE_NAME_VIRGINIA_REEL, STR_RIDE_DESCRIPTION_VIRGINIA_REEL }, // RIDE_TYPE_VIRGINIA_REEL
{ STR_RIDE_NAME_SPLASH_BOATS, STR_RIDE_DESCRIPTION_SPLASH_BOATS }, // RIDE_TYPE_SPLASH_BOATS
{ STR_RIDE_NAME_MINI_HELICOPTERS, STR_RIDE_DESCRIPTION_MINI_HELICOPTERS }, // RIDE_TYPE_MINI_HELICOPTERS
{ STR_RIDE_NAME_LAY_DOWN_ROLLER_COASTER, STR_RIDE_DESCRIPTION_LAY_DOWN_ROLLER_COASTER }, // RIDE_TYPE_LAY_DOWN_ROLLER_COASTER
{ STR_RIDE_NAME_SUSPENDED_MONORAIL, STR_RIDE_DESCRIPTION_SUSPENDED_MONORAIL }, // RIDE_TYPE_SUSPENDED_MONORAIL
{ STR_RIDE_NAME_40, STR_RIDE_DESCRIPTION_UNKNOWN }, // RIDE_TYPE_40
{ STR_RIDE_NAME_REVERSER_ROLLER_COASTER, STR_RIDE_DESCRIPTION_REVERSER_ROLLER_COASTER }, // RIDE_TYPE_REVERSER_ROLLER_COASTER
{ STR_RIDE_NAME_HEARTLINE_TWISTER_COASTER, STR_RIDE_DESCRIPTION_HEARTLINE_TWISTER_COASTER }, // RIDE_TYPE_HEARTLINE_TWISTER_COASTER
{ STR_RIDE_NAME_MINI_GOLF, STR_RIDE_DESCRIPTION_MINI_GOLF }, // RIDE_TYPE_MINI_GOLF
{ STR_RIDE_NAME_GIGA_COASTER, STR_RIDE_DESCRIPTION_GIGA_COASTER }, // RIDE_TYPE_GIGA_COASTER
{ STR_RIDE_NAME_ROTO_DROP, STR_RIDE_DESCRIPTION_ROTO_DROP }, // RIDE_TYPE_ROTO_DROP
{ STR_RIDE_NAME_FLYING_SAUCERS, STR_RIDE_DESCRIPTION_FLYING_SAUCERS }, // RIDE_TYPE_FLYING_SAUCERS
{ STR_RIDE_NAME_CROOKED_HOUSE, STR_RIDE_DESCRIPTION_CROOKED_HOUSE }, // RIDE_TYPE_CROOKED_HOUSE
{ STR_RIDE_NAME_MONORAIL_CYCLES, STR_RIDE_DESCRIPTION_MONORAIL_CYCLES }, // RIDE_TYPE_MONORAIL_CYCLES
{ STR_RIDE_NAME_COMPACT_INVERTED_COASTER, STR_RIDE_DESCRIPTION_COMPACT_INVERTED_COASTER }, // RIDE_TYPE_COMPACT_INVERTED_COASTER
{ STR_RIDE_NAME_WATER_COASTER, STR_RIDE_DESCRIPTION_WATER_COASTER }, // RIDE_TYPE_WATER_COASTER
{ STR_RIDE_NAME_AIR_POWERED_VERTICAL_COASTER, STR_RIDE_DESCRIPTION_AIR_POWERED_VERTICAL_COASTER }, // RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER
{ STR_RIDE_NAME_INVERTED_HAIRPIN_COASTER, STR_RIDE_DESCRIPTION_INVERTED_HAIRPIN_COASTER }, // RIDE_TYPE_INVERTED_HAIRPIN_COASTER
{ STR_RIDE_NAME_MAGIC_CARPET, STR_RIDE_DESCRIPTION_MAGIC_CARPET }, // RIDE_TYPE_MAGIC_CARPET
{ STR_RIDE_NAME_SUBMARINE_RIDE, STR_RIDE_DESCRIPTION_SUBMARINE_RIDE }, // RIDE_TYPE_SUBMARINE_RIDE
{ STR_RIDE_NAME_RIVER_RAFTS, STR_RIDE_DESCRIPTION_RIVER_RAFTS }, // RIDE_TYPE_RIVER_RAFTS
{ STR_RIDE_NAME_50, STR_RIDE_DESCRIPTION_UNKNOWN }, // RIDE_TYPE_50
{ STR_RIDE_NAME_ENTERPRISE, STR_RIDE_DESCRIPTION_ENTERPRISE }, // RIDE_TYPE_ENTERPRISE
{ STR_RIDE_NAME_52, STR_RIDE_DESCRIPTION_UNKNOWN }, // RIDE_TYPE_52
{ STR_RIDE_NAME_53, STR_RIDE_DESCRIPTION_UNKNOWN }, // RIDE_TYPE_53
{ STR_RIDE_NAME_54, STR_RIDE_DESCRIPTION_UNKNOWN }, // RIDE_TYPE_54
{ STR_RIDE_NAME_55, STR_RIDE_DESCRIPTION_UNKNOWN }, // RIDE_TYPE_55
{ STR_RIDE_NAME_INVERTED_IMPULSE_COASTER, STR_RIDE_DESCRIPTION_INVERTED_IMPULSE_COASTER }, // RIDE_TYPE_INVERTED_IMPULSE_COASTER
{ STR_RIDE_NAME_MINI_ROLLER_COASTER, STR_RIDE_DESCRIPTION_MINI_ROLLER_COASTER }, // RIDE_TYPE_MINI_ROLLER_COASTER
{ STR_RIDE_NAME_MINE_RIDE, STR_RIDE_DESCRIPTION_MINE_RIDE }, // RIDE_TYPE_MINE_RIDE
{ STR_RIDE_NAME_59, STR_RIDE_DESCRIPTION_UNKNOWN }, // RIDE_TYPE_59
{ STR_RIDE_NAME_LIM_LAUNCHED_ROLLER_COASTER, STR_RIDE_DESCRIPTION_LIM_LAUNCHED_ROLLER_COASTER }, // RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER
};
/**
*
* rct2: 0x0097C8AC

View File

@ -54,6 +54,11 @@ typedef struct rct_ride_name_convention {
ride_component_type station;
} rct_ride_name_convention;
typedef struct rct_ride_name {
rct_string_id name;
rct_string_id description;
} rct_ride_name;
typedef struct rct_ride_entrance_definition {
uint32 sprite_index;
uint16 height;
@ -139,6 +144,7 @@ extern const uint8 rideBonusValue[0x60];
extern const ride_component_name RideComponentNames[RIDE_COMPONENT_TYPE_COUNT];
extern const rct_ride_name_convention RideNameConvention[96];
extern const rct_ride_name RideNaming[91];
extern const uint8 RideAvailableModes[];
extern const uint8 AllRideModesAvailable[];
extern const uint8 RideAvailableBreakdowns[];

View File

@ -1904,7 +1904,7 @@ static rct_string_id get_ride_type_string_id(const ObjectRepositoryItem * item)
for (int i = 0; i < 3; i++) {
uint8 rideType = item->RideType[i];
if (rideType != 255) {
result = STR_RIDE_NAME_SPIRAL_ROLLER_COASTER + rideType;
result = RideNaming[rideType].name;
break;
}
}

View File

@ -873,8 +873,8 @@ static void window_new_ride_paint_ride_information(rct_window *w, rct_drawpixeli
rct_string_id rideName = rideEntry->name;
rct_string_id rideDescription = rideEntry->description;
if (!(rideEntry->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME) || rideTypeShouldLoseSeparateFlag(rideEntry)) {
rideName = item.type + 2;
rideDescription = item.type + 512;
rideName = RideNaming[item.type].name;
rideDescription = RideNaming[item.type].description;
}
set_format_arg(0, rct_string_id, rideName);

View File

@ -2405,7 +2405,7 @@ static void window_ride_main_invalidate(rct_window *w)
set_format_arg(0, uint16, ride->name);
set_format_arg(2, uint32, ride->name_arguments);
set_format_arg(6, uint16, _rideType + STR_RIDE_NAME_SPIRAL_ROLLER_COASTER);
set_format_arg(6, uint16, RideNaming[_rideType].name);
uint32 spriteIds[] = {
SPR_CLOSED,
SPR_OPEN,

View File

@ -25,6 +25,7 @@
#include "../world/map.h"
#include "../world/footpath.h"
#include "../sprites.h"
#include "../ride/ride_data.h"
static const rct_string_id TerrainTypes[] = {
STR_TILE_INSPECTOR_TERRAIN_GRASS,
@ -650,7 +651,7 @@ static void window_tile_inspector_scrollpaint(rct_window *w, rct_drawpixelinfo *
sprintf(
buffer,
"Track (%s)",
language_get_string(STR_RIDE_NAME_SPIRAL_ROLLER_COASTER + get_ride(element->properties.track.ride_index)->type)
language_get_string(RideNaming[get_ride(element->properties.track.ride_index)->type].name)
);
type_name = buffer;
break;