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 incorrectly named flag

Browse Source
This commit is contained in:
Michael Steenbeek
2017-11-24 11:10:16 +01:00
parent bb569d35fb
commit c9ca5d55cd
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/paint/tile_element/scenery.c
View File

@@ -93,7 +93,7 @@ void scenery_paint(paint_session * session, uint8 direction, sint32 height, rct_
y_offset = 3;
boxlength.x = 26;
boxlength.y = 26;
if (entry->small_scenery.flags & SMALL_SCENERY_FLAG_ALLOW_WALLS) {
if (entry->small_scenery.flags & SMALL_SCENERY_FLAG_NO_WALLS) {
x_offset = 1;
y_offset = 1;
boxlength.x = 30;

2
src/openrct2/world/SmallScenery.cpp
View File

@@ -263,7 +263,7 @@ static money32 SmallSceneryPlace(sint16 x,
if (flags & GAME_COMMAND_FLAG_APPLY && !(flags & GAME_COMMAND_FLAG_GHOST))
{
footpath_remove_litter(x, y, targetHeight);
if (!gCheatsDisableClearanceChecks && (sceneryEntry->small_scenery.flags & SMALL_SCENERY_FLAG_ALLOW_WALLS))
if (!gCheatsDisableClearanceChecks && (sceneryEntry->small_scenery.flags & SMALL_SCENERY_FLAG_NO_WALLS))
{
wall_remove_at(x, y, targetHeight, targetHeight + sceneryEntry->small_scenery.height);
}

2
src/openrct2/world/Wall.cpp
View File

@@ -228,7 +228,7 @@ static bool WallCheckObstruction(rct_scenery_entry * wall,
case TILE_ELEMENT_TYPE_SMALL_SCENERY:
entryType = tileElement->properties.scenery.type;
entry = get_small_scenery_entry(entryType);
if (entry->small_scenery.flags & SMALL_SCENERY_FLAG_ALLOW_WALLS)
if (entry->small_scenery.flags & SMALL_SCENERY_FLAG_NO_WALLS)
{
map_obstruction_set_error_text(tileElement);
return false;

2
src/openrct2/world/scenery.h
View File

@@ -68,7 +68,7 @@ typedef enum {
SMALL_SCENERY_FLAG_HAS_FRAME_OFFSETS = (1 << 15), // 0x8000
SMALL_SCENERY_FLAG17 = (1 << 16), // 0x10000
SMALL_SCENERY_FLAG_STACKABLE = (1 << 17), // 0x20000; means scenery item can be placed in the air and over water
SMALL_SCENERY_FLAG_ALLOW_WALLS = (1 << 18), // 0x40000
SMALL_SCENERY_FLAG_NO_WALLS = (1 << 18), // 0x40000
SMALL_SCENERY_FLAG_HAS_SECONDARY_COLOUR = (1 << 19), // 0x80000
SMALL_SCENERY_FLAG_NO_SUPPORTS = (1 << 20), // 0x100000
SMALL_SCENERY_FLAG_VISIBLE_WHEN_ZOOMED = (1 << 21), // 0x200000