mirror of https://github.com/OpenRCT2/OpenRCT2.git
refactor ride names and show ride type/s on object selection window
This commit is contained in:
parent
0910f97fdf
commit
ab2e6a867f
|
@ -3,97 +3,97 @@
|
|||
# Use # at the beginning of a line to leave a comment.
|
||||
STR_0000 :
|
||||
STR_0001 :{STRINGID} {COMMA16}
|
||||
STR_0002 :Ride
|
||||
STR_0003 :Ride
|
||||
STR_0002 :Spiral Roller Coaster
|
||||
STR_0003 :Stand-up Roller Coaster
|
||||
STR_0004 :Suspended Swinging Coaster
|
||||
STR_0005 :Ride
|
||||
STR_0005 :Inverted Roller Coaster
|
||||
STR_0006 :Junior Roller Coaster
|
||||
STR_0007 :Miniature Railway
|
||||
STR_0008 :Monorail
|
||||
STR_0009 :Mini Suspended Coaster
|
||||
STR_0010 :Ride
|
||||
STR_0011 :Ride
|
||||
STR_0012 :Ride
|
||||
STR_0010 :Boat Ride
|
||||
STR_0011 :Wooden Wild Mouse
|
||||
STR_0012 :Steeplechase
|
||||
STR_0013 :Car Ride
|
||||
STR_0014 :Ride
|
||||
STR_0015 :Ride
|
||||
STR_0016 :Ride
|
||||
STR_0014 :Launched Freefall
|
||||
STR_0015 :Bobsleigh Coaster
|
||||
STR_0016 :Observation Tower
|
||||
STR_0017 :Looping Roller Coaster
|
||||
STR_0018 :Ride
|
||||
STR_0019 :Ride
|
||||
STR_0018 :Dinghy Slide
|
||||
STR_0019 :Mine Train Coaster
|
||||
STR_0020 :Chairlift
|
||||
STR_0021 :Ride
|
||||
STR_0022 :Ride
|
||||
STR_0023 :Ride
|
||||
STR_0024 :Ride
|
||||
STR_0025 :Ride
|
||||
STR_0026 :Ride
|
||||
STR_0027 :Ride
|
||||
STR_0028 :Ride
|
||||
STR_0029 :Ride
|
||||
STR_0030 :Stall
|
||||
STR_0031 :Stall
|
||||
STR_0032 :Stall
|
||||
STR_0033 :Stall
|
||||
STR_0034 :Stall
|
||||
STR_0035 :Ride
|
||||
STR_0036 :Stall
|
||||
STR_0037 :Kiosk
|
||||
STR_0038 :Toilet
|
||||
STR_0039 :Ride
|
||||
STR_0040 :Ride
|
||||
STR_0041 :Ride
|
||||
STR_0042 :Ride
|
||||
STR_0043 :Ride
|
||||
STR_0021 :Corkscrew Roller Coaster
|
||||
STR_0022 :Maze
|
||||
STR_0023 :Spiral Slide
|
||||
STR_0024 :Go Karts
|
||||
STR_0025 :Log Flume
|
||||
STR_0026 :River Rapids
|
||||
STR_0027 :Dodgems
|
||||
STR_0028 :Pirate Ship
|
||||
STR_0029 :Swinging Inverter Ship
|
||||
STR_0030 :Food Stall
|
||||
STR_0031 :Unknown Stall (1D)
|
||||
STR_0032 :Drink Stall
|
||||
STR_0033 :Unknown Stall (1F)
|
||||
STR_0034 :Shop
|
||||
STR_0035 :Merry-Go-Round
|
||||
STR_0036 :Unknown Stall (22)
|
||||
STR_0037 :Information Kiosk
|
||||
STR_0038 :Toilets
|
||||
STR_0039 :Ferris Wheel
|
||||
STR_0040 :Motion Simulator
|
||||
STR_0041 :3D Cinema
|
||||
STR_0042 :Top Spin
|
||||
STR_0043 :Space Rings
|
||||
STR_0044 :Reverse Freefall Coaster
|
||||
STR_0045 :Lift
|
||||
STR_0046 :Ride
|
||||
STR_0047 :Ride
|
||||
STR_0048 :Ride
|
||||
STR_0049 :Ride
|
||||
STR_0050 :Ride
|
||||
STR_0051 :Ride
|
||||
STR_0052 :Ride
|
||||
STR_0053 :Hyper-Twister Roller Coaster
|
||||
STR_0046 :Vertical Drop Roller Coaster
|
||||
STR_0047 :Cash Machine
|
||||
STR_0048 :Twist
|
||||
STR_0049 :Haunted House
|
||||
STR_0050 :First Aid Room
|
||||
STR_0051 :Circus Show
|
||||
STR_0052 :Ghost Train
|
||||
STR_0053 :Twister Roller Coaster
|
||||
STR_0054 :Wooden Roller Coaster
|
||||
STR_0055 :Side-Friction Roller Coaster
|
||||
STR_0056 :Wild Mouse
|
||||
STR_0057 :Multi-Dimension Roller Coaster
|
||||
STR_0058 :Ride
|
||||
STR_0059 :Aerial Inverted Roller Coaster
|
||||
STR_0060 :Ride
|
||||
STR_0061 :Ride
|
||||
STR_0062 :Ride
|
||||
STR_0063 :Ride
|
||||
STR_0064 :Ride
|
||||
STR_0058 :Unknown Ride (38)
|
||||
STR_0059 :Flying Roller Coaster
|
||||
STR_0060 :Unknown Ride (3A)
|
||||
STR_0061 :Virginia Reel
|
||||
STR_0062 :Splash Boats
|
||||
STR_0063 :Mini Helicopters
|
||||
STR_0064 :Lay-down Roller Coaster
|
||||
STR_0065 :Suspended Monorail
|
||||
STR_0066 :Ride
|
||||
STR_0067 :Ride
|
||||
STR_0066 :Unknown Ride (40)
|
||||
STR_0067 :Reverser Roller Coaster
|
||||
STR_0068 :Heartline Twister Coaster
|
||||
STR_0069 :Ride
|
||||
STR_0070 :Ride
|
||||
STR_0071 :Ride
|
||||
STR_0072 :Ride
|
||||
STR_0073 :Ride
|
||||
STR_0074 :Ride
|
||||
STR_0075 :Ride
|
||||
STR_0069 :Mini Golf
|
||||
STR_0070 :Giga Coaster
|
||||
STR_0071 :Roto-Drop
|
||||
STR_0072 :Flying Saucers
|
||||
STR_0073 :Crooked House
|
||||
STR_0074 :Monorail Cycles
|
||||
STR_0075 :Compact Inverted Coaster
|
||||
STR_0076 :Water Coaster
|
||||
STR_0077 :Ride
|
||||
STR_0078 :Ride
|
||||
STR_0079 :Ride
|
||||
STR_0080 :Ride
|
||||
STR_0081 :Ride
|
||||
STR_0082 :Ride
|
||||
STR_0083 :Ride
|
||||
STR_0084 :Ride
|
||||
STR_0085 :Ride
|
||||
STR_0086 :Ride
|
||||
STR_0087 :Ride
|
||||
STR_0088 :Ride
|
||||
STR_0077 :Air Powered Vertical Coaster
|
||||
STR_0078 :Inverted Hairpin Coaster
|
||||
STR_0079 :Magic Carpet
|
||||
STR_0080 :Submarine Ride
|
||||
STR_0081 :River Rafts
|
||||
STR_0082 :Unknown Ride (50)
|
||||
STR_0083 :Enterprise
|
||||
STR_0084 :Unknown Ride (52)
|
||||
STR_0085 :Unknown Ride (53)
|
||||
STR_0086 :Unknown Ride (54)
|
||||
STR_0087 :Unknown Ride (55)
|
||||
STR_0088 :Inverted Impulse Coaster
|
||||
STR_0089 :Mini Roller Coaster
|
||||
STR_0090 :Ride
|
||||
STR_0091 :Ride
|
||||
STR_0092 :Ride
|
||||
STR_0090 :Mine Ride
|
||||
STR_0091 :Unknown Ride (59)
|
||||
STR_0092 :LIM Launched Roller Coaster
|
||||
STR_0093 :
|
||||
STR_0094 :
|
||||
STR_0095 :
|
||||
|
|
|
@ -374,7 +374,7 @@ static int award_is_deserved_best_restrooms(int awardType, int activeAwardTypes)
|
|||
// Count open restrooms
|
||||
numRestrooms = 0;
|
||||
FOR_ALL_RIDES(i, ride)
|
||||
if (ride->type == RIDE_TYPE_BATHROOM && ride->status == RIDE_STATUS_OPEN)
|
||||
if (ride->type == RIDE_TYPE_TOILETS && ride->status == RIDE_STATUS_OPEN)
|
||||
numRestrooms++;
|
||||
|
||||
// At least 4 open restrooms
|
||||
|
|
|
@ -3337,7 +3337,7 @@ static void peep_update_buying(rct_peep* peep)
|
|||
return;
|
||||
}
|
||||
|
||||
if (ride->type == RIDE_TYPE_ATM){
|
||||
if (ride->type == RIDE_TYPE_CASH_MACHINE){
|
||||
if (peep->current_ride != peep->previous_ride){
|
||||
peep->cash_in_pocket += MONEY(50,00);
|
||||
}
|
||||
|
@ -3357,7 +3357,7 @@ static void peep_update_buying(rct_peep* peep)
|
|||
uint8 item_bought = 0;
|
||||
|
||||
if (peep->current_ride != peep->previous_ride){
|
||||
if (ride->type == RIDE_TYPE_ATM){
|
||||
if (ride->type == RIDE_TYPE_CASH_MACHINE){
|
||||
item_bought = !(RCT2_CALLPROC_X(0x0069AEB7, peep->current_ride << 8, 0, 0, 0, (int)peep, 0, 0) & 0x100);
|
||||
|
||||
if (!item_bought){
|
||||
|
@ -5272,7 +5272,7 @@ static void peep_stop_purchase_thought(rct_peep* peep, uint8 ride_type){
|
|||
thought_type = PEEP_THOUGHT_TYPE_THIRSTY;
|
||||
if (!(RCT2_ADDRESS(0x97CF40, uint32)[ride_type * 2] & 0x1000000)){
|
||||
thought_type = PEEP_THOUGHT_RUNNING_OUT;
|
||||
if (ride_type != RIDE_TYPE_ATM){
|
||||
if (ride_type != RIDE_TYPE_CASH_MACHINE){
|
||||
thought_type = PEEP_THOUGHT_TYPE_BATHROOM;
|
||||
if (!(RCT2_ADDRESS(0x97CF40, uint32)[ride_type * 2] & 0x2000000)){
|
||||
return;
|
||||
|
|
|
@ -236,7 +236,7 @@ enum {
|
|||
RCT1_RIDE_TYPE_GO_KARTS,
|
||||
RCT1_RIDE_TYPE_LOG_FLUME,
|
||||
RCT1_RIDE_TYPE_RIVER_RAPIDS,
|
||||
RCT1_RIDE_TYPE_BUMPER_CARS,
|
||||
RCT1_RIDE_TYPE_DODGEMS,
|
||||
RCT1_RIDE_TYPE_SWINGING_SHIP,
|
||||
RCT1_RIDE_TYPE_SWINGING_INVERTER_SHIP,
|
||||
RCT1_RIDE_TYPE_ICE_CREAM_STALL,
|
||||
|
@ -247,7 +247,7 @@ enum {
|
|||
RCT1_RIDE_TYPE_MERRY_GO_ROUND,
|
||||
RCT1_RIDE_TYPE_BALLOON_STALL,
|
||||
RCT1_RIDE_TYPE_INFORMATION_KIOSK,
|
||||
RCT1_RIDE_TYPE_BATHROOM,
|
||||
RCT1_RIDE_TYPE_TOILETS,
|
||||
RCT1_RIDE_TYPE_FERRIS_WHEEL,
|
||||
RCT1_RIDE_TYPE_MOTION_SIMULATOR,
|
||||
RCT1_RIDE_TYPE_3D_CINEMA,
|
||||
|
|
|
@ -3475,7 +3475,7 @@ void sub_6B4D26(int rideIndex, rct_xy_element *startElement)
|
|||
int trackType;
|
||||
|
||||
ride = GET_RIDE(rideIndex);
|
||||
if (ride->type == RIDE_TYPE_BUMPER_BOATS) {
|
||||
if (ride->type == RIDE_TYPE_BOAT_RIDE) {
|
||||
|
||||
} else if (ride->type != RIDE_TYPE_MAZE) {
|
||||
|
||||
|
|
|
@ -380,7 +380,7 @@ enum {
|
|||
RIDE_TYPE_MINIATURE_RAILWAY,
|
||||
RIDE_TYPE_MONORAIL,
|
||||
RIDE_TYPE_MINI_SUSPENDED_COASTER,
|
||||
RIDE_TYPE_BUMPER_BOATS,
|
||||
RIDE_TYPE_BOAT_RIDE,
|
||||
RIDE_TYPE_WOODEN_WILD_MOUSE,
|
||||
RIDE_TYPE_STEEPLECHASE = 10,
|
||||
RIDE_TYPE_CAR_RIDE,
|
||||
|
@ -397,7 +397,7 @@ enum {
|
|||
RIDE_TYPE_GO_KARTS,
|
||||
RIDE_TYPE_LOG_FLUME,
|
||||
RIDE_TYPE_RIVER_RAPIDS,
|
||||
RIDE_TYPE_BUMPER_CARS,
|
||||
RIDE_TYPE_DODGEMS,
|
||||
RIDE_TYPE_PIRATE_SHIP,
|
||||
RIDE_TYPE_SWINGING_INVERTER_SHIP,
|
||||
RIDE_TYPE_FOOD_STALL,
|
||||
|
@ -408,16 +408,16 @@ enum {
|
|||
RIDE_TYPE_MERRY_GO_ROUND,
|
||||
RIDE_TYPE_22,
|
||||
RIDE_TYPE_INFORMATION_KIOSK,
|
||||
RIDE_TYPE_BATHROOM,
|
||||
RIDE_TYPE_TOILETS,
|
||||
RIDE_TYPE_FERRIS_WHEEL,
|
||||
RIDE_TYPE_MOTION_SIMULATOR,
|
||||
RIDE_TYPE_3D_CINEMA,
|
||||
RIDE_TYPE_TOP_SPIN = 40,
|
||||
RIDE_TYPE_SPACE_RINGS,
|
||||
RIDE_TYPE_REVERSE_FREEFALL_COASTER,
|
||||
RIDE_TYPE_ELEVATOR,
|
||||
RIDE_TYPE_LIFT,
|
||||
RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER,
|
||||
RIDE_TYPE_ATM,
|
||||
RIDE_TYPE_CASH_MACHINE,
|
||||
RIDE_TYPE_TWIST,
|
||||
RIDE_TYPE_HAUNTED_HOUSE,
|
||||
RIDE_TYPE_FIRST_AID,
|
||||
|
@ -461,8 +461,8 @@ enum {
|
|||
RIDE_TYPE_INVERTED_IMPULSE_COASTER,
|
||||
RIDE_TYPE_MINI_ROLLER_COASTER,
|
||||
RIDE_TYPE_MINE_RIDE,
|
||||
RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER,
|
||||
RIDE_TYPE_90 = 90
|
||||
RIDE_TYPE_59,
|
||||
RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER = 90
|
||||
};
|
||||
|
||||
enum {
|
||||
|
|
|
@ -761,6 +761,24 @@ static void window_editor_object_selection_paint()
|
|||
}
|
||||
gfx_draw_string_right(dpi, stringId, NULL, 2, w->x + w->width - 5, w->y + w->height - 3 - 12 - 14);
|
||||
|
||||
//
|
||||
if (w->selected_tab == WINDOW_OBJECT_SELECTION_PAGE_RIDE_VEHICLES_ATTRACTIONS) {
|
||||
y = w->y + w->height - 3 - 12 - 14 - 14;
|
||||
|
||||
rct_ride_type *rideType = (rct_ride_type*)stex_entry;
|
||||
for (int i = 0; i < 3; i++) {
|
||||
if (rideType->ride_type[i] == 255)
|
||||
continue;
|
||||
|
||||
stringId = 2 + rideType->ride_type[i];
|
||||
gfx_draw_string_right(dpi, stringId, NULL, 2, w->x + w->width - 5, y);
|
||||
y -= 11;
|
||||
}
|
||||
}
|
||||
|
||||
//stringId = highlightedEntry->checksum
|
||||
// gfx_draw_string_right(dpi, stringId, NULL, 2, w->x + w->width - 5, w->y + w->height - 3 - 12 - 14);
|
||||
|
||||
// Draw object dat name
|
||||
stringId = 3165;
|
||||
strcpy(stringBuffer, datName);
|
||||
|
|
|
@ -46,7 +46,7 @@ const char RideTypeViewOrder[] = {
|
|||
RIDE_TYPE_MONORAIL,
|
||||
RIDE_TYPE_SUSPENDED_MONORAIL,
|
||||
RIDE_TYPE_CHAIRLIFT,
|
||||
RIDE_TYPE_ELEVATOR,
|
||||
RIDE_TYPE_LIFT,
|
||||
|
||||
// Roller Coasters
|
||||
RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER,
|
||||
|
@ -63,7 +63,7 @@ const char RideTypeViewOrder[] = {
|
|||
RIDE_TYPE_LOOPING_ROLLER_COASTER,
|
||||
RIDE_TYPE_STAND_UP_ROLLER_COASTER,
|
||||
RIDE_TYPE_CORKSCREW_ROLLER_COASTER,
|
||||
RIDE_TYPE_90,
|
||||
RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER,
|
||||
RIDE_TYPE_TWISTER_ROLLER_COASTER,
|
||||
RIDE_TYPE_GIGA_COASTER,
|
||||
RIDE_TYPE_SUSPENDED_SWINGING_COASTER,
|
||||
|
@ -94,7 +94,7 @@ const char RideTypeViewOrder[] = {
|
|||
RIDE_TYPE_CAR_RIDE,
|
||||
RIDE_TYPE_MINI_HELICOPTERS,
|
||||
RIDE_TYPE_SPIRAL_SLIDE,
|
||||
RIDE_TYPE_BUMPER_CARS,
|
||||
RIDE_TYPE_DODGEMS,
|
||||
RIDE_TYPE_SPACE_RINGS,
|
||||
RIDE_TYPE_CIRCUS_SHOW,
|
||||
RIDE_TYPE_GHOST_TRAIN,
|
||||
|
@ -119,7 +119,7 @@ const char RideTypeViewOrder[] = {
|
|||
RIDE_TYPE_RIVER_RAPIDS,
|
||||
RIDE_TYPE_SPLASH_BOATS,
|
||||
RIDE_TYPE_SUBMARINE_RIDE,
|
||||
RIDE_TYPE_BUMPER_BOATS,
|
||||
RIDE_TYPE_BOAT_RIDE,
|
||||
RIDE_TYPE_RIVER_RAFTS,
|
||||
RIDE_TYPE_WATER_COASTER,
|
||||
|
||||
|
@ -132,8 +132,8 @@ const char RideTypeViewOrder[] = {
|
|||
RIDE_TYPE_22,
|
||||
RIDE_TYPE_INFORMATION_KIOSK,
|
||||
RIDE_TYPE_FIRST_AID,
|
||||
RIDE_TYPE_ATM,
|
||||
RIDE_TYPE_BATHROOM
|
||||
RIDE_TYPE_CASH_MACHINE,
|
||||
RIDE_TYPE_TOILETS
|
||||
};
|
||||
|
||||
#pragma endregion
|
||||
|
|
|
@ -1131,7 +1131,7 @@ void window_ride_disable_tabs(rct_window *w)
|
|||
if ((RCT2_GLOBAL(0x97D4F2 + ride_type * 8, uint32) & 0x4) == 0)
|
||||
disabled_tabs |= (1 << WIDX_TAB_6); // 0x200
|
||||
|
||||
if (ride_type == RIDE_TYPE_ATM ||
|
||||
if (ride_type == RIDE_TYPE_CASH_MACHINE ||
|
||||
ride_type == RIDE_TYPE_FIRST_AID ||
|
||||
(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_NO_MONEY) != 0)
|
||||
disabled_tabs |= (1 << WIDX_TAB_9); // 0x1000
|
||||
|
@ -5510,7 +5510,7 @@ static void window_ride_income_invalidate()
|
|||
w->disabled_widgets &= ~(1 << WIDX_PRIMARY_PRICE);
|
||||
|
||||
//If the park doesn't have free entry, lock the admission price, unless the cheat to unlock all prices is activated.
|
||||
if ((!(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_PARK_FREE_ENTRY) && rideEntry->shop_item == 255 && ride->type != RIDE_TYPE_BATHROOM)
|
||||
if ((!(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_PARK_FREE_ENTRY) && rideEntry->shop_item == 255 && ride->type != RIDE_TYPE_TOILETS)
|
||||
&& (!gConfigCheat.unlock_all_prices))
|
||||
{
|
||||
w->disabled_widgets |= (1 << WIDX_PRIMARY_PRICE);
|
||||
|
@ -5526,7 +5526,7 @@ static void window_ride_income_invalidate()
|
|||
window_ride_income_widgets[WIDX_PRIMARY_PRICE].image = STR_FREE;
|
||||
|
||||
primaryItem = 31;
|
||||
if (ride->type == RIDE_TYPE_BATHROOM || ((primaryItem = (sint8)rideEntry->shop_item) != -1)) {
|
||||
if (ride->type == RIDE_TYPE_TOILETS || ((primaryItem = (sint8)rideEntry->shop_item) != -1)) {
|
||||
window_ride_income_widgets[WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK].type = WWT_CHECKBOX;
|
||||
if (primaryItem < 32) {
|
||||
if (RCT2_GLOBAL(0x01358838, uint32) & (1 << primaryItem))
|
||||
|
|
Loading…
Reference in New Issue