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

Merge pull request #999 from kevinburke/sub_65DDD1 

Move var_112 accessors into their own methods
This commit is contained in:
Ted John 2015-04-06 15:18:35 +01:00
parent 11efc58374 616a3ada72
commit 2a1722db69
3 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ride/ride.c
View File

@ -3628,6 +3628,22 @@ int get_var_110_unk_3(rct_ride* ride) {
return ride->var_110 & 0x1F;
}
int get_var_112_unk_1(rct_ride* ride) {
return (ride->var_112 >> 11) & 0x3F;
}
int get_var_112_unk_2(rct_ride* ride) {
return (ride->var_112 >> 8) & 7;
}
int get_var_112_unk_3(rct_ride* ride) {
return (ride->var_112 >> 5) & 7;
}
int get_var_112_unk_4(rct_ride* ride) {
return ride->var_112 & 0x1F;
}
bool ride_has_spinning_tunnel(rct_ride *ride) {
return ride->special_track_elements & RIDE_ELEMENT_TUNNEL_SPLASH_OR_RAPIDS;
}

4
src/ride/ride.h
View File

@ -767,6 +767,10 @@ int get_var_10E_unk_3(rct_ride* ride);
int get_var_110_unk_1(rct_ride* ride);
int get_var_110_unk_2(rct_ride* ride);
int get_var_110_unk_3(rct_ride* ride);
int get_var_112_unk_1(rct_ride* ride);
int get_var_112_unk_2(rct_ride* ride);
int get_var_112_unk_3(rct_ride* ride);
int get_var_112_unk_4(rct_ride* ride);
uint8 ride_get_helix_sections(rct_ride *ride);
bool ride_has_spinning_tunnel(rct_ride *ride);

23
src/ride/ride_ratings.c
View File

@ -647,26 +647,27 @@ static rating_tuple get_var_110_rating(rct_ride* ride) {
/**
* rct2: 0x0065E047
*/
static rating_tuple get_var_112_rating(uint16 var_112) {
static rating_tuple get_var_112_rating(rct_ride *ride) {
int al;
al = var_112 >> 11;
al = min(al & 0x3F, 4);
al = get_var_112_unk_1(ride);
al = min(al, 4);
int excitement = (al * 0x78000) >> 16;
al = var_112 >> 11;
al = min(al & 0x3F, 8);
al = get_var_112_unk_1(ride);
al = min(al, 8);
int nausea = (al * 0x78000) >> 16;
al = var_112 >> 8;
al = min(al & 7, 6);
al = get_var_112_unk_2(ride);
al = min(al, 6);
excitement += (al * 273066) >> 16;
al = var_112 >> 5;
al = min(al & 7, 6);
al = get_var_112_unk_3(ride);
al = min(al, 6);
excitement += (al * 0x3aaaa) >> 16;
al = min(var_112 & 0x1F, 7);
al = get_var_112_unk_4(ride);
al = min(al, 7);
excitement += (al * 187245) >> 16;
rating_tuple rating = { excitement, 0, nausea };
@ -760,7 +761,7 @@ static rating_tuple sub_65DDD1(rct_ride *ride)
intensity += var_110_rating.intensity;
nausea += var_110_rating.nausea;
rating_tuple var_112_rating = get_var_112_rating(ride->var_112);
rating_tuple var_112_rating = get_var_112_rating(ride);
excitement += var_112_rating.excitement;
intensity += var_112_rating.intensity;
nausea += var_112_rating.nausea;