mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-28 01:04:50 +01:00
Code Issues Releases Wiki Activity

rename path bits (var_06) to (flags)

Browse Source
This commit is contained in:
Ted John
2016-05-30 23:39:43 +01:00
parent 3e307b8e2a
commit 2a614ec4d9
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/world/footpath.c
View File

@@ -226,7 +226,7 @@ static money32 footpath_element_update(int x, int y, rct_map_element *mapElement
if (pathItemType != 0) {
rct_scenery_entry* scenery_entry = get_footpath_item_entry(pathItemType - 1);
uint16 unk6 = scenery_entry->path_bit.var_06;
uint16 unk6 = scenery_entry->path_bit.flags;
if ((unk6 & PATH_BIT_FLAG_DONT_ALLOW_ON_SLOPE) && footpath_element_is_sloped(mapElement)) {
gGameCommandErrorText = STR_CANT_BUILD_THIS_ON_SLOPED_FOOTPATH;
@@ -282,7 +282,7 @@ static money32 footpath_element_update(int x, int y, rct_map_element *mapElement
mapElement->flags &= ~MAP_ELEMENT_FLAG_BROKEN;
if (pathItemType != 0) {
rct_scenery_entry* scenery_entry = get_footpath_item_entry(pathItemType - 1);
if (scenery_entry->path_bit.var_06 & PATH_BIT_FLAG_BIN) {
if (scenery_entry->path_bit.flags & PATH_BIT_FLAG_BIN) {
mapElement->properties.path.addition_status = 255;
}
}

2
src/world/fountain.c
View File

@@ -302,7 +302,7 @@ static bool is_jumping_fountain(int type, int x, int y, int z)
uint8 additionIndex = footpath_element_get_path_scenery_index(mapElement);
rct_scenery_entry *sceneryEntry = get_footpath_item_entry(additionIndex);
if (!(sceneryEntry->path_bit.var_06 & pathBitFlagMask))
if (!(sceneryEntry->path_bit.flags & pathBitFlagMask))
continue;
return true;

4
src/world/scenery.c
View File

@@ -82,9 +82,9 @@ void scenery_update_tile(int x, int y)
if (footpath_element_has_path_scenery(mapElement) && !footpath_element_path_scenery_is_ghost(mapElement)) {
rct_scenery_entry *sceneryEntry;
sceneryEntry = get_footpath_item_entry(footpath_element_get_path_scenery_index(mapElement));
if (sceneryEntry->path_bit.var_06 & PATH_BIT_FLAG_JUMPING_FOUNTAIN_WATER) {
if (sceneryEntry->path_bit.flags & PATH_BIT_FLAG_JUMPING_FOUNTAIN_WATER) {
jumping_fountain_begin(JUMPING_FOUNTAIN_TYPE_WATER, x, y, mapElement);
} else if (sceneryEntry->path_bit.var_06 & PATH_BIT_FLAG_JUMPING_FOUNTAIN_SNOW) {
} else if (sceneryEntry->path_bit.flags & PATH_BIT_FLAG_JUMPING_FOUNTAIN_SNOW) {
jumping_fountain_begin(JUMPING_FOUNTAIN_TYPE_SNOW, x, y, mapElement);
}
}

2
src/world/scenery.h
View File

@@ -127,7 +127,7 @@ typedef enum {
} WALL_SCENERY_2_FLAGS;
typedef struct rct_path_bit_scenery_entry {
uint16 var_06;
uint16 flags; // 0x06
uint8 pad_08;
uint8 tool_id; // 0x09
sint16 price; // 0x0A