mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix typo in 'multiplier'

This commit is contained in:
Michael Steenbeek 2017-11-13 16:22:36 +01:00
parent 3bb9d41908
commit 5eed8cecd4
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2-ui/windows/Ride.cpp
View File

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

12
src/openrct2/object/RideObject.cpp
View File

@ -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<sint8>();
_legacyType.intensity_multipler = stream->ReadValue<sint8>();
_legacyType.nausea_multipler = stream->ReadValue<sint8>();
_legacyType.excitement_multiplier = stream->ReadValue<sint8>();
_legacyType.intensity_multiplier = stream->ReadValue<sint8>();
_legacyType.nausea_multiplier = stream->ReadValue<sint8>();
_legacyType.max_height = stream->ReadValue<uint8>();
_legacyType.enabledTrackPieces = stream->ReadValue<uint64>();
_legacyType.category[0] = stream->ReadValue<uint8>();
@ -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.");
}

6
src/openrct2/ride/ride.h
View File

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

6
src/openrct2/ride/ride_ratings.c
View File

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