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

Merge pull request #1701 from Gymnasiast/name-ride-type-flag-2 

Name RIDE_TYPE_FLAG_21
This commit is contained in:
Ted John 2015-07-29 16:50:37 +01:00
parent ee64219f55 5785530e00
commit 4f46707a2e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/peep/peep.c
View File

@ -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);

2
src/ride/ride.h
View File

@ -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,