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

Name GAME_COMMAND_FLAG_7

Browse Source
This commit is contained in:
Gymnasiast
2017-06-17 14:44:34 +02:00
committed by Michael Steenbeek
parent e9038e5a92
commit 595e73e2d9
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/game.h
View File

@@ -104,7 +104,7 @@ enum {
GAME_COMMAND_FLAG_4 = (1 << 4),
GAME_COMMAND_FLAG_5 = (1 << 5),
GAME_COMMAND_FLAG_GHOST = (1 << 6),
GAME_COMMAND_FLAG_7 = (1 << 7),
GAME_COMMAND_FLAG_PATH_SCENERY = (1 << 7),
GAME_COMMAND_FLAG_NETWORKED = (1u << 31) // Game command is coming from network
};

4
src/openrct2/windows/top_toolbar.c
View File

@@ -1659,7 +1659,7 @@ static void window_top_toolbar_scenery_tool_down(sint16 x, sint16 y, rct_window
}
case SCENERY_TYPE_PATH_ITEM:
{
sint32 flags = GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_7 | (parameter_1 & 0xFF00);
sint32 flags = GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_PATH_SCENERY | (parameter_1 & 0xFF00);
gGameCommandErrorTitle = STR_CANT_POSITION_THIS_HERE;
sint32 cost = game_do_command(gridX, flags, gridY, parameter_2, GAME_COMMAND_PLACE_PATH, parameter_3, 0);
@@ -2264,7 +2264,7 @@ static money32 try_place_ghost_scenery(rct_xy16 map_tile, uint32 parameter_1, ui
GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED |
GAME_COMMAND_FLAG_5 |
GAME_COMMAND_FLAG_GHOST |
GAME_COMMAND_FLAG_7
GAME_COMMAND_FLAG_PATH_SCENERY
),
map_tile.y,
parameter_2,

6
src/openrct2/world/footpath.c
View File

@@ -158,7 +158,7 @@ static void loc_6A6620(sint32 flags, sint32 x, sint32 y, rct_map_element *mapEle
mapElement = map_get_footpath_element(x / 32, y / 32, z);
}
if (!(flags & GAME_COMMAND_FLAG_7))
if (!(flags & GAME_COMMAND_FLAG_PATH_SCENERY))
footpath_connect_edges(x, y, mapElement, flags);
footpath_update_queue_chains();
@@ -220,7 +220,7 @@ static money32 footpath_element_insert(sint32 type, sint32 x, sint32 y, sint32 z
footpath_queue_chain_reset();
if (!(flags & GAME_COMMAND_FLAG_7))
if (!(flags & GAME_COMMAND_FLAG_PATH_SCENERY))
footpath_remove_edges_at(x, y, mapElement);
if ((gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && !(flags & GAME_COMMAND_FLAG_GHOST))
@@ -318,7 +318,7 @@ static money32 footpath_element_update(sint32 x, sint32 y, rct_map_element *mapE
if (flags & GAME_COMMAND_FLAG_APPLY) {
footpath_queue_chain_reset();
if (!(flags & GAME_COMMAND_FLAG_7))
if (!(flags & GAME_COMMAND_FLAG_PATH_SCENERY))
footpath_remove_edges_at(x, y, mapElement);
mapElement->properties.path.type = (mapElement->properties.path.type & 0x0F) | (type << 4);

2
src/openrct2/world/map.c
View File

@@ -2647,7 +2647,7 @@ static sint32 map_place_scenery_clear_func(rct_map_element** map_element, sint32
if (map_element_get_type(*map_element) != MAP_ELEMENT_TYPE_SCENERY)
return 1;
if (!(flags & GAME_COMMAND_FLAG_7))
if (!(flags & GAME_COMMAND_FLAG_PATH_SCENERY))
return 1;
rct_scenery_entry* scenery = get_small_scenery_entry((*map_element)->properties.scenery.type);

4
src/openrct2/world/wall.cpp
View File

@@ -332,7 +332,7 @@ static money32 WallPlace(uint8 wallType,
}
if (!(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) &&
!(flags & GAME_COMMAND_FLAG_7) &&
!(flags & GAME_COMMAND_FLAG_PATH_SCENERY) &&
!gCheatsSandboxMode)
{
@@ -503,7 +503,7 @@ static money32 WallPlace(uint8 wallType,
clearanceHeight += wallEntry->wall.height;
bool wallAcrossTrack = false;
if (!(flags & GAME_COMMAND_FLAG_7) && !gCheatsDisableClearanceChecks)
if (!(flags & GAME_COMMAND_FLAG_PATH_SCENERY) && !gCheatsDisableClearanceChecks)
{
if (!WallCheckObstruction(wallEntry,
position.x,