mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 12:33:17 +01:00
Code Issues Releases Wiki Activity

Moved the nausea thresholds into a C array

Browse Source
This commit is contained in:
Sam Horn
2015-10-11 04:07:14 +10:00
parent 55d6666f13
commit 49cf5e3774
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/addresses.h
View File

@@ -64,10 +64,6 @@
// they aren't directly referenced, for example when a game is saved and
// loaded, large chunks of data is read and written to.
// An array of 8 uint16s containing the min and max nausea values for each
// of the four nausea tolerance levels.
#define RCT2_ADDRESS_NAUSEA_THRESHOLDS 0x00982390
#define RCT2_ADDRESS_EASTEREGG_NAMES 0x00988C20
// An array of pointers to the start of a way to
@@ -661,6 +657,7 @@
#define RCT2_ADDRESS_DPI_LINE_LENGTH_GLOBAL 0x9ABDB0 //uint16 width+pitch
#define RCT2_ADDRESS_CONFIG_FIRST_TIME_LOAD_OBJECTS 0x009AA00D
#define RCT2_ADDRESS_CONFIG_FIRST_TIME_LOAD_CONFIG 0x009AB4C6
#define RCT2_ADDRESS_NAUSEA_THRESHOLDS 0x00982390 //uint16
#pragma endregion

17
src/peep/peep.c
View File

@@ -116,6 +116,15 @@ const char *gPeepEasterEggNames[] = {
"DAVID ELLIS"
};
// These arrays contain the base minimum and maximum nausea ratings for peeps, based on their nausea tolerance level.
static const ride_rating NauseaMinimumThresholds[] = {
0, 0, 200, 400
};
static const ride_rating NauseaMaximumThresholds[] = {
300, 600, 800, 1000
};
int peep_get_staff_count()
{
uint16 spriteIndex;
@@ -7574,8 +7583,8 @@ static void peep_on_enter_ride(rct_peep *peep, int rideIndex)
satisfactionFlags |= (1 << 7);
}
minNausea = RCT2_ADDRESS(RCT2_ADDRESS_NAUSEA_THRESHOLDS, uint16)[(peep->nausea_tolerance & 3) * 2];
maxNausea = RCT2_ADDRESS(RCT2_ADDRESS_NAUSEA_THRESHOLDS, uint16)[(peep->nausea_tolerance & 3) * 2 + 1];
minNausea = NauseaMinimumThresholds[(peep->nausea_tolerance & 3)];
maxNausea = NauseaMaximumThresholds[(peep->nausea_tolerance & 3)];
if (maxNausea <= ride->nausea || minNausea >= ride->nausea) {
satisfactionFlags |= (1 << 2);
}
@@ -8044,8 +8053,8 @@ static bool peep_should_go_on_ride(rct_peep *peep, int rideIndex, int entranceNu
}
// Nausea calculations.
ride_rating maxNausea = RCT2_ADDRESS(RCT2_ADDRESS_NAUSEA_THRESHOLDS, uint16)[(peep->nausea_tolerance & 3) * 2 + 1] + peep->happiness;
ride_rating maxNausea = NauseaMaximumThresholds[(peep->nausea_tolerance & 3)] + peep->happiness;
if (ride->nausea > maxNausea) {
if (peepAtRide) {
peep_insert_new_thought(peep, PEEP_THOUGHT_TYPE_SICKENING, rideIndex);