mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Code Issues Releases Wiki Activity

Rename var_6C to flags2 and put all know flags of it into an enum

Browse Source
This commit is contained in:
Gymnasiast
2015-07-29 08:43:04 +02:00
parent ade8779195
commit f12cbeb22b
2 changed files with 7 additions and 3 deletions
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 extra flags. (1 << 31) was used to mark the TD6 as a Six Flags ride.
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,