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

Merge pull request #3033 from Gymnasiast/name-and-remove-park-flags-8 

Name PARK_FLAGS_8 and stop checking it
This commit is contained in:
Ted John 2016-02-27 20:43:57 +00:00
parent e52c95ca7a 55a2b25f0f
commit 0f2177e330
3 changed files with 176 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game.c
View File

@ -405,10 +405,8 @@ static int game_check_affordability(int cost)
{
if (cost <= 0)return cost;
if (RCT2_GLOBAL(0x141F568, uint8) & 0xF0)return cost;
if (!(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32)&(1 << 8))){
if (cost <= (sint32)(DECRYPT_MONEY(RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONEY_ENCRYPTED, sint32))))return cost;
}
RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS, uint32) = cost;
RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TEXT, uint16) = 827;

2
src/peep/peep.c
View File

@ -9607,7 +9607,6 @@ static bool peep_should_go_on_ride(rct_peep *peep, int rideIndex, int entranceNu
// Indicates whether a peep is physically at the ride, or is just thinking about going on the ride.
bool peepAtRide = !(flags & PEEP_RIDE_DECISION_THINKING);
if (!(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_8)) {
if (ride->status == RIDE_STATUS_OPEN && !(ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)) {
// Peeps that are leaving the park will refuse to go on any rides, with the exception of free transport rides.
@ -9840,7 +9839,6 @@ static bool peep_should_go_on_ride(rct_peep *peep, int rideIndex, int entranceNu
ride->lifecycle_flags &= ~RIDE_LIFECYCLE_QUEUE_FULL;
return true;
}
}
peep_chose_not_to_go_on_ride(peep, rideIndex, peepAtRide, false);
return false;

4
src/world/park.h
View File

@ -35,7 +35,7 @@ enum {
PARK_FLAGS_FORBID_HIGH_CONSTRUCTION = (1 << 5), // below tree height
PARK_FLAGS_PREF_LESS_INTENSE_RIDES = (1 << 6),
PARK_FLAGS_FORBID_MARKETING_CAMPAIGN = (1 << 7),
PARK_FLAGS_8 = (1 << 8),
PARK_FLAGS_ANTI_CHEAT_DEPRECATED = (1 << 8), // Not used anymore, used for cheat detection
PARK_FLAGS_PREF_MORE_INTENSE_RIDES = (1 << 9),
PARK_FLAGS_NO_MONEY = (1 << 11),
PARK_FLAGS_DIFFICULT_GUEST_GENERATION = (1 << 12),
@ -44,7 +44,7 @@ enum {
PARK_FLAGS_LOCK_REAL_NAMES_OPTION = (1 << 15),
PARK_FLAGS_NO_MONEY_SCENARIO = (1 << 17), // equivalent to PARK_FLAGS_NO_MONEY, but used in scenario editor
PARK_FLAGS_18 = (1 << 18),
PARK_FLAGS_SIX_FLAGS_DEPRECATED = (1 << 19)
PARK_FLAGS_SIX_FLAGS_DEPRECATED = (1 << 19) // Not used anymore
};
extern uint8 *gParkRatingHistory;