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

Flip the calcs

This commit is contained in:
duncanspumpkin 2016-10-19 21:30:08 +01:00
parent 430d1c4bcd
commit 8b196234e9
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/peep/peep.c
View File

@ -10150,17 +10150,17 @@ static sint16 peep_calculate_ride_intensity_nausea_satisfaction(rct_peep* peep,
maxIntensity = (peep->intensity >> 4) * 100;
minIntensity = (peep->intensity & 0xF) * 100;
if (maxIntensity <= ride->intensity && minIntensity >= ride->intensity) {
if (minIntensity <= ride->intensity && maxIntensity >= ride->intensity) {
intensitySatisfaction--;
}
maxIntensity -= peep->happiness * 2;
minIntensity += peep->happiness;
if (maxIntensity <= ride->intensity && minIntensity >= ride->intensity) {
minIntensity -= peep->happiness * 2;
maxIntensity += peep->happiness;
if (minIntensity <= ride->intensity && maxIntensity >= ride->intensity) {
intensitySatisfaction--;
}
maxIntensity -= peep->happiness * 2;
minIntensity += peep->happiness;
if (maxIntensity <= ride->intensity && minIntensity >= ride->intensity) {
minIntensity -= peep->happiness * 2;
maxIntensity += peep->happiness;
if (minIntensity <= ride->intensity && maxIntensity >= ride->intensity) {
intensitySatisfaction--;
}
@ -10168,17 +10168,17 @@ static sint16 peep_calculate_ride_intensity_nausea_satisfaction(rct_peep* peep,
// has a minimum preferred nausea value. (For peeps with None or Low, this is set to zero.)
minNausea = NauseaMinimumThresholds[(peep->nausea_tolerance & 3)];
maxNausea = NauseaMaximumThresholds[(peep->nausea_tolerance & 3)];
if (maxNausea <= ride->nausea && minNausea >= ride->nausea) {
if (minNausea <= ride->nausea && maxNausea >= ride->nausea) {
nauseaSatisfaction--;
}
maxNausea -= peep->happiness * 2;
minNausea += peep->happiness;
if (maxNausea <= ride->nausea && minNausea >= ride->nausea) {
minNausea -= peep->happiness * 2;
maxNausea += peep->happiness;
if (minNausea <= ride->nausea && maxNausea >= ride->nausea) {
nauseaSatisfaction--;
}
maxNausea -= peep->happiness * 2;
minNausea += peep->happiness;
if (maxNausea <= ride->nausea && minNausea >= ride->nausea) {
minNausea -= peep->happiness * 2;
maxNausea += peep->happiness;
if (minNausea <= ride->nausea && maxNausea >= ride->nausea) {
nauseaSatisfaction--;
}