From 94d5eb86c82a0dbfe0f40814afa642709c150f6c Mon Sep 17 00:00:00 2001 From: "sangch.go" Date: Wed, 30 Dec 2015 13:18:49 +0900 Subject: [PATCH 1/2] Applied enum value to ride type flags. --- src/peep/peep.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/peep/peep.c b/src/peep/peep.c index 0c6b85fee4..633c8b6c79 100644 --- a/src/peep/peep.c +++ b/src/peep/peep.c @@ -556,13 +556,13 @@ static void sub_68F41A(rct_peep *peep, int index) switch (chosen_thought){ case PEEP_THOUGHT_TYPE_HUNGRY: - peep_head_for_nearest_ride_with_flags(peep, 0x00800000); + peep_head_for_nearest_ride_with_flags(peep, RIDE_TYPE_FLAG_SELLS_FOOD); break; case PEEP_THOUGHT_TYPE_THIRSTY: - peep_head_for_nearest_ride_with_flags(peep, 0x01000000); + peep_head_for_nearest_ride_with_flags(peep, RIDE_TYPE_FLAG_SELLS_DRINKS); break; case PEEP_THOUGHT_TYPE_BATHROOM: - peep_head_for_nearest_ride_with_flags(peep, 0x00200000); + peep_head_for_nearest_ride_with_flags(peep, RIDE_TYPE_FLAG_PEEP_SHOULD_GO_INSIDE_FACILITY); break; case PEEP_THOUGHT_RUNNING_OUT: peep_head_for_nearest_ride_type(peep, RIDE_TYPE_CASH_MACHINE); @@ -9058,7 +9058,7 @@ static void peep_head_for_nearest_ride_with_flags(rct_peep *peep, int rideTypeFl } } - if ((rideTypeFlags & 0x002000000) && peep_has_food(peep)) { + if ((rideTypeFlags & RIDE_TYPE_FLAG_IS_BATHROOM) && peep_has_food(peep)) { return; } From fce5eab9d8f5753792f2282958f5271a4f66f991 Mon Sep 17 00:00:00 2001 From: "sangch.go" Date: Wed, 30 Dec 2015 17:13:00 +0900 Subject: [PATCH 2/2] Refactored code. bugfix and more define. --- src/peep/peep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/peep/peep.c b/src/peep/peep.c index 633c8b6c79..ba9180f355 100644 --- a/src/peep/peep.c +++ b/src/peep/peep.c @@ -562,7 +562,7 @@ static void sub_68F41A(rct_peep *peep, int index) peep_head_for_nearest_ride_with_flags(peep, RIDE_TYPE_FLAG_SELLS_DRINKS); break; case PEEP_THOUGHT_TYPE_BATHROOM: - peep_head_for_nearest_ride_with_flags(peep, RIDE_TYPE_FLAG_PEEP_SHOULD_GO_INSIDE_FACILITY); + peep_head_for_nearest_ride_with_flags(peep, RIDE_TYPE_FLAG_IS_BATHROOM); break; case PEEP_THOUGHT_RUNNING_OUT: peep_head_for_nearest_ride_type(peep, RIDE_TYPE_CASH_MACHINE); @@ -9053,7 +9053,7 @@ static void peep_head_for_nearest_ride_with_flags(rct_peep *peep, int rideTypeFl if (peep->x == (sint16)0x8000) return; if (peep->guest_heading_to_ride_id != 255) { ride = GET_RIDE(peep->guest_heading_to_ride_id); - if (RCT2_ADDRESS(RCT2_ADDRESS_RIDE_FLAGS, uint32)[ride->type * 2] & 0x03800000) { + if (RCT2_ADDRESS(RCT2_ADDRESS_RIDE_FLAGS, uint32)[ride->type * 2] & (RIDE_TYPE_FLAG_IS_BATHROOM | RIDE_TYPE_FLAG_SELLS_DRINKS | RIDE_TYPE_FLAG_SELLS_FOOD)) { return; } }