Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Pierre Kim
OpenRCT2-mod
Commits
c9ca5d55
Commit
c9ca5d55
authored
7 years ago
by
Michael Steenbeek
Browse files
Options
Download
Email Patches
Plain Diff
Rename incorrectly named flag
parent
bb569d35
develop
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/openrct2/paint/tile_element/scenery.c
+1
-1
src/openrct2/paint/tile_element/scenery.c
src/openrct2/world/SmallScenery.cpp
+1
-1
src/openrct2/world/SmallScenery.cpp
src/openrct2/world/Wall.cpp
+1
-1
src/openrct2/world/Wall.cpp
src/openrct2/world/scenery.h
+1
-1
src/openrct2/world/scenery.h
with
4 additions
and
4 deletions
+4
-4
src/openrct2/paint/tile_element/scenery.c
+
1
-
1
View file @
c9ca5d55
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
src/openrct2/world/SmallScenery.cpp
+
1
-
1
View file @
c9ca5d55
...
...
@@ -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
);
}
...
...
This diff is collapsed.
Click to expand it.
src/openrct2/world/Wall.cpp
+
1
-
1
View file @
c9ca5d55
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
src/openrct2/world/scenery.h
+
1
-
1
View file @
c9ca5d55
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help