diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 02d07c915b..afbdb1daf5 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -2933,21 +2933,21 @@ static void window_ride_vehicle_paint(rct_window *w, rct_drawpixelinfo *dpi) if (!(rideEntry->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE) || rideTypeShouldLoseSeparateFlag(rideEntry)) { // Excitement Factor - factor = rideEntry->excitement_multipler; + factor = rideEntry->excitement_multiplier; if (factor > 0) { y += 10; gfx_draw_string_left(dpi, STR_EXCITEMENT_FACTOR, &factor, COLOUR_BLACK, x, y); } // Intensity Factor - factor = rideEntry->intensity_multipler; + factor = rideEntry->intensity_multiplier; if (factor > 0) { y += 10; gfx_draw_string_left(dpi, STR_INTENSITY_FACTOR, &factor, COLOUR_BLACK, x, y); } // Nausea Factor - factor = rideEntry->nausea_multipler; + factor = rideEntry->nausea_multiplier; if (factor > 0) { y += 10; gfx_draw_string_left(dpi, STR_NAUSEA_FACTOR, &factor, COLOUR_BLACK, x, y); diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp index 98b34cd3cc..275b513b7e 100644 --- a/src/openrct2/object/RideObject.cpp +++ b/src/openrct2/object/RideObject.cpp @@ -61,9 +61,9 @@ void RideObject::ReadLegacy(IReadObjectContext * context, IStream * stream) ReadLegacyVehicle(context, stream, entry); } stream->Seek(4, STREAM_SEEK_CURRENT); - _legacyType.excitement_multipler = stream->ReadValue(); - _legacyType.intensity_multipler = stream->ReadValue(); - _legacyType.nausea_multipler = stream->ReadValue(); + _legacyType.excitement_multiplier = stream->ReadValue(); + _legacyType.intensity_multiplier = stream->ReadValue(); + _legacyType.nausea_multiplier = stream->ReadValue(); _legacyType.max_height = stream->ReadValue(); _legacyType.enabledTrackPieces = stream->ReadValue(); _legacyType.category[0] = stream->ReadValue(); @@ -106,15 +106,15 @@ void RideObject::ReadLegacy(IReadObjectContext * context, IStream * stream) GetImageTable()->Read(context, stream); // Validate properties - if (_legacyType.excitement_multipler > 75) + if (_legacyType.excitement_multiplier > 75) { context->LogError(OBJECT_ERROR_INVALID_PROPERTY, "Excitement multiplier too high."); } - if (_legacyType.intensity_multipler > 75) + if (_legacyType.intensity_multiplier > 75) { context->LogError(OBJECT_ERROR_INVALID_PROPERTY, "Intensity multiplier too high."); } - if (_legacyType.nausea_multipler > 75) + if (_legacyType.nausea_multiplier > 75) { context->LogError(OBJECT_ERROR_INVALID_PROPERTY, "Nausea multiplier too high."); } diff --git a/src/openrct2/ride/ride.h b/src/openrct2/ride/ride.h index a364438779..0be725bb7c 100644 --- a/src/openrct2/ride/ride.h +++ b/src/openrct2/ride/ride.h @@ -117,9 +117,9 @@ typedef struct rct_ride_entry { uint8 pad_019; // 0x019 rct_ride_entry_vehicle vehicles[RCT2_MAX_VEHICLES_PER_RIDE_ENTRY]; // 0x01A vehicle_colour_preset_list *vehicle_preset_list; // 0x1AE - sint8 excitement_multipler; // 0x1B2 - sint8 intensity_multipler; // 0x1B3 - sint8 nausea_multipler; // 0x1B4 + sint8 excitement_multiplier; // 0x1B2 + sint8 intensity_multiplier; // 0x1B3 + sint8 nausea_multiplier; // 0x1B4 uint8 max_height; // 0x1B5 uint64 enabledTrackPieces; // 0x1B6 uint8 category[RCT2_MAX_CATEGORIES_PER_RIDE]; // 0x1BE diff --git a/src/openrct2/ride/ride_ratings.c b/src/openrct2/ride/ride_ratings.c index da57312007..cd310686cf 100644 --- a/src/openrct2/ride/ride_ratings.c +++ b/src/openrct2/ride/ride_ratings.c @@ -832,9 +832,9 @@ static void ride_ratings_apply_adjustments(Ride *ride, rating_tuple *ratings) // Apply ride entry multipliers ride_ratings_add(ratings, - (((sint32)ratings->excitement * rideEntry->excitement_multipler) >> 7), - (((sint32)ratings->intensity * rideEntry->intensity_multipler) >> 7), - (((sint32)ratings->nausea * rideEntry->nausea_multipler) >> 7)); + (((sint32)ratings->excitement * rideEntry->excitement_multiplier) >> 7), + (((sint32)ratings->intensity * rideEntry->intensity_multiplier) >> 7), + (((sint32)ratings->nausea * rideEntry->nausea_multiplier) >> 7)); // Apply total air time #ifdef ORIGINAL_RATINGS