From dfd0c52b7ea546d8e43ce9d3a47dc60ecff1f3d7 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Thu, 8 Oct 2015 10:47:14 +0200 Subject: [PATCH 1/2] Name PEEP_FLAGS_5 --- src/peep/peep.c | 6 +++--- src/peep/peep.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/peep/peep.c b/src/peep/peep.c index 885c5a8323..c429bd551a 100644 --- a/src/peep/peep.c +++ b/src/peep/peep.c @@ -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 ); -} \ No newline at end of file +} diff --git a/src/peep/peep.h b/src/peep/peep.h index b270f3c456..a1e07c466e 100644 --- a/src/peep/peep.h +++ b/src/peep/peep.h @@ -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 From 3590b1c1b93bf5c2d9aff7e3516eb40f0041c261 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Thu, 8 Oct 2015 10:58:17 +0200 Subject: [PATCH 2/2] Adjust comment --- src/peep/peep.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/peep/peep.h b/src/peep/peep.h index a1e07c466e..10ac9203c6 100644 --- a/src/peep/peep.h +++ b/src/peep/peep.h @@ -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_HAS_PAID_FOR_PARK_ENTRY = (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