mirror of https://github.com/OpenRCT2/OpenRCT2.git
Clean up sub_69101A, use constants for undefined excitement ratings, fixes #5481
This commit is contained in:
parent
6d32c38fb3
commit
6bd34c1e55
|
@ -441,7 +441,7 @@ static sint32 award_is_deserved_most_disappointing(sint32 awardType, sint32 acti
|
||||||
disappointingRides = 0;
|
disappointingRides = 0;
|
||||||
|
|
||||||
FOR_ALL_RIDES(i, ride) {
|
FOR_ALL_RIDES(i, ride) {
|
||||||
if (ride->excitement == (ride_rating)(uint16)0xFFFF || ride->popularity == 0xFF)
|
if (ride->excitement == RIDE_RATING_UNDEFINED || ride->popularity == 0xFF)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
countedRides++;
|
countedRides++;
|
||||||
|
|
|
@ -11310,37 +11310,38 @@ static void peep_easter_egg_peep_interactions(rct_peep *peep)
|
||||||
*
|
*
|
||||||
* @return (CF)
|
* @return (CF)
|
||||||
*/
|
*/
|
||||||
static bool sub_69101A(rct_map_element *esi) {
|
static bool peep_should_watch_ride(rct_map_element *mapElement) {
|
||||||
rct_ride *ride = get_ride(esi->properties.track.ride_index);
|
rct_ride *ride = get_ride(mapElement->properties.track.ride_index);
|
||||||
if (gRideClassifications[ride->type] != RIDE_CLASS_RIDE) {
|
if (gRideClassifications[ride->type] != RIDE_CLASS_RIDE) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// This is most likely to have peeps watch new rides
|
||||||
|
if (ride->excitement == RIDE_RATING_UNDEFINED) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((uint16) ride->excitement == 0xFFFF) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ride->excitement >= RIDE_RATING(4, 70)) {
|
if (ride->excitement >= RIDE_RATING(4, 70)) {
|
||||||
return false;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ride->intensity >= RIDE_RATING(4, 50)) {
|
if (ride->intensity >= RIDE_RATING(4, 50)) {
|
||||||
return false;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (RideData4[ride->type].flags & RIDE_TYPE_FLAG4_INTERESTING_TO_LOOK_AT) {
|
if (RideData4[ride->type].flags & RIDE_TYPE_FLAG4_INTERESTING_TO_LOOK_AT) {
|
||||||
if ((scenario_rand() & 0xFFFF) > 0x3333) {
|
if ((scenario_rand() & 0xFFFF) > 0x3333) {
|
||||||
return true;
|
return false;
|
||||||
}
|
}
|
||||||
} else if (RideData4[ride->type].flags & RIDE_TYPE_FLAG4_SLIGHTLY_INTERESTING_TO_LOOK_AT) {
|
} else if (RideData4[ride->type].flags & RIDE_TYPE_FLAG4_SLIGHTLY_INTERESTING_TO_LOOK_AT) {
|
||||||
if ((scenario_rand() & 0xFFFF) > 0x1000) {
|
if ((scenario_rand() & 0xFFFF) > 0x1000) {
|
||||||
return true;
|
return false;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
return true;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -11400,7 +11401,7 @@ static bool peep_find_ride_to_look_at(rct_peep *peep, uint8 edge, uint8 *rideToV
|
||||||
if (peep->next_z + 6 < mapElement->base_height) continue;
|
if (peep->next_z + 6 < mapElement->base_height) continue;
|
||||||
|
|
||||||
if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_TRACK) {
|
if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_TRACK) {
|
||||||
if (!sub_69101A(mapElement)) {
|
if (peep_should_watch_ride(mapElement)) {
|
||||||
return loc_690FD0(peep, rideToView, rideSeatToView, mapElement);
|
return loc_690FD0(peep, rideToView, rideSeatToView, mapElement);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -11469,7 +11470,7 @@ static bool peep_find_ride_to_look_at(rct_peep *peep, uint8 edge, uint8 *rideToV
|
||||||
if (peep->next_z + 8 < mapElement->base_height) continue;
|
if (peep->next_z + 8 < mapElement->base_height) continue;
|
||||||
|
|
||||||
if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_TRACK) {
|
if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_TRACK) {
|
||||||
if (!sub_69101A(mapElement)) {
|
if (peep_should_watch_ride(mapElement)) {
|
||||||
return loc_690FD0(peep, rideToView, rideSeatToView, mapElement);
|
return loc_690FD0(peep, rideToView, rideSeatToView, mapElement);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -11537,7 +11538,7 @@ static bool peep_find_ride_to_look_at(rct_peep *peep, uint8 edge, uint8 *rideToV
|
||||||
if (peep->next_z + 10 < mapElement->base_height) continue;
|
if (peep->next_z + 10 < mapElement->base_height) continue;
|
||||||
|
|
||||||
if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_TRACK) {
|
if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_TRACK) {
|
||||||
if (!sub_69101A(mapElement)) {
|
if (peep_should_watch_ride(mapElement)) {
|
||||||
return loc_690FD0(peep, rideToView, rideSeatToView, mapElement);
|
return loc_690FD0(peep, rideToView, rideSeatToView, mapElement);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -11565,7 +11566,7 @@ bool loc_690FD0(rct_peep *peep, uint8 *rideToView, uint8 *rideSeatToView, rct_ma
|
||||||
rct_ride *ride = get_ride(esi->properties.track.ride_index);
|
rct_ride *ride = get_ride(esi->properties.track.ride_index);
|
||||||
|
|
||||||
*rideToView = esi->properties.track.ride_index;
|
*rideToView = esi->properties.track.ride_index;
|
||||||
if ((uint16) ride->excitement == 0xFFFF) {
|
if (ride->excitement == RIDE_RATING_UNDEFINED) {
|
||||||
*rideSeatToView = 1;
|
*rideSeatToView = 1;
|
||||||
if (ride->status != RIDE_STATUS_OPEN) {
|
if (ride->status != RIDE_STATUS_OPEN) {
|
||||||
if (esi->clearance_height > peep->next_z + 8) {
|
if (esi->clearance_height > peep->next_z + 8) {
|
||||||
|
|
|
@ -7280,7 +7280,7 @@ void invalidate_test_results(sint32 rideIndex)
|
||||||
rct_ride *ride = get_ride(rideIndex);
|
rct_ride *ride = get_ride(rideIndex);
|
||||||
|
|
||||||
ride_measurement_clear(ride);
|
ride_measurement_clear(ride);
|
||||||
ride->excitement = 0xFFFF;
|
ride->excitement = RIDE_RATING_UNDEFINED;
|
||||||
ride->lifecycle_flags &= ~RIDE_LIFECYCLE_TESTED;
|
ride->lifecycle_flags &= ~RIDE_LIFECYCLE_TESTED;
|
||||||
ride->lifecycle_flags &= ~RIDE_LIFECYCLE_TEST_IN_PROGRESS;
|
ride->lifecycle_flags &= ~RIDE_LIFECYCLE_TEST_IN_PROGRESS;
|
||||||
if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK) {
|
if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK) {
|
||||||
|
|
|
@ -5202,7 +5202,7 @@ static void window_ride_measurements_invalidate(rct_window *w)
|
||||||
window_ride_measurements_widgets[WIDX_SAVE_TRACK_DESIGN].type = WWT_FLATBTN;
|
window_ride_measurements_widgets[WIDX_SAVE_TRACK_DESIGN].type = WWT_FLATBTN;
|
||||||
w->disabled_widgets |= (1 << WIDX_SAVE_TRACK_DESIGN);
|
w->disabled_widgets |= (1 << WIDX_SAVE_TRACK_DESIGN);
|
||||||
if (ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED) {
|
if (ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED) {
|
||||||
if (ride->excitement != -1) {
|
if (ride->excitement != RIDE_RATING_UNDEFINED) {
|
||||||
w->disabled_widgets &= ~(1 << WIDX_SAVE_TRACK_DESIGN);
|
w->disabled_widgets &= ~(1 << WIDX_SAVE_TRACK_DESIGN);
|
||||||
window_ride_measurements_widgets[WIDX_SAVE_TRACK_DESIGN].tooltip = STR_SAVE_TRACK_DESIGN;
|
window_ride_measurements_widgets[WIDX_SAVE_TRACK_DESIGN].tooltip = STR_SAVE_TRACK_DESIGN;
|
||||||
}
|
}
|
||||||
|
@ -5245,7 +5245,7 @@ static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi
|
||||||
// Excitement
|
// Excitement
|
||||||
set_format_arg(0, uint32, ride->excitement);
|
set_format_arg(0, uint32, ride->excitement);
|
||||||
set_format_arg(4, rct_string_id, RatingNames[min(ride->excitement >> 8, 5)]);
|
set_format_arg(4, rct_string_id, RatingNames[min(ride->excitement >> 8, 5)]);
|
||||||
rct_string_id stringId = ride->excitement == -1 ? STR_EXCITEMENT_RATING_NOT_YET_AVAILABLE : STR_EXCITEMENT_RATING;
|
rct_string_id stringId = ride->excitement == RIDE_RATING_UNDEFINED ? STR_EXCITEMENT_RATING_NOT_YET_AVAILABLE : STR_EXCITEMENT_RATING;
|
||||||
gfx_draw_string_left(dpi, stringId, gCommonFormatArgs, COLOUR_BLACK, x, y);
|
gfx_draw_string_left(dpi, stringId, gCommonFormatArgs, COLOUR_BLACK, x, y);
|
||||||
y += 10;
|
y += 10;
|
||||||
|
|
||||||
|
@ -5254,7 +5254,7 @@ static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi
|
||||||
set_format_arg(4, rct_string_id, RatingNames[min(ride->intensity >> 8, 5)]);
|
set_format_arg(4, rct_string_id, RatingNames[min(ride->intensity >> 8, 5)]);
|
||||||
|
|
||||||
stringId = STR_INTENSITY_RATING;
|
stringId = STR_INTENSITY_RATING;
|
||||||
if (ride->excitement == -1)
|
if (ride->excitement == RIDE_RATING_UNDEFINED)
|
||||||
stringId = STR_INTENSITY_RATING_NOT_YET_AVAILABLE;
|
stringId = STR_INTENSITY_RATING_NOT_YET_AVAILABLE;
|
||||||
else if (ride->intensity >= RIDE_RATING(10,00))
|
else if (ride->intensity >= RIDE_RATING(10,00))
|
||||||
stringId = STR_INTENSITY_RATING_RED;
|
stringId = STR_INTENSITY_RATING_RED;
|
||||||
|
@ -5265,7 +5265,7 @@ static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi
|
||||||
// Nausea
|
// Nausea
|
||||||
set_format_arg(0, uint32, ride->nausea);
|
set_format_arg(0, uint32, ride->nausea);
|
||||||
set_format_arg(4, rct_string_id, RatingNames[min(ride->nausea >> 8, 5)]);
|
set_format_arg(4, rct_string_id, RatingNames[min(ride->nausea >> 8, 5)]);
|
||||||
stringId = ride->excitement == -1 ? STR_NAUSEA_RATING_NOT_YET_AVAILABLE : STR_NAUSEA_RATING;
|
stringId = ride->excitement == RIDE_RATING_UNDEFINED ? STR_NAUSEA_RATING_NOT_YET_AVAILABLE : STR_NAUSEA_RATING;
|
||||||
gfx_draw_string_left(dpi, stringId, gCommonFormatArgs, COLOUR_BLACK, x, y);
|
gfx_draw_string_left(dpi, stringId, gCommonFormatArgs, COLOUR_BLACK, x, y);
|
||||||
y += 20;
|
y += 20;
|
||||||
|
|
||||||
|
|
|
@ -240,7 +240,7 @@ sint32 calculate_park_rating()
|
||||||
FOR_ALL_RIDES(i, ride) {
|
FOR_ALL_RIDES(i, ride) {
|
||||||
total_ride_uptime += 100 - ride->downtime;
|
total_ride_uptime += 100 - ride->downtime;
|
||||||
|
|
||||||
if (ride->excitement != -1){
|
if (ride->excitement != RIDE_RATING_UNDEFINED){
|
||||||
total_ride_excitement += ride->excitement / 8;
|
total_ride_excitement += ride->excitement / 8;
|
||||||
total_ride_intensity += ride->intensity / 8;
|
total_ride_intensity += ride->intensity / 8;
|
||||||
num_exciting_rides++;
|
num_exciting_rides++;
|
||||||
|
|
Loading…
Reference in New Issue