From 5785530e007e36093bba15547fd9f3a23679cd3b Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Tue, 28 Jul 2015 21:28:29 +0200 Subject: [PATCH] Name RIDE_TYPE_FLAG_21 --- src/peep/peep.c | 2 +- src/ride/ride.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/peep/peep.c b/src/peep/peep.c index 9c347137d0..664598c72e 100644 --- a/src/peep/peep.c +++ b/src/peep/peep.c @@ -6512,7 +6512,7 @@ static int peep_interact_with_shop(rct_peep* peep, sint16 x, sint16 y, rct_map_e if (peep->flags & PEEP_FLAGS_LEAVING_PARK) return peep_return_to_center_of_tile(peep); - if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_21)){ + if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_PEEP_SHOULD_GO_INSIDE_FACILITY)){ peep->var_F4 = 0; if (!sub_6960AB(peep, rideIndex, 0, 0)) return peep_return_to_center_of_tile(peep); diff --git a/src/ride/ride.h b/src/ride/ride.h index 6d322b45ba..7f2d567faa 100644 --- a/src/ride/ride.h +++ b/src/ride/ride.h @@ -754,7 +754,7 @@ enum { RIDE_TYPE_FLAG_18 = 1 << 18, RIDE_TYPE_FLAG_FLAT_RIDE = 1 << 19, RIDE_TYPE_FLAG_20 = 1 << 20, - RIDE_TYPE_FLAG_21 = 1 << 21, // used only by toilets and first aid + RIDE_TYPE_FLAG_PEEP_SHOULD_GO_INSIDE_FACILITY = 1 << 21, // used by toilets and first aid to mark that peep should go inside the building (rather than 'buying' at the counter) RIDE_TYPE_FLAG_IN_RIDE = 1 << 22, // peeps are "IN" (ride) rather than "ON" (ride) RIDE_TYPE_FLAG_SELLS_FOOD = 1 << 23, RIDE_TYPE_FLAG_SELLS_DRINKS = 1 << 24,