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

update ride property names

This commit is contained in:
Kevin Burke 2015-04-11 09:47:06 -07:00
parent c14b84489c
commit 7bb6b6a70d
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ride/ride.h
View File

@ -193,9 +193,9 @@ typedef struct {
uint8 drops; // 0x115 (??XX XXXX)
uint8 pad_116;
uint8 highest_drop_height; // 0x117
uint32 var_118;
uint16 var_11C;
uint8 var_11E;
sint32 sheltered_length; // 0x118
uint8 pad_11C[0x2];
uint8 no_sheltered_sections; // 0x11E
uint8 var_11F;
sint16 var_120;
sint16 var_122;

19
src/ride/ride_ratings.c
View File

@ -619,31 +619,30 @@ static rating_tuple sub_65DDD1(rct_ride *ride)
*/
static rating_tuple sub_65E1C2(rct_ride *ride)
{
// EBX, ECX, EBP
int var_118_shifted = (ride->var_118) >> 16;
uint32 eax = min(var_118_shifted, 1000);
int sheltered_length_shifted = (ride->sheltered_length) >> 16;
uint32 eax = min(sheltered_length_shifted, 1000);
int excitement = (eax * 9175) >> 16;
eax = min(var_118_shifted, 2000);
eax = min(sheltered_length_shifted, 2000);
int intensity = (eax * 0x2666) >> 16;
eax = min(var_118_shifted, 1000);
eax = min(sheltered_length_shifted, 1000);
int nausea = (eax * 0x4000) >> 16;
eax = (ride->var_11C * 30340) >> 16;
nausea += eax;
/*eax = (ride->var_11C * 30340) >> 16;*/
/*nausea += eax;*/
if (ride->var_11E & 0x40) {
if (ride->no_sheltered_sections & 0x40) {
excitement += 20;
nausea += 15;
}
if (ride->var_11E & 0x20) {
if (ride->no_sheltered_sections & 0x20) {
excitement += 20;
nausea += 15;
}
uint8 lowerval = ride->var_11E & 0x1F;
uint8 lowerval = ride->no_sheltered_sections & 0x1F;
lowerval = min(lowerval, 11);
excitement += (lowerval * 774516) >> 16;