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

Merge pull request #3283 from IntelOrca/fix-3282 

fix #3282: improve launched freefall ratings
This commit is contained in:
Ted John 2016-04-20 17:42:22 +01:00
parent 54316a50dc 234f3ae7f1
commit 3a38bac1b6
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
distribution/changelog.txt
View File

@ -1,8 +1,9 @@
0.0.5
0.0.5 (in development)
------------------------------------------------------------------------
- Feature: Ability to rotate map elements with the tile inspector.
- Fix: [#3282] Launched Freefall ride ratings are fixed for Downward Launch.
0.0.4
0.0.4-beta (2016-04-15)
------------------------------------------------------------------------
- Feature: Full native OSX .app support.
- Feature: Add displaying of frames per second (FPS).

14
src/ride/ride_ratings.c
View File

@ -1892,14 +1892,22 @@ static void ride_ratings_calculate_launched_freefall(rct_ride *ride)
ratings.excitement += ((ride_get_total_length(ride) >> 16) * 32768) >> 16;
#ifdef ORIGINAL_RATINGS
#ifdef ORIGINAL_RATINGS
ride_ratings_apply_operation_option(&ratings, ride, 0, 1355917, 451972);
#else
#else
// Only apply "launch speed" effects when the setting can be modified
if (ride->mode == RIDE_MODE_UPWARD_LAUNCH) {
ride_ratings_apply_operation_option(&ratings, ride, 0, 1355917, 451972);
} else {
// Fix #3282: When the ride mode is in downward launch mode, the intensity and
// nausea were fixed regardless of how high the ride is. The following
// calculation is based on roto-drop which is a similar mechanic.
int lengthFactor = ((ride_get_total_length(ride) >> 16) * 209715) >> 16;
ratings.excitement += lengthFactor;
ratings.intensity += lengthFactor * 2;
ratings.nausea += lengthFactor * 2;
}
#endif
#endif
ride_ratings_apply_proximity(&ratings, ride, 20130);
ride_ratings_apply_scenery(&ratings, ride, 25098);