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

Name PEEP_FLAGS_19

This commit is contained in:
Gymnasiast 2015-07-28 20:59:54 +02:00
parent 2fc658e346
commit 4e8d5572cc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/peep/peep.c
View File

@ -7559,7 +7559,7 @@ static void peep_on_enter_ride(rct_peep *peep, int rideIndex)
uint16 satisfactionFlags;
ride = GET_RIDE(rideIndex);
peep->flags &= ~PEEP_FLAGS_19;
peep->flags &= ~PEEP_FLAGS_RIDE_SHOULD_BE_MARKED_AS_FAVOURITE;
if (ride->excitement == (ride_rating)0xFFFF) {
satisfactionFlags = 0x1FF;
} else {
@ -7652,7 +7652,7 @@ static void peep_on_enter_ride(rct_peep *peep, int rideIndex)
if (unkExcitementValue >= peep->var_FA) {
if (peep->happiness >= 160 && peep->happiness_growth_rate >= 160) {
peep->var_FA = unkExcitementValue;
peep->flags |= PEEP_FLAGS_19;
peep->flags |= PEEP_FLAGS_RIDE_SHOULD_BE_MARKED_AS_FAVOURITE;
}
}
@ -7724,8 +7724,8 @@ static void peep_on_exit_ride(rct_peep *peep, int rideIndex)
{
rct_ride *ride = GET_RIDE(rideIndex);
if (peep->flags & PEEP_FLAGS_19) {
peep->flags &= ~PEEP_FLAGS_19;
if (peep->flags & PEEP_FLAGS_RIDE_SHOULD_BE_MARKED_AS_FAVOURITE) {
peep->flags &= ~PEEP_FLAGS_RIDE_SHOULD_BE_MARKED_AS_FAVOURITE;
peep->favourite_ride = rideIndex;
// TODO fix this flag name or add another one
peep->window_invalidate_flags |= PEEP_INVALIDATE_STAFF_STATS;

2
src/peep/peep.h
View File

@ -267,7 +267,7 @@ enum PEEP_FLAGS {
PEEP_FLAGS_EATING = (1 << 17), // Reduces hunger
PEEP_FLAGS_EXPLODE = (1 << 18),
PEEP_FLAGS_19 = (1 << 19),
PEEP_FLAGS_RIDE_SHOULD_BE_MARKED_AS_FAVOURITE = (1 << 19),
PEEP_FLAGS_PARK_ENTRANCE_CHOSEN = (1 << 20), //Set when the nearest park entrance has been chosen
PEEP_FLAGS_21 = (1 << 21),