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

Merge pull request #2045 from Gymnasiast/name_peep_flags_5 

Name PEEP_FLAGS_5
This commit is contained in:
Ted John 2015-10-08 12:14:47 +01:00
parent bfc776b3dc 3590b1c1b9
commit 33655afcf9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/peep/peep.c
View File

@ -6261,7 +6261,7 @@ static int peep_interact_with_entrance(rct_peep* peep, sint16 x, sint16 y, rct_m
RCT2_GLOBAL(RCT2_ADDRESS_INCOME_FROM_ADMISSIONS, money32) += entranceFee;
RCT2_GLOBAL(RCT2_ADDRESS_NEXT_EXPENDITURE_TYPE, uint8) = RCT_EXPENDITURE_TYPE_PARK_ENTRANCE_TICKETS * 4;
peep_spend_money(peep, &peep->paid_to_enter, entranceFee);
peep->flags |= PEEP_FLAGS_5;
peep->flags |= PEEP_FLAGS_HAS_PAID_FOR_PARK_ENTRY;
}
RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_ADMISSIONS, uint32)++;
@ -8057,7 +8057,7 @@ static bool sub_6960AB(rct_peep *peep, int rideIndex, int dh, int bp)
loc_696387:;
uint32 value = ride->value;
if (value != 0xFFFF && !peep_has_voucher_for_free_ride(peep, rideIndex)) {
if (peep->flags & PEEP_FLAGS_5) value /= 4;
if (peep->flags & PEEP_FLAGS_HAS_PAID_FOR_PARK_ENTRY) value /= 4;
if (ride->price > (money16)(value * 2)) {
if (bp & 4) goto loc_696658;
peep_insert_new_thought(peep, PEEP_THOUGHT_TYPE_BAD_VALUE, rideIndex);
@ -8732,4 +8732,4 @@ void game_command_set_peep_name(int *eax, int *ebx, int *ecx, int *edx, int *esi
(uint8*)ebp,
(uint8*)edi
);
}
}

2
src/peep/peep.h
View File

@ -253,7 +253,7 @@ enum PEEP_FLAGS {
PEEP_FLAGS_2 = (1 << 2),
PEEP_FLAGS_TRACKING = (1 << 3),
PEEP_FLAGS_WAVING = (1 << 4), // Makes the peep wave
PEEP_FLAGS_5 = (1 << 5), // Set on paying to enter park?
PEEP_FLAGS_HAS_PAID_FOR_PARK_ENTRY = (1 << 5), // Set on paying to enter park
PEEP_FLAGS_PHOTO = (1 << 6), // Makes the peep take a picture
PEEP_FLAGS_PAINTING = (1 << 7),
PEEP_FLAGS_WOW = (1 << 8), // Makes a peep WOW2