From 9425ed1aeebbf305f045e3b71241ab869a1bc474 Mon Sep 17 00:00:00 2001 From: Robert Jordan Date: Wed, 1 Nov 2017 13:14:01 -0400 Subject: [PATCH] Implement #6307: Display arrow on park entrance placement --- distribution/changelog.txt | 1 + src/openrct2-ui/windows/Map.cpp | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 2d590c17e5..5481603294 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -10,6 +10,7 @@ - Feature: [#6290] Arabic translation (experimental). - Feature: [#6292] Allow building queue lines in the Scenario Editor. - Feature: [#6295] TrueType fonts are now rendered with light font hinting by default. +- Feature: [#6307] Arrows are now shown when placing park entrances. - Feature: [#6324] Add command to deselect unused objects from the object selection. - Feature: [#6325] Allow using g1.dat from RCT Classic. - Feature: [#6353] Show custom RCT1 scenarios in New Scenario window. diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index e1510f2e0b..d9498494a5 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -1245,6 +1245,7 @@ static void window_map_place_park_entrance_tool_update(sint32 x, sint32 y) map_invalidate_selection_rect(); map_invalidate_map_selection_tiles(); gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE; + gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW; gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_CONSTRUCT; place_park_entrance_get_map_position(x, y, &mapX, &mapY, &mapZ, &direction); if (mapX == (sint16)-1) { @@ -1262,7 +1263,12 @@ static void window_map_place_park_entrance_tool_update(sint32 x, sint32 y) gMapSelectionTiles[3].x = -1; gMapSelectionTiles[3].y = -1; - gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE_CONSTRUCT; + gMapSelectArrowPosition.x = mapX; + gMapSelectArrowPosition.y = mapY; + gMapSelectArrowPosition.z = mapZ * 16; + gMapSelectArrowDirection = direction; + + gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE_CONSTRUCT | MAP_SELECT_FLAG_ENABLE_ARROW; map_invalidate_map_selection_tiles(); if ( gParkEntranceGhostExists &&