mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 15:24:30 +01:00
Code Issues Releases Wiki Activity

refactor ride names and show ride type/s on object selection window

Browse Source
This commit is contained in:
IntelOrca
2015-06-03 19:14:45 +01:00
parent 0910f97fdf
commit ab2e6a867f
9 changed files with 114 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/management/award.c
View File

@@ -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

6
src/peep/peep.c
View File

@@ -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;

4
src/rct1.h
View File

@@ -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,

2
src/ride/ride.c
View File

@@ -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) {

14
src/ride/ride.h
View File

@@ -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 {

18
src/windows/editor_object_selection.c
View File

@@ -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);

12
src/windows/new_ride.c
View File

@@ -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

6
src/windows/ride.c
View File

@@ -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))