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

Merge pull request #1699 from Gymnasiast/name-flags 

Name a park flag and a TD6 flag.
This commit is contained in:
Ted John 2015-07-29 11:54:24 +01:00
parent 1683900d4f f12cbeb22b
commit 10fc123228
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ride/track.c
View File

@ -2711,7 +2711,7 @@ int tracked_ride_to_td6(uint8 rideIndex, rct_track_td6* track_design, uint8* tra
track_design->flags |= (1 << 31);
if (track->type == TRACK_ELEM_LOG_FLUME_REVERSER)
track_design->var_6C |= (1 << 1);
track_design->flags2 |= TRACK_FLAGS2_CONTAINS_LOG_FLUME_REVERSER;
uint8 bh;
if (track->type == TRACK_ELEM_BRAKES){
@ -2929,7 +2929,7 @@ int ride_to_td6(uint8 rideIndex){
track_design->upkeep_cost = ride->upkeep_cost;
track_design->flags = 0;
track_design->var_6C = 0;
track_design->flags2 = 0;
uint8* track_elements = RCT2_ADDRESS(0x9D821B, uint8);
memset(track_elements, 0, 8000);

6
src/ride/track.h
View File

@ -173,7 +173,7 @@ typedef struct {
uint8 track_spine_colour[4]; // 0x60
uint8 track_rail_colour[4]; // 0x64
uint8 track_support_colour[4]; // 0x68
uint32 var_6C; // some flags
uint32 flags2; // 0x6C
rct_object_entry vehicle_object; // 0x70
uint8 space_required_x; // 0x80
uint8 space_required_y; // 0x81
@ -186,6 +186,10 @@ typedef struct{
uint8 preview[4][TRACK_PREVIEW_IMAGE_SIZE]; // 0xA3
} rct_track_design;
enum {
TRACK_FLAGS2_CONTAINS_LOG_FLUME_REVERSER = (1 << 1),
TRACK_FLAGS2_SIX_FLAGS_RIDE_DEPRECATED = (1 << 31) // Not used anymore.
};
enum {
TRACK_NONE = 0,

2
src/windows/options.c
View File

@ -1199,7 +1199,7 @@ static void window_options_invalidate(rct_window *w)
case WINDOW_OPTIONS_PAGE_MISC:
// unknown park flag can disable real name checkbox
if (RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & 0x8000)
if (RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_LOCK_REAL_NAMES_OPTION)
w->disabled_widgets |= (1ULL << WIDX_REAL_NAME_CHECKBOX);
// save plugin data checkbox: visible or not

1
src/world/park.h
View File

@ -41,6 +41,7 @@ enum {
PARK_FLAGS_DIFFICULT_GUEST_GENERATION = (1 << 12),
PARK_FLAGS_PARK_FREE_ENTRY = (1 << 13),
PARK_FLAGS_DIFFICULT_PARK_RATING = (1 << 14),
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)