mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenRCT2/src/openrct2-ui/windows/TopToolbar.cpp

3881 lines
130 KiB
C++
Raw Normal View History

add top toolbar and ride types
2014-04-11 03:42:39 +02:00
/*****************************************************************************
Implement custom tools
2020-05-01 22:32:41 +02:00
* Copyright (c) 2014-2020 OpenRCT2 developers
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
*
Ready copyright notice for clang-format Clang-format sees the text behind `#pragma region` as code and formats it. Instead of stating the copyright and date there, it's now in the comment block right below it. The text "Copyright" is left in the `#pragma region` line, as clang-format sees it as a single identifier. I took the opportunity to normalize the dates, and add the copyright notice to the source files where it was missing them (except for third-party and the generated resources.h file).
2018-06-15 14:07:34 +02:00
* For a complete list of all authors, please refer to contributors.md
* Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
*
Ready copyright notice for clang-format Clang-format sees the text behind `#pragma region` as code and formats it. Instead of stating the copyright and date there, it's now in the comment block right below it. The text "Copyright" is left in the `#pragma region` line, as clang-format sees it as a single identifier. I took the opportunity to normalize the dates, and add the copyright notice to the source files where it was missing them (except for third-party and the generated resources.h file).
2018-06-15 14:07:34 +02:00
* OpenRCT2 is licensed under the GNU General Public License version 3.
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
*****************************************************************************/
clang-format UI windows
2018-06-22 23:21:44 +02:00
#include "../UiContext.h"
#include "../interface/InGameConsole.h"
Implement custom menu items
2020-02-11 22:26:05 +01:00
#include "../scripting/CustomMenu.h"
Fix Intent pointers/strings
2017-10-17 22:31:05 +02:00
Remove Math::Clamp in favour of std::clamp
2018-08-12 13:50:40 +02:00
#include <algorithm>
Use std::size instead of Util::CountOf
2018-11-21 23:16:04 +01:00
#include <iterator>
Scale mouse delta by zoom when using shift. (#7868) * Scale mouse delta by zoom when using shift. * Clamp maximum height of object drag. * Address code review comments; add changelog entry.
2018-08-12 11:47:46 +02:00
#include <limits>
clang-format UI windows
2018-06-22 23:21:44 +02:00
#include <openrct2-ui/interface/Dropdown.h>
#include <openrct2-ui/interface/LandTool.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2-ui/windows/Window.h>
Compile util and cheats as C++
2017-12-13 13:02:24 +01:00
#include <openrct2/Cheats.h>
Move top toolbar to UI module
2017-11-11 02:57:45 +01:00
#include <openrct2/Context.h>
#include <openrct2/Editor.h>
Hide the network class declaration to Network.cpp (#8276) The Network class is not used by anyone other than free functions in Network.cpp, nor should it be used by anyone with the current design. This change leaves only the publicly-exposed functions left in the header, drastically reducing amount of required headers in network.h, one of the heaviest headers we had so far.
2018-11-19 23:10:54 +01:00
#include <openrct2/Game.h>
Compile files in base dir as C++
2017-12-12 14:52:57 +01:00
#include <openrct2/Input.h>
clang-format UI windows
2018-06-22 23:21:44 +02:00
#include <openrct2/OpenRCT2.h>
#include <openrct2/ParkImporter.h>
Add a bug-report item in file dropdown menu
2021-09-05 13:56:52 +02:00
#include <openrct2/Version.h>
Split actions hpp files into separate h and cpp files (#13548) * Split up SmallSceneryPlace/Remove Added undo function for Remove Scenery * Refactor: Balloon and Banner actions hpp=>h/cpp * Refactor: rename all action *.hpp files to *.cpp This is preparation for separation in later commits. Note that without the complete set of commits in this branch, the code will not build. * Refactor Clear, Climate, Custom, and Footpath actions hpp=>h/cpp * VSCode: add src subdirectories to includePath * Refactor Guest actions hpp=>h/cpp * Refactor Land actions hpp=>h/cpp * Refactor LargeScenery actions hpp=>h/cpp * Refactor Load, Maze, Network actions hpp=>h/cpp * Refactor Park actions hpp=>h/cpp * Refactor/style: move private function declarations in actions *.h Previous action .h files included private function declarations with private member variables, before public function declarations. This commit re-orders the header files to the following order: - public member variables - private member variables - public functions - private functions * Refactor Pause action hpp=>h/cpp * Refactor Peep, Place, Player actions hpp=>h/cpp * Refactor Ride actions hpp=>h/cpp * Refactor Scenario, Set*, Sign* actions hpp=>h/cpp * Refactor SmallScenerySetColourAction hpp=>h/cpp * Refactor Staff actions hpp=>h/cpp * Refactor Surface, Tile, Track* actions hpp=>h/cpp * Refactor Wall and Water actions hpp=>h/cpp * Fix various includes and other compile errors Update includes for tests. Move static function declarations to .h files Add explicit includes to various files that were previously implicit (the required header was a nested include in an action hpp file, and the action .h file does not include that header) Move RideSetStatus string enum to the cpp file to avoid unused imports * Xcode: modify project file for actions refactor * Cleanup whitespace and end-of-file newlines Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2020-12-10 07:39:10 +01:00
#include <openrct2/actions/BannerPlaceAction.h>
#include <openrct2/actions/BannerSetColourAction.h>
#include <openrct2/actions/ClearAction.h>
#include <openrct2/actions/FootpathAdditionPlaceAction.h>
#include <openrct2/actions/LandLowerAction.h>
#include <openrct2/actions/LandRaiseAction.h>
#include <openrct2/actions/LandSmoothAction.h>
#include <openrct2/actions/LargeSceneryPlaceAction.h>
#include <openrct2/actions/LargeScenerySetColourAction.h>
#include <openrct2/actions/LoadOrQuitAction.h>
#include <openrct2/actions/PauseToggleAction.h>
#include <openrct2/actions/SetCheatAction.h>
#include <openrct2/actions/SmallSceneryPlaceAction.h>
#include <openrct2/actions/SmallScenerySetColourAction.h>
#include <openrct2/actions/SurfaceSetStyleAction.h>
#include <openrct2/actions/WallPlaceAction.h>
#include <openrct2/actions/WallSetColourAction.h>
#include <openrct2/actions/WaterLowerAction.h>
#include <openrct2/actions/WaterRaiseAction.h>
clang-format UI windows
2018-06-22 23:21:44 +02:00
#include <openrct2/audio/audio.h>
#include <openrct2/config/Config.h>
Chat toggle button (#8648) * Add chat_available() * Add appropriate strings * Add new Chat icon * Implement Chat button * CS * Fix chat icon * Make chat icon a bit smaller and less bright * Update chat icon * Update changelog
2019-02-03 23:30:34 +01:00
#include <openrct2/interface/Chat.h>
Rename header files to match renamed source files
2018-06-01 00:16:53 +02:00
#include <openrct2/interface/InteractiveConsole.h>
Move top toolbar to UI module
2017-11-11 02:57:45 +01:00
#include <openrct2/interface/Screenshot.h>
#include <openrct2/network/network.h>
Move all Virtual Floor code from Map to its own file.
2018-03-04 17:44:42 +01:00
#include <openrct2/paint/VirtualFloor.h>
Move top toolbar to UI module
2017-11-11 02:57:45 +01:00
#include <openrct2/peep/Staff.h>
clang-format UI windows
2018-06-22 23:21:44 +02:00
#include <openrct2/scenario/Scenario.h>
Add a bug-report item in file dropdown menu
2021-09-05 13:56:52 +02:00
#include <openrct2/ui/UiContext.h>
Compile util and cheats as C++
2017-12-13 13:02:24 +01:00
#include <openrct2/util/Util.h>
Move top toolbar to UI module
2017-11-11 02:57:45 +01:00
#include <openrct2/windows/Intent.h>
Compile files in world folder as C++
2018-01-11 10:59:26 +01:00
#include <openrct2/world/Footpath.h>
Refactor small, large and wall scenery
2017-11-20 11:13:55 +01:00
#include <openrct2/world/LargeScenery.h>
clang-format UI windows
2018-06-22 23:21:44 +02:00
#include <openrct2/world/Park.h>
Compile files in world folder as C++
2018-01-11 10:59:26 +01:00
#include <openrct2/world/Scenery.h>
Refactor small, large and wall scenery
2017-11-20 11:13:55 +01:00
#include <openrct2/world/SmallScenery.h>
Seperate surface tile element
2018-05-01 16:33:16 +02:00
#include <openrct2/world/Surface.h>
clang-format UI windows
2018-06-22 23:21:44 +02:00
#include <openrct2/world/Wall.h>
#include <string>
Move in game console to UI library
2018-03-11 23:25:34 +01:00
Fix #7678: Crash when Loading or starting a new game... ...while having object selection window open Close the object manager window before loading the next park.
2018-06-14 00:29:05 +02:00
using namespace OpenRCT2;
Move in game console to UI library
2018-03-11 23:25:34 +01:00
using namespace OpenRCT2::Ui;
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
Exclude pre-formatted blocks from clang-format (#7520) [ci skip]
2018-05-16 20:41:29 +02:00
// clang-format off
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
enum {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
WIDX_PAUSE,
WIDX_FILE_MENU,
WIDX_MUTE,
WIDX_ZOOM_OUT,
WIDX_ZOOM_IN,
WIDX_ROTATE,
WIDX_VIEW_MENU,
WIDX_MAP,
WIDX_LAND,
WIDX_WATER,
WIDX_SCENERY,
WIDX_PATH,
WIDX_CONSTRUCT_RIDE,
WIDX_RIDES,
WIDX_PARK,
WIDX_STAFF,
WIDX_GUESTS,
WIDX_CLEAR_SCENERY,
WIDX_FASTFORWARD,
WIDX_CHEATS,
WIDX_DEBUG,
WIDX_FINANCES,
WIDX_RESEARCH,
WIDX_NEWS,
WIDX_NETWORK,
Chat toggle button (#8648) * Add chat_available() * Add appropriate strings * Add new Chat icon * Implement Chat button * CS * Fix chat icon * Make chat icon a bit smaller and less bright * Update chat icon * Update changelog
2019-02-03 23:30:34 +01:00
WIDX_CHAT,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
WIDX_SEPARATOR,
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
};
Add compile-time checked constants for widget ids
2017-05-02 02:01:29 +02:00
validate_global_widx(WC_TOP_TOOLBAR, WIDX_PAUSE);
validate_global_widx(WC_TOP_TOOLBAR, WIDX_LAND);
validate_global_widx(WC_TOP_TOOLBAR, WIDX_WATER);
validate_global_widx(WC_TOP_TOOLBAR, WIDX_SCENERY);
validate_global_widx(WC_TOP_TOOLBAR, WIDX_PATH);
Remove and replace C typedefs `typedef struct/union/enum name { ... } name_again;` is not needed whe compiling C++, moving the name at the back to be in front of the object and removing `typedef` makes it usable the very same way. This also replaces typedefs with the using keyword. They have better readability, especially for function pointer types, and would allow more flexibility when used with templates.
2018-02-14 09:42:26 +01:00
enum FILE_MENU_DDIDX {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
DDIDX_NEW_GAME = 0,
DDIDX_LOAD_GAME = 1,
DDIDX_SAVE_GAME = 2,
DDIDX_SAVE_GAME_AS = 3,
// separator
DDIDX_ABOUT = 5,
DDIDX_OPTIONS = 6,
DDIDX_SCREENSHOT = 7,
DDIDX_GIANT_SCREENSHOT = 8,
// separator
Add a bug-report item in file dropdown menu
2021-09-05 13:56:52 +02:00
DDIDX_FILE_BUG_ON_GITHUB = 10,
Show update information on main screen & in floppy menu
2020-08-02 23:38:00 +02:00
// separator
Add a bug-report item in file dropdown menu
2021-09-05 13:56:52 +02:00
DDIDX_QUIT_TO_MENU = 12,
DDIDX_EXIT_OPENRCT2 = 13,
// separator
DDIDX_UPDATE_AVAILABLE = 15,
Remove and replace C typedefs `typedef struct/union/enum name { ... } name_again;` is not needed whe compiling C++, moving the name at the back to be in front of the object and removing `typedef` makes it usable the very same way. This also replaces typedefs with the using keyword. They have better readability, especially for function pointer types, and would allow more flexibility when used with templates.
2018-02-14 09:42:26 +01:00
};
Decompiled view_menu dropdown. Fixed issue when no item selected. Added a post build event to copy langauge file.
2014-08-10 10:34:27 +02:00
Remove and replace C typedefs `typedef struct/union/enum name { ... } name_again;` is not needed whe compiling C++, moving the name at the back to be in front of the object and removing `typedef` makes it usable the very same way. This also replaces typedefs with the using keyword. They have better readability, especially for function pointer types, and would allow more flexibility when used with templates.
2018-02-14 09:42:26 +01:00
enum TOP_TOOLBAR_VIEW_MENU_DDIDX {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
DDIDX_UNDERGROUND_INSIDE = 0,
Reverse option, add shortcut
2021-05-24 16:54:30 +02:00
DDIDX_TRANSPARENT_WATER = 1,
Add option to make water opaque
2021-05-24 16:30:46 +02:00
DDIDX_HIDE_BASE = 2,
DDIDX_HIDE_VERTICAL = 3,
// separator
DDIDX_SEETHROUGH_RIDES = 5,
DDIDX_SEETHROUGH_SCENERY = 6,
DDIDX_SEETHROUGH_PATHS = 7,
DDIDX_INVISIBLE_SUPPORTS = 8,
DDIDX_INVISIBLE_PEEPS = 9,
// separator
DDIDX_LAND_HEIGHTS = 11,
DDIDX_TRACK_HEIGHTS = 12,
DDIDX_PATH_HEIGHTS = 13,
// separator
DDIDX_VIEW_CLIPPING = 15,
DDIDX_HIGHLIGHT_PATH_ISSUES = 16,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
TOP_TOOLBAR_VIEW_MENU_COUNT
Remove and replace C typedefs `typedef struct/union/enum name { ... } name_again;` is not needed whe compiling C++, moving the name at the back to be in front of the object and removing `typedef` makes it usable the very same way. This also replaces typedefs with the using keyword. They have better readability, especially for function pointer types, and would allow more flexibility when used with templates.
2018-02-14 09:42:26 +01:00
};
remove toolbar.c and ignore seperators at the end of the toolbar
2015-02-10 15:41:35 +01:00
Remove and replace C typedefs `typedef struct/union/enum name { ... } name_again;` is not needed whe compiling C++, moving the name at the back to be in front of the object and removing `typedef` makes it usable the very same way. This also replaces typedefs with the using keyword. They have better readability, especially for function pointer types, and would allow more flexibility when used with templates.
2018-02-14 09:42:26 +01:00
enum TOP_TOOLBAR_DEBUG_DDIDX {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
DDIDX_CONSOLE = 0,
Move common actions from debug menu into cheats menu (#8892) This aims to make it less necessary for users to enable debugging tools.
2019-03-17 12:52:32 +01:00
DDIDX_DEBUG_PAINT = 1,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
TOP_TOOLBAR_DEBUG_COUNT
Remove and replace C typedefs `typedef struct/union/enum name { ... } name_again;` is not needed whe compiling C++, moving the name at the back to be in front of the object and removing `typedef` makes it usable the very same way. This also replaces typedefs with the using keyword. They have better readability, especially for function pointer types, and would allow more flexibility when used with templates.
2018-02-14 09:42:26 +01:00
};
Add debug toolbar menu, start tile inspector
2015-06-01 03:33:56 +02:00
Remove and replace C typedefs `typedef struct/union/enum name { ... } name_again;` is not needed whe compiling C++, moving the name at the back to be in front of the object and removing `typedef` makes it usable the very same way. This also replaces typedefs with the using keyword. They have better readability, especially for function pointer types, and would allow more flexibility when used with templates.
2018-02-14 09:42:26 +01:00
enum TOP_TOOLBAR_NETWORK_DDIDX {
Add Network window
2019-01-29 19:51:07 +01:00
DDIDX_MULTIPLAYER = 0,
Remove network traffic window Now available in the DevTools plugin.
2021-03-06 14:47:06 +01:00
DDIDX_MULTIPLAYER_RECONNECT = 1,
Add "Reconnect" option under the multiplayer button
2019-02-05 06:57:09 +01:00
TOP_TOOLBAR_NETWORK_COUNT
Remove and replace C typedefs `typedef struct/union/enum name { ... } name_again;` is not needed whe compiling C++, moving the name at the back to be in front of the object and removing `typedef` makes it usable the very same way. This also replaces typedefs with the using keyword. They have better readability, especially for function pointer types, and would allow more flexibility when used with templates.
2018-02-14 09:42:26 +01:00
};
basic player list
2015-07-16 19:32:43 +02:00
add better disable clearance cheat
2015-06-26 23:40:09 +02:00
enum {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
DDIDX_CHEATS,
Move common actions from debug menu into cheats menu (#8892) This aims to make it less necessary for users to enable debugging tools.
2019-03-17 12:52:32 +01:00
DDIDX_TILE_INSPECTOR = 1,
DDIDX_OBJECT_SELECTION = 2,
DDIDX_INVENTIONS_LIST = 3,
DDIDX_SCENARIO_OPTIONS = 4,
Add Objective Options to Cheats menu
2020-10-11 18:41:23 +02:00
DDIDX_OBJECTIVE_OPTIONS = 5,
// 6 is a separator
DDIDX_ENABLE_SANDBOX_MODE = 7,
DDIDX_DISABLE_CLEARANCE_CHECKS = 8,
DDIDX_DISABLE_SUPPORT_LIMITS = 9,
Move common actions from debug menu into cheats menu (#8892) This aims to make it less necessary for users to enable debugging tools.
2019-03-17 12:52:32 +01:00
TOP_TOOLBAR_CHEATS_COUNT
add better disable clearance cheat
2015-06-26 23:40:09 +02:00
};
fix #2363: show default item highlight, refactor
2016-01-18 00:37:14 +01:00
enum {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
DDIDX_SHOW_MAP,
DDIDX_OPEN_VIEWPORT,
fix #2363: show default item highlight, refactor
2016-01-18 00:37:14 +01:00
};
enum {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
DDIDX_ROTATE_CLOCKWISE,
DDIDX_ROTATE_ANTI_CLOCKWISE,
fix #2363: show default item highlight, refactor
2016-01-18 00:37:14 +01:00
};
Refactor placement of top toolbar items
2015-02-05 22:22:35 +01:00
#pragma region Toolbar_widget_ordering
// from left to right
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static constexpr const int32_t left_aligned_widgets_order[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
WIDX_PAUSE,
WIDX_FASTFORWARD,
WIDX_FILE_MENU,
WIDX_MUTE,
WIDX_NETWORK,
Chat toggle button (#8648) * Add chat_available() * Add appropriate strings * Add new Chat icon * Implement Chat button * CS * Fix chat icon * Make chat icon a bit smaller and less bright * Update chat icon * Update changelog
2019-02-03 23:30:34 +01:00
WIDX_CHAT,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
WIDX_CHEATS,
WIDX_DEBUG,
WIDX_SEPARATOR,
WIDX_ZOOM_OUT,
WIDX_ZOOM_IN,
WIDX_ROTATE,
WIDX_VIEW_MENU,
WIDX_MAP,
Refactor placement of top toolbar items
2015-02-05 22:22:35 +01:00
};
// from right to left
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static constexpr const int32_t right_aligned_widgets_order[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
WIDX_NEWS,
WIDX_GUESTS,
WIDX_STAFF,
WIDX_PARK,
WIDX_RIDES,
WIDX_RESEARCH,
WIDX_FINANCES,
WIDX_SEPARATOR,
WIDX_CONSTRUCT_RIDE,
WIDX_PATH,
WIDX_SCENERY,
WIDX_WATER,
WIDX_LAND,
WIDX_CLEAR_SCENERY
Refactor placement of top toolbar items
2015-02-05 22:22:35 +01:00
};
#pragma endregion
add map generation window
2015-02-09 19:32:58 +01:00
static rct_widget window_top_toolbar_widgets[] = {
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
MakeRemapWidget({ 0, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Primary , SPR_TOOLBAR_PAUSE, STR_PAUSE_GAME_TIP ), // Pause
MakeRemapWidget({ 60, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Primary , SPR_TOOLBAR_FILE, STR_DISC_AND_GAME_OPTIONS_TIP ), // File menu
MakeRemapWidget({250, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Primary , SPR_G2_TOOLBAR_MUTE, STR_TOOLBAR_MUTE_TIP ), // Mute
MakeRemapWidget({100, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Secondary , SPR_TOOLBAR_ZOOM_OUT, STR_ZOOM_OUT_TIP ), // Zoom out
MakeRemapWidget({130, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Secondary , SPR_TOOLBAR_ZOOM_IN, STR_ZOOM_IN_TIP ), // Zoom in
MakeRemapWidget({160, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Secondary , SPR_TOOLBAR_ROTATE, STR_ROTATE_TIP ), // Rotate camera
MakeRemapWidget({190, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Secondary , SPR_TOOLBAR_VIEW, STR_VIEW_OPTIONS_TIP ), // Transparency menu
MakeRemapWidget({220, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Secondary , SPR_TOOLBAR_MAP, STR_SHOW_MAP_TIP ), // Map
MakeRemapWidget({267, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Tertiary , SPR_TOOLBAR_LAND, STR_ADJUST_LAND_TIP ), // Land
MakeRemapWidget({297, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Tertiary , SPR_TOOLBAR_WATER, STR_ADJUST_WATER_TIP ), // Water
MakeRemapWidget({327, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Tertiary , SPR_TOOLBAR_SCENERY, STR_PLACE_SCENERY_TIP ), // Scenery
MakeRemapWidget({357, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Tertiary , SPR_TOOLBAR_FOOTPATH, STR_BUILD_FOOTPATH_TIP ), // Path
MakeRemapWidget({387, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Tertiary , SPR_TOOLBAR_CONSTRUCT_RIDE, STR_BUILD_RIDE_TIP ), // Construct ride
MakeRemapWidget({490, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Quaternary, SPR_TOOLBAR_RIDES, STR_RIDES_IN_PARK_TIP ), // Rides
MakeRemapWidget({520, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Quaternary, SPR_TOOLBAR_PARK, STR_PARK_INFORMATION_TIP ), // Park
MakeRemapWidget({550, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Quaternary, SPR_TAB_TOOLBAR, STR_STAFF_TIP ), // Staff
MakeRemapWidget({560, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Quaternary, SPR_TOOLBAR_GUESTS, STR_GUESTS_TIP ), // Guests
MakeRemapWidget({560, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Tertiary , SPR_TOOLBAR_CLEAR_SCENERY, STR_CLEAR_SCENERY_TIP ), // Clear scenery
MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Primary , SPR_TAB_TOOLBAR, STR_GAME_SPEED_TIP ), // Fast forward
MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Primary , SPR_TAB_TOOLBAR, STR_CHEATS_TIP ), // Cheats
MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Primary , SPR_TAB_TOOLBAR, STR_DEBUG_TIP ), // Debug
MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Quaternary, SPR_TAB_TOOLBAR, STR_SCENARIO_OPTIONS_FINANCIAL_TIP), // Finances
MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Quaternary, SPR_TAB_TOOLBAR, STR_FINANCES_RESEARCH_TIP ), // Research
MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Quaternary, SPR_TAB_TOOLBAR, STR_SHOW_RECENT_MESSAGES_TIP ), // News
MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Primary , SPR_G2_TOOLBAR_MULTIPLAYER, STR_SHOW_MULTIPLAYER_STATUS_TIP ), // Network
MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Primary , SPR_TAB_TOOLBAR, STR_TOOLBAR_CHAT_TIP ), // Chat
MakeWidget ({ 0, 0}, {10, 1}, WindowWidgetType::Empty, WindowColour::Primary ), // Artificial widget separator
Make WIDGETS_END constexpr
2021-09-26 11:11:42 +02:00
WIDGETS_END,
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
};
Use rct_widgetindex type
2017-05-01 15:41:45 +02:00
static void window_top_toolbar_mouseup(rct_window *w, rct_widgetindex widgetIndex);
Apply new mousedown event parameters to windows
2017-07-03 23:09:46 +02:00
static void window_top_toolbar_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void window_top_toolbar_dropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
Prefer const ref to send ScreenCoordsXY over
2020-02-29 03:43:29 +01:00
static void window_top_toolbar_tool_update(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_top_toolbar_tool_down(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_top_toolbar_tool_drag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_top_toolbar_tool_up(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoordsy);
Use rct_widgetindex type
2017-05-01 15:41:45 +02:00
static void window_top_toolbar_tool_abort(rct_window *w, rct_widgetindex widgetIndex);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static void window_top_toolbar_invalidate(rct_window *w);
static void window_top_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi);
Compact, statically initialized syntax for event lists (#12973)
2020-09-28 20:36:15 +02:00
static rct_window_event_list window_top_toolbar_events([](auto& events)
{
events.mouse_up = &window_top_toolbar_mouseup;
events.mouse_down = &window_top_toolbar_mousedown;
events.dropdown = &window_top_toolbar_dropdown;
events.tool_update = &window_top_toolbar_tool_update;
events.tool_down = &window_top_toolbar_tool_down;
events.tool_drag = &window_top_toolbar_tool_drag;
events.tool_up = &window_top_toolbar_tool_up;
events.tool_abort = &window_top_toolbar_tool_abort;
events.invalidate = &window_top_toolbar_invalidate;
events.paint = &window_top_toolbar_paint;
});
Exclude pre-formatted blocks from clang-format (#7520) [ci skip]
2018-05-16 20:41:29 +02:00
// clang-format on
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void top_toolbar_init_view_menu(rct_window* window, rct_widget* widget);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void top_toolbar_view_menu_dropdown(int16_t dropdownIndex);
Implement custom menu items
2020-02-11 22:26:05 +01:00
static void top_toolbar_init_map_menu(rct_window* window, rct_widget* widget);
static void top_toolbar_map_menu_dropdown(int16_t dropdownIndex);
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void top_toolbar_init_fastforward_menu(rct_window* window, rct_widget* widget);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void top_toolbar_fastforward_menu_dropdown(int16_t dropdownIndex);
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void top_toolbar_init_rotate_menu(rct_window* window, rct_widget* widget);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void top_toolbar_rotate_menu_dropdown(int16_t dropdownIndex);
Move common actions from debug menu into cheats menu (#8892) This aims to make it less necessary for users to enable debugging tools.
2019-03-17 12:52:32 +01:00
static void top_toolbar_init_cheats_menu(rct_window* window, rct_widget* widget);
static void top_toolbar_cheats_menu_dropdown(int16_t dropdownIndex);
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void top_toolbar_init_debug_menu(rct_window* window, rct_widget* widget);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void top_toolbar_debug_menu_dropdown(int16_t dropdownIndex);
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void top_toolbar_init_network_menu(rct_window* window, rct_widget* widget);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void top_toolbar_network_menu_dropdown(int16_t dropdownIndex);
remove toolbar.c and ignore seperators at the end of the toolbar
2015-02-10 15:41:35 +01:00
Make more window variables and functions static
2017-08-06 14:41:13 +02:00
static void toggle_footpath_window();
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void toggle_land_window(rct_window* topToolbar, rct_widgetindex widgetIndex);
static void toggle_clear_scenery_window(rct_window* topToolbar, rct_widgetindex widgetIndex);
static void toggle_water_window(rct_window* topToolbar, rct_widgetindex widgetIndex);
remove toolbar.c and ignore seperators at the end of the toolbar
2015-02-10 15:41:35 +01:00
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
static money64 selection_lower_land(uint8_t flags);
static money64 selection_raise_land(uint8_t flags);
Added tool_update_land Not tested
2015-05-26 21:36:05 +02:00
Implement ClearAction.
2019-01-02 12:59:37 +01:00
static ClearAction GetClearAction();
Fix #11072: Land and water tools work out of bounds (#11179) Tool tried to act out of bounds, where it shouldn't do anything
2020-04-18 00:34:32 +02:00
static bool _landToolBlocked;
clang-format UI windows
2018-06-22 23:21:44 +02:00
static uint8_t _unkF64F0E;
static int16_t _unkF64F0A;
add twitch integration, part 1
2015-05-25 21:36:40 +02:00
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
/**
* Creates the main game top toolbar window.
* rct2: 0x0066B485 (part of 0x0066B3E8)
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_window* window_top_toolbar_open()
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
{
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
rct_window* window = WindowCreate(
Use ScreenCoordsXY for window functions (#10086) * Use ScreenCoordsXY for window_create function * Use ScreenCoordsXY for window_find_from_point function * Use ScreenCoordsXY for window_find_widget_from_point * Use ScreenCoordsXY for ride_contruction_tool* * Use ScreenCoordsXY for window_event_tool* * Use ScreenCoordsXY for window_event_scroll_mouse* * Use ScreenCoordsXY for remaining window_event* * Use ScreenCoordsXY for window_(set|move)_position
2019-10-19 13:07:03 +02:00
ScreenCoordsXY(0, 0), context_get_width(), TOP_TOOLBAR_HEIGHT + 1, &window_top_toolbar_events, WC_TOP_TOOLBAR,
clang-format UI windows
2018-06-22 23:21:44 +02:00
WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_NO_BACKGROUND);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window->widgets = window_top_toolbar_widgets;
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowInitScrollWidgets(window);
Move top toolbar to UI module
2017-11-11 02:57:45 +01:00
return window;
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
* rct2: 0x0066C957
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_top_toolbar_mouseup(rct_window* w, rct_widgetindex widgetIndex)
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_window* mainWindow;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_PAUSE:
if (network_get_mode() != NETWORK_MODE_CLIENT)
{
Move Pause Toggle into the GameAction framework
2019-02-07 17:54:03 +01:00
auto pauseToggleAction = PauseToggleAction();
GameActions::Execute(&pauseToggleAction);
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
break;
case WIDX_ZOOM_OUT:
if ((mainWindow = window_get_main()) != nullptr)
window_zoom_out(mainWindow, false);
break;
case WIDX_ZOOM_IN:
if ((mainWindow = window_get_main()) != nullptr)
window_zoom_in(mainWindow, false);
break;
case WIDX_CLEAR_SCENERY:
toggle_clear_scenery_window(w, WIDX_CLEAR_SCENERY);
break;
case WIDX_LAND:
toggle_land_window(w, WIDX_LAND);
break;
case WIDX_WATER:
toggle_water_window(w, WIDX_WATER);
break;
case WIDX_SCENERY:
Close #13625: Refactor TOOL_IDX to use strong enum
2020-12-23 05:11:15 +01:00
if (!tool_set(w, WIDX_SCENERY, Tool::Arrow))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
input_set_flag(INPUT_FLAG_6, true);
context_open_window(WC_SCENERY);
}
break;
case WIDX_PATH:
toggle_footpath_window();
break;
case WIDX_CONSTRUCT_RIDE:
context_open_window(WC_CONSTRUCT_RIDE);
break;
case WIDX_RIDES:
context_open_window(WC_RIDE_LIST);
break;
case WIDX_PARK:
context_open_window(WC_PARK_INFORMATION);
break;
case WIDX_STAFF:
context_open_window(WC_STAFF_LIST);
break;
case WIDX_GUESTS:
context_open_window(WC_GUEST_LIST);
break;
case WIDX_FINANCES:
context_open_window(WC_FINANCES);
break;
case WIDX_RESEARCH:
context_open_window(WC_RESEARCH);
break;
case WIDX_NEWS:
context_open_window(WC_RECENT_NEWS);
break;
case WIDX_MUTE:
Move the audio code into OpenRCT2 namespace
2020-10-06 23:34:42 +02:00
OpenRCT2::Audio::ToggleAllSounds();
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Chat toggle button (#8648) * Add chat_available() * Add appropriate strings * Add new Chat icon * Implement Chat button * CS * Fix chat icon * Make chat icon a bit smaller and less bright * Update chat icon * Update changelog
2019-02-03 23:30:34 +01:00
case WIDX_CHAT:
if (chat_available())
{
chat_toggle();
}
else
{
Explicitly pass formatter arguments to ShowError and family
2020-08-27 00:01:15 +02:00
context_show_error(STR_CHAT_UNAVAILABLE, STR_NONE, {});
Chat toggle button (#8648) * Add chat_available() * Add appropriate strings * Add new Chat icon * Implement Chat button * CS * Fix chat icon * Make chat icon a bit smaller and less bright * Update chat icon * Update changelog
2019-02-03 23:30:34 +01:00
}
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
* rct2: 0x0066CA3B
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_top_toolbar_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
{
Remove hardcoded dropdown indices
2021-09-04 17:38:17 +02:00
int32_t numItems = 0;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_FILE_MENU:
if (gScreenFlags & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER))
{
Remove hardcoded dropdown indices
2021-09-04 17:38:17 +02:00
gDropdownItemsFormat[numItems++] = STR_ABOUT;
gDropdownItemsFormat[numItems++] = STR_OPTIONS;
gDropdownItemsFormat[numItems++] = STR_SCREENSHOT;
gDropdownItemsFormat[numItems++] = STR_GIANT_SCREENSHOT;
gDropdownItemsFormat[numItems++] = STR_EMPTY;
Add a bug-report item in file dropdown menu
2021-09-05 13:56:52 +02:00
gDropdownItemsFormat[numItems++] = STR_FILE_BUG_ON_GITHUB;
gDropdownItemsFormat[numItems++] = STR_EMPTY;
Remove hardcoded dropdown indices
2021-09-04 17:38:17 +02:00
gDropdownItemsFormat[numItems++] = STR_QUIT_TRACK_DESIGNS_MANAGER;
gDropdownItemsFormat[numItems++] = STR_EXIT_OPENRCT2;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER)
Remove hardcoded dropdown indices
2021-09-04 17:38:17 +02:00
gDropdownItemsFormat[numItems++] = STR_QUIT_ROLLERCOASTER_DESIGNER;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else if (gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR)
{
Remove hardcoded dropdown indices
2021-09-04 17:38:17 +02:00
gDropdownItemsFormat[numItems++] = STR_LOAD_LANDSCAPE;
gDropdownItemsFormat[numItems++] = STR_SAVE_LANDSCAPE;
gDropdownItemsFormat[numItems++] = STR_EMPTY;
gDropdownItemsFormat[numItems++] = STR_ABOUT;
gDropdownItemsFormat[numItems++] = STR_OPTIONS;
gDropdownItemsFormat[numItems++] = STR_SCREENSHOT;
gDropdownItemsFormat[numItems++] = STR_GIANT_SCREENSHOT;
gDropdownItemsFormat[numItems++] = STR_EMPTY;
Add a bug-report item in file dropdown menu
2021-09-05 13:56:52 +02:00
gDropdownItemsFormat[numItems++] = STR_FILE_BUG_ON_GITHUB;
gDropdownItemsFormat[numItems++] = STR_EMPTY;
Remove hardcoded dropdown indices
2021-09-04 17:38:17 +02:00
gDropdownItemsFormat[numItems++] = STR_QUIT_SCENARIO_EDITOR;
gDropdownItemsFormat[numItems++] = STR_EXIT_OPENRCT2;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Remove hardcoded dropdown indices
2021-09-04 17:38:17 +02:00
gDropdownItemsFormat[numItems++] = STR_NEW_GAME;
gDropdownItemsFormat[numItems++] = STR_LOAD_GAME;
gDropdownItemsFormat[numItems++] = STR_SAVE_GAME;
gDropdownItemsFormat[numItems++] = STR_SAVE_GAME_AS;
gDropdownItemsFormat[numItems++] = STR_EMPTY;
gDropdownItemsFormat[numItems++] = STR_ABOUT;
gDropdownItemsFormat[numItems++] = STR_OPTIONS;
gDropdownItemsFormat[numItems++] = STR_SCREENSHOT;
gDropdownItemsFormat[numItems++] = STR_GIANT_SCREENSHOT;
gDropdownItemsFormat[numItems++] = STR_EMPTY;
Add a bug-report item in file dropdown menu
2021-09-05 13:56:52 +02:00
gDropdownItemsFormat[numItems++] = STR_FILE_BUG_ON_GITHUB;
gDropdownItemsFormat[numItems++] = STR_EMPTY;
Remove hardcoded dropdown indices
2021-09-04 17:38:17 +02:00
gDropdownItemsFormat[numItems++] = STR_QUIT_TO_MENU;
gDropdownItemsFormat[numItems++] = STR_EXIT_OPENRCT2;
Show update information on main screen & in floppy menu
2020-08-02 23:38:00 +02:00
if (OpenRCT2::GetContext()->HasNewVersionInfo())
{
Remove hardcoded dropdown indices
2021-09-04 17:38:17 +02:00
gDropdownItemsFormat[numItems++] = STR_EMPTY;
gDropdownItemsFormat[numItems++] = STR_UPDATE_AVAILABLE;
Show update information on main screen & in floppy menu
2020-08-02 23:38:00 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowText(
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
{ w->windowPos.x + widget->left, w->windowPos.y + widget->top }, widget->height() + 1, w->colours[0] | 0x80,
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::Flag::StayOpen, numItems);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_CHEATS:
Move common actions from debug menu into cheats menu (#8892) This aims to make it less necessary for users to enable debugging tools.
2019-03-17 12:52:32 +01:00
top_toolbar_init_cheats_menu(w, widget);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_VIEW_MENU:
top_toolbar_init_view_menu(w, widget);
break;
case WIDX_MAP:
Implement custom menu items
2020-02-11 22:26:05 +01:00
top_toolbar_init_map_menu(w, widget);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_FASTFORWARD:
top_toolbar_init_fastforward_menu(w, widget);
break;
case WIDX_ROTATE:
top_toolbar_init_rotate_menu(w, widget);
break;
case WIDX_DEBUG:
top_toolbar_init_debug_menu(w, widget);
break;
case WIDX_NETWORK:
top_toolbar_init_network_menu(w, widget);
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_top_toolbar_scenarioselect_callback(const utf8* path)
change scenario select to callback mechanism
2016-02-10 19:44:00 +01:00
{
Fix #7678: Crash when Loading or starting a new game... ...while having object selection window open Close the object manager window before loading the next park.
2018-06-14 00:29:05 +02:00
window_close_by_class(WC_EDITOR_OBJECT_SELECTION);
Refactor game load functions, resolves #6011
2017-08-23 08:04:36 +02:00
context_load_park_from_file(path);
change scenario select to callback mechanism
2016-02-10 19:44:00 +01:00
}
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
/**
add better disable clearance cheat
2015-06-26 23:40:09 +02:00
*
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
* rct2: 0x0066C9EA
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_top_toolbar_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_FILE_MENU:
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
// New game is only available in the normal game. Skip one position to avoid incorrect mappings in the menus of the
// other modes.
if (gScreenFlags & (SCREEN_FLAGS_SCENARIO_EDITOR))
dropdownIndex += 1;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
// Quicksave is only available in the normal game. Skip one position to avoid incorrect mappings in the menus of the
// other modes.
if (gScreenFlags & (SCREEN_FLAGS_SCENARIO_EDITOR) && dropdownIndex > DDIDX_LOAD_GAME)
dropdownIndex += 1;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
// Track designer and track designs manager start with About, not Load/save
if (gScreenFlags & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER))
dropdownIndex += DDIDX_ABOUT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (dropdownIndex)
{
case DDIDX_NEW_GAME:
{
auto intent = Intent(WC_SCENARIO_SELECT);
Use named casts on openrct2-ui/windows (#11136)
2020-04-18 13:32:48 +02:00
intent.putExtra(INTENT_EXTRA_CALLBACK, reinterpret_cast<void*>(window_top_toolbar_scenarioselect_callback));
clang-format UI windows
2018-06-22 23:21:44 +02:00
context_open_intent(&intent);
break;
}
case DDIDX_LOAD_GAME:
Add LoadOrQuiteAction
2019-02-21 10:34:30 +01:00
{
auto loadOrQuitAction = LoadOrQuitAction(LoadOrQuitModes::OpenSavePrompt);
GameActions::Execute(&loadOrQuitAction);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Add LoadOrQuiteAction
2019-02-21 10:34:30 +01:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
case DDIDX_SAVE_GAME:
tool_cancel();
save_game();
break;
case DDIDX_SAVE_GAME_AS:
if (gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR)
{
auto intent = Intent(WC_LOADSAVE);
intent.putExtra(INTENT_EXTRA_LOADSAVE_TYPE, LOADSAVETYPE_SAVE | LOADSAVETYPE_LANDSCAPE);
Remove gS6Info
2021-04-05 19:01:43 +02:00
intent.putExtra(INTENT_EXTRA_PATH, gScenarioName);
clang-format UI windows
2018-06-22 23:21:44 +02:00
context_open_intent(&intent);
}
else
{
tool_cancel();
save_game_as();
}
break;
case DDIDX_ABOUT:
context_open_window(WC_ABOUT);
break;
case DDIDX_OPTIONS:
context_open_window(WC_OPTIONS);
break;
case DDIDX_SCREENSHOT:
gScreenshotCountdown = 10;
break;
case DDIDX_GIANT_SCREENSHOT:
screenshot_giant();
break;
Add a bug-report item in file dropdown menu
2021-09-05 13:56:52 +02:00
case DDIDX_FILE_BUG_ON_GITHUB:
{
std::string url = "https://github.com/OpenRCT2/OpenRCT2/issues/"
"new?assignees=&labels=bug&template=bug_report.yaml";
auto versionStr = String::URLEncode(gVersionInfoFull);
url.append("&openrct2_build=" + versionStr);
OpenRCT2::GetContext()->GetUiContext()->OpenURL(url);
}
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
case DDIDX_QUIT_TO_MENU:
Add LoadOrQuiteAction
2019-02-21 10:34:30 +01:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
window_close_by_class(WC_MANAGE_TRACK_DESIGN);
window_close_by_class(WC_TRACK_DELETE_PROMPT);
Close #12412: Refactor PROMPT_MODE to use strong enum (#13076)
2020-10-03 04:04:59 +02:00
auto loadOrQuitAction = LoadOrQuitAction(LoadOrQuitModes::OpenSavePrompt, PromptMode::SaveBeforeQuit);
Add LoadOrQuiteAction
2019-02-21 10:34:30 +01:00
GameActions::Execute(&loadOrQuitAction);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Add LoadOrQuiteAction
2019-02-21 10:34:30 +01:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
case DDIDX_EXIT_OPENRCT2:
context_quit();
break;
Show update information on main screen & in floppy menu
2020-08-02 23:38:00 +02:00
case DDIDX_UPDATE_AVAILABLE:
Merge "new version" window back to changelog
2020-08-13 22:57:14 +02:00
context_open_window_view(WV_NEW_VERSION_INFO);
Show update information on main screen & in floppy menu
2020-08-02 23:38:00 +02:00
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_CHEATS:
Move common actions from debug menu into cheats menu (#8892) This aims to make it less necessary for users to enable debugging tools.
2019-03-17 12:52:32 +01:00
top_toolbar_cheats_menu_dropdown(dropdownIndex);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_VIEW_MENU:
top_toolbar_view_menu_dropdown(dropdownIndex);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_MAP:
Implement custom menu items
2020-02-11 22:26:05 +01:00
top_toolbar_map_menu_dropdown(dropdownIndex);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_FASTFORWARD:
top_toolbar_fastforward_menu_dropdown(dropdownIndex);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_ROTATE:
top_toolbar_rotate_menu_dropdown(dropdownIndex);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
case WIDX_DEBUG:
top_toolbar_debug_menu_dropdown(dropdownIndex);
break;
case WIDX_NETWORK:
top_toolbar_network_menu_dropdown(dropdownIndex);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
break;
}
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
* rct2: 0x0066C810
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_top_toolbar_invalidate(rct_window* w)
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t x, enabledWidgets, widgetIndex, widgetWidth, firstAlignment;
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_widget* widget;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Enable / disable buttons
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_top_toolbar_widgets[WIDX_PAUSE].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_FILE_MENU].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_ZOOM_OUT].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_ZOOM_IN].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_ROTATE].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_VIEW_MENU].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_MAP].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_MUTE].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_CHAT].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_LAND].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_WATER].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_SCENERY].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_PATH].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_CONSTRUCT_RIDE].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_RIDES].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_PARK].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_STAFF].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_GUESTS].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_CLEAR_SCENERY].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_FINANCES].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_RESEARCH].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_FASTFORWARD].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_CHEATS].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_DEBUG].type = gConfigGeneral.debugging_tools ? WindowWidgetType::TrnBtn
: WindowWidgetType::Empty;
window_top_toolbar_widgets[WIDX_NEWS].type = WindowWidgetType::TrnBtn;
window_top_toolbar_widgets[WIDX_NETWORK].type = WindowWidgetType::TrnBtn;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Fix #6111: Mute button always visible in editor
2017-08-02 22:28:23 +02:00
if (!gConfigInterface.toolbar_show_mute)
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_top_toolbar_widgets[WIDX_MUTE].type = WindowWidgetType::Empty;
Fix #6111: Mute button always visible in editor
2017-08-02 22:28:23 +02:00
Chat toggle button (#8648) * Add chat_available() * Add appropriate strings * Add new Chat icon * Implement Chat button * CS * Fix chat icon * Make chat icon a bit smaller and less bright * Update chat icon * Update changelog
2019-02-03 23:30:34 +01:00
if (!gConfigInterface.toolbar_show_chat)
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_top_toolbar_widgets[WIDX_CHAT].type = WindowWidgetType::Empty;
Fix #15257: Chat widgets removed from Scenario Editor (#15365) * Update TopToolbar.cpp Removed else statement which caused the game to skip toolbar element deactivations. * Update contributors.md Adding name to contrib.md * Update changelog.txt Updated changelog * Update changelog.txt Fixing changelog item position
2021-09-08 12:39:34 +02:00
if (!gConfigInterface.toolbar_show_research)
window_top_toolbar_widgets[WIDX_RESEARCH].type = WindowWidgetType::Empty;
if (!gConfigInterface.toolbar_show_cheats)
window_top_toolbar_widgets[WIDX_CHEATS].type = WindowWidgetType::Empty;
if (!gConfigInterface.toolbar_show_news)
window_top_toolbar_widgets[WIDX_NEWS].type = WindowWidgetType::Empty;
if (!gConfigInterface.toolbar_show_zoom)
{
window_top_toolbar_widgets[WIDX_ZOOM_IN].type = WindowWidgetType::Empty;
window_top_toolbar_widgets[WIDX_ZOOM_OUT].type = WindowWidgetType::Empty;
Chat toggle button (#8648) * Add chat_available() * Add appropriate strings * Add new Chat icon * Implement Chat button * CS * Fix chat icon * Make chat icon a bit smaller and less bright * Update chat icon * Update changelog
2019-02-03 23:30:34 +01:00
}
Add pause button to the Track Designer (#13483) Fixes #13398
2020-11-30 17:27:36 +01:00
if (gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR || gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_top_toolbar_widgets[WIDX_PAUSE].type = WindowWidgetType::Empty;
Add pause button to the Track Designer (#13483) Fixes #13398
2020-11-30 17:27:36 +01:00
}
Fix #15257: Chat widgets removed from Scenario Editor (#15365) * Update TopToolbar.cpp Removed else statement which caused the game to skip toolbar element deactivations. * Update contributors.md Adding name to contrib.md * Update changelog.txt Updated changelog * Update changelog.txt Fixing changelog item position
2021-09-08 12:39:34 +02:00
if ((gParkFlags & PARK_FLAGS_NO_MONEY) || !gConfigInterface.toolbar_show_finances)
window_top_toolbar_widgets[WIDX_FINANCES].type = WindowWidgetType::Empty;
Add pause button to the Track Designer (#13483) Fixes #13398
2020-11-30 17:27:36 +01:00
if (gScreenFlags & SCREEN_FLAGS_EDITOR)
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_top_toolbar_widgets[WIDX_PARK].type = WindowWidgetType::Empty;
window_top_toolbar_widgets[WIDX_STAFF].type = WindowWidgetType::Empty;
window_top_toolbar_widgets[WIDX_GUESTS].type = WindowWidgetType::Empty;
window_top_toolbar_widgets[WIDX_FINANCES].type = WindowWidgetType::Empty;
window_top_toolbar_widgets[WIDX_RESEARCH].type = WindowWidgetType::Empty;
window_top_toolbar_widgets[WIDX_NEWS].type = WindowWidgetType::Empty;
window_top_toolbar_widgets[WIDX_NETWORK].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Remove gS6Info
2021-04-05 19:01:43 +02:00
if (gEditorStep != EditorStep::LandscapeEditor)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_top_toolbar_widgets[WIDX_LAND].type = WindowWidgetType::Empty;
window_top_toolbar_widgets[WIDX_WATER].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Remove gS6Info
2021-04-05 19:01:43 +02:00
if (gEditorStep != EditorStep::RollercoasterDesigner)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Enhance the track designer with ability to add scenery and footpaths This brings feature parity with Rollercoaster Tycoon Classic (RCTC) Includes: * Re-enabled buttons: Ride List, Map, Scenery, Path, Clear Scenery * Add all standard footpaths and core scenery objects to the object selection The max limit of 4 rides has not changed; other object types can have more than 4 Only a minimum set of scenery is enabled, as the full set cannot be included
2020-12-14 22:02:43 +01:00
window_top_toolbar_widgets[WIDX_RIDES].type = WindowWidgetType::Empty;
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_top_toolbar_widgets[WIDX_CONSTRUCT_RIDE].type = WindowWidgetType::Empty;
window_top_toolbar_widgets[WIDX_FASTFORWARD].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Remove gS6Info
2021-04-05 19:01:43 +02:00
if (gEditorStep != EditorStep::LandscapeEditor && gEditorStep != EditorStep::RollercoasterDesigner)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Enhance the track designer with ability to add scenery and footpaths This brings feature parity with Rollercoaster Tycoon Classic (RCTC) Includes: * Re-enabled buttons: Ride List, Map, Scenery, Path, Clear Scenery * Add all standard footpaths and core scenery objects to the object selection The max limit of 4 rides has not changed; other object types can have more than 4 Only a minimum set of scenery is enabled, as the full set cannot be included
2020-12-14 22:02:43 +01:00
window_top_toolbar_widgets[WIDX_MAP].type = WindowWidgetType::Empty;
window_top_toolbar_widgets[WIDX_SCENERY].type = WindowWidgetType::Empty;
window_top_toolbar_widgets[WIDX_PATH].type = WindowWidgetType::Empty;
window_top_toolbar_widgets[WIDX_CLEAR_SCENERY].type = WindowWidgetType::Empty;
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
window_top_toolbar_widgets[WIDX_ZOOM_OUT].type = WindowWidgetType::Empty;
window_top_toolbar_widgets[WIDX_ZOOM_IN].type = WindowWidgetType::Empty;
window_top_toolbar_widgets[WIDX_ROTATE].type = WindowWidgetType::Empty;
window_top_toolbar_widgets[WIDX_VIEW_MENU].type = WindowWidgetType::Empty;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Fix #15257: Chat widgets removed from Scenario Editor (#15365) * Update TopToolbar.cpp Removed else statement which caused the game to skip toolbar element deactivations. * Update contributors.md Adding name to contrib.md * Update changelog.txt Updated changelog * Update changelog.txt Fixing changelog item position
2021-09-08 12:39:34 +02:00
switch (network_get_mode())
{
case NETWORK_MODE_NONE:
window_top_toolbar_widgets[WIDX_NETWORK].type = WindowWidgetType::Empty;
window_top_toolbar_widgets[WIDX_CHAT].type = WindowWidgetType::Empty;
break;
case NETWORK_MODE_CLIENT:
window_top_toolbar_widgets[WIDX_PAUSE].type = WindowWidgetType::Empty;
[[fallthrough]];
case NETWORK_MODE_SERVER:
window_top_toolbar_widgets[WIDX_FASTFORWARD].type = WindowWidgetType::Empty;
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
enabledWidgets = 0;
Chat toggle button (#8648) * Add chat_available() * Add appropriate strings * Add new Chat icon * Implement Chat button * CS * Fix chat icon * Make chat icon a bit smaller and less bright * Update chat icon * Update changelog
2019-02-03 23:30:34 +01:00
for (int i = WIDX_PAUSE; i <= WIDX_CHAT; i++)
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
if (window_top_toolbar_widgets[i].type != WindowWidgetType::Empty)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
enabledWidgets |= (1 << i);
w->enabled_widgets = enabledWidgets;
// Align left hand side toolbar buttons
firstAlignment = 1;
x = 0;
Use std::size instead of Util::CountOf
2018-11-21 23:16:04 +01:00
for (size_t i = 0; i < std::size(left_aligned_widgets_order); ++i)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
widgetIndex = left_aligned_widgets_order[i];
widget = &window_top_toolbar_widgets[widgetIndex];
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
if (widget->type == WindowWidgetType::Empty && widgetIndex != WIDX_SEPARATOR)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
continue;
if (firstAlignment && widgetIndex == WIDX_SEPARATOR)
continue;
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
widgetWidth = widget->width();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
widget->left = x;
x += widgetWidth;
widget->right = x;
x += 1;
firstAlignment = 0;
}
// Align right hand side toolbar buttons
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t screenWidth = context_get_width();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
firstAlignment = 1;
Replace Math::Min and Max with std variants
2018-06-20 17:11:35 +02:00
x = std::max(640, screenWidth);
Use std::size instead of Util::CountOf
2018-11-21 23:16:04 +01:00
for (size_t i = 0; i < std::size(right_aligned_widgets_order); ++i)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
widgetIndex = right_aligned_widgets_order[i];
widget = &window_top_toolbar_widgets[widgetIndex];
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
if (widget->type == WindowWidgetType::Empty && widgetIndex != WIDX_SEPARATOR)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
continue;
if (firstAlignment && widgetIndex == WIDX_SEPARATOR)
continue;
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
widgetWidth = widget->width();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
x -= 1;
widget->right = x;
x -= widgetWidth;
widget->left = x;
firstAlignment = 0;
}
// Footpath button pressed down
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
if (window_find_by_class(WC_FOOTPATH) == nullptr)
Use consistent left-shift notation for widgets (#14956)
2021-06-26 14:23:15 +02:00
w->pressed_widgets &= ~(1ULL << WIDX_PATH);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
else
Use consistent left-shift notation for widgets (#14956)
2021-06-26 14:23:15 +02:00
w->pressed_widgets |= (1ULL << WIDX_PATH);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (gGamePaused & GAME_PAUSED_NORMAL)
Use consistent left-shift notation for widgets (#14956)
2021-06-26 14:23:15 +02:00
w->pressed_widgets |= (1ULL << WIDX_PAUSE);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
else
Use consistent left-shift notation for widgets (#14956)
2021-06-26 14:23:15 +02:00
w->pressed_widgets &= ~(1ULL << WIDX_PAUSE);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Move the audio code into OpenRCT2 namespace
2020-10-06 23:34:42 +02:00
if (!OpenRCT2::Audio::gGameSoundsOff)
Use remap flags, SPRITE_ID_PALETTE_COLOUR_1 and _2 in many more places
2017-07-20 20:56:29 +02:00
window_top_toolbar_widgets[WIDX_MUTE].image = IMAGE_TYPE_REMAP | SPR_G2_TOOLBAR_MUTE;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
else
Use remap flags, SPRITE_ID_PALETTE_COLOUR_1 and _2 in many more places
2017-07-20 20:56:29 +02:00
window_top_toolbar_widgets[WIDX_MUTE].image = IMAGE_TYPE_REMAP | SPR_G2_TOOLBAR_UNMUTE;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Change map toolbar icon with current rotation (#9154)
2019-05-02 00:07:20 +02:00
// Set map button to the right image.
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
if (window_top_toolbar_widgets[WIDX_MAP].type != WindowWidgetType::Empty)
Change map toolbar icon with current rotation (#9154)
2019-05-02 00:07:20 +02:00
{
static constexpr uint32_t imageIdByRotation[] = {
SPR_G2_MAP_NORTH,
SPR_G2_MAP_WEST,
SPR_G2_MAP_SOUTH,
SPR_G2_MAP_EAST,
};
uint32_t mapImageId = imageIdByRotation[get_current_rotation()];
window_top_toolbar_widgets[WIDX_MAP].image = IMAGE_TYPE_REMAP | mapImageId;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Zoomed out/in disable. Not sure where this code is in the original.
Fix #14066: NPE in window_top_toolbar_invalidate()
2021-02-12 18:48:38 +01:00
const auto* mainWindow = window_get_main();
if (mainWindow == nullptr || mainWindow->viewport == nullptr)
{
log_error("mainWindow or mainWindow->viewport is null!");
return;
}
if (mainWindow->viewport->zoom == ZoomLevel::min())
Add constant for maximum zoom level
2017-11-30 22:21:25 +01:00
{
Use consistent left-shift notation for widgets (#14956)
2021-06-26 14:23:15 +02:00
w->disabled_widgets |= (1ULL << WIDX_ZOOM_IN);
Add constant for maximum zoom level
2017-11-30 22:21:25 +01:00
}
Fix #14066: NPE in window_top_toolbar_invalidate()
2021-02-12 18:48:38 +01:00
else if (mainWindow->viewport->zoom >= ZoomLevel::max())
Add constant for maximum zoom level
2017-11-30 22:21:25 +01:00
{
Use consistent left-shift notation for widgets (#14956)
2021-06-26 14:23:15 +02:00
w->disabled_widgets |= (1ULL << WIDX_ZOOM_OUT);
Add constant for maximum zoom level
2017-11-30 22:21:25 +01:00
}
else
{
Use consistent left-shift notation for widgets (#14956)
2021-06-26 14:23:15 +02:00
w->disabled_widgets &= ~((1ULL << WIDX_ZOOM_IN) | (1ULL << WIDX_ZOOM_OUT));
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
* rct2: 0x0066C8EC
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_top_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi)
add top toolbar and ride types
2014-04-11 03:42:39 +02:00
{
Part of #11569: Use ScreenCoordsXY instead of <x,y>
2020-06-11 15:11:12 +02:00
int32_t imgId;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor UI/Interface Window to Title Case (#13367)
2020-11-04 05:52:23 +01:00
WindowDrawWidgets(w, dpi);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Part of #11569: Use ScreenCoordsXY instead of <x,y>
2020-06-11 15:11:12 +02:00
ScreenCoordsXY screenPos{};
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Draw staff button image (setting masks to the staff colours)
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
if (window_top_toolbar_widgets[WIDX_STAFF].type != WindowWidgetType::Empty)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Part of #11569: Use ScreenCoordsXY instead of <x,y>
2020-06-11 15:11:12 +02:00
screenPos = { w->windowPos.x + window_top_toolbar_widgets[WIDX_STAFF].left,
w->windowPos.y + window_top_toolbar_widgets[WIDX_STAFF].top };
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
imgId = SPR_TOOLBAR_STAFF;
Refactor Widget to TitleCase (#13355)
2020-11-03 22:29:22 +01:00
if (WidgetIsPressed(w, WIDX_STAFF))
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
imgId++;
Allow passing ImageId into gfx_draw_sprite()
2021-03-23 11:58:09 +01:00
gfx_draw_sprite(dpi, ImageId(imgId, gStaffHandymanColour, gStaffMechanicColour), screenPos);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Draw fast forward button
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
if (window_top_toolbar_widgets[WIDX_FASTFORWARD].type != WindowWidgetType::Empty)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Part of #11569: Use ScreenCoordsXY instead of <x,y>
2020-06-11 15:11:12 +02:00
screenPos = { w->windowPos.x + window_top_toolbar_widgets[WIDX_FASTFORWARD].left + 0,
w->windowPos.y + window_top_toolbar_widgets[WIDX_FASTFORWARD].top + 0 };
Refactor Widget to TitleCase (#13355)
2020-11-03 22:29:22 +01:00
if (WidgetIsPressed(w, WIDX_FASTFORWARD))
Part of #11569: Use ScreenCoordsXY instead of <x,y>
2020-06-11 15:11:12 +02:00
screenPos.y++;
Allow passing ImageId into gfx_draw_sprite()
2021-03-23 11:58:09 +01:00
gfx_draw_sprite(dpi, ImageId(SPR_G2_FASTFORWARD), screenPos + ScreenCoordsXY{ 6, 3 });
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
for (int32_t i = 0; i < gGameSpeed && gGameSpeed <= 4; i++)
{
Allow passing ImageId into gfx_draw_sprite()
2021-03-23 11:58:09 +01:00
gfx_draw_sprite(dpi, ImageId(SPR_G2_SPEED_ARROW), screenPos + ScreenCoordsXY{ 5 + i * 5, 15 });
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
for (int32_t i = 0; i < 3 && i < gGameSpeed - 4 && gGameSpeed >= 5; i++)
{
Allow passing ImageId into gfx_draw_sprite()
2021-03-23 11:58:09 +01:00
gfx_draw_sprite(dpi, ImageId(SPR_G2_HYPER_ARROW), screenPos + ScreenCoordsXY{ 5 + i * 6, 15 });
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
// Draw cheats button
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
if (window_top_toolbar_widgets[WIDX_CHEATS].type != WindowWidgetType::Empty)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
screenPos = w->windowPos
+ ScreenCoordsXY{ window_top_toolbar_widgets[WIDX_CHEATS].left - 1,
window_top_toolbar_widgets[WIDX_CHEATS].top - 1 };
Refactor Widget to TitleCase (#13355)
2020-11-03 22:29:22 +01:00
if (WidgetIsPressed(w, WIDX_CHEATS))
Part of #11569: Use ScreenCoordsXY instead of <x,y>
2020-06-11 15:11:12 +02:00
screenPos.y++;
Allow passing ImageId into gfx_draw_sprite()
2021-03-23 11:58:09 +01:00
gfx_draw_sprite(dpi, ImageId(SPR_G2_SANDBOX), screenPos);
Added icon to Cheats button to indicate clearance checks are disabled
2020-05-25 20:18:39 +02:00
Apply suggestions from code review Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2020-05-30 00:12:07 +02:00
// Draw an overlay if clearance checks are disabled
Apply suggestions from code review Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2020-05-30 11:59:54 +02:00
if (gCheatsDisableClearanceChecks)
Added icon to Cheats button to indicate clearance checks are disabled
2020-05-25 20:18:39 +02:00
{
Replace gfx_draw_string_right() with DrawTextBasic (#12966)
2020-09-19 02:39:00 +02:00
DrawTextBasic(
dpi, screenPos + ScreenCoordsXY{ 26, 2 }, STR_OVERLAY_CLEARANCE_CHECKS_DISABLED, {},
Unify calls to DrawTextBasic
2021-02-27 14:32:13 +01:00
{ COLOUR_DARK_ORANGE | COLOUR_FLAG_OUTLINE, TextAlignment::RIGHT });
Added icon to Cheats button to indicate clearance checks are disabled
2020-05-25 20:18:39 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Chat toggle button (#8648) * Add chat_available() * Add appropriate strings * Add new Chat icon * Implement Chat button * CS * Fix chat icon * Make chat icon a bit smaller and less bright * Update chat icon * Update changelog
2019-02-03 23:30:34 +01:00
// Draw chat button
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
if (window_top_toolbar_widgets[WIDX_CHAT].type != WindowWidgetType::Empty)
Chat toggle button (#8648) * Add chat_available() * Add appropriate strings * Add new Chat icon * Implement Chat button * CS * Fix chat icon * Make chat icon a bit smaller and less bright * Update chat icon * Update changelog
2019-02-03 23:30:34 +01:00
{
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
screenPos = w->windowPos
+ ScreenCoordsXY{ window_top_toolbar_widgets[WIDX_CHAT].left, window_top_toolbar_widgets[WIDX_CHAT].top - 2 };
Refactor Widget to TitleCase (#13355)
2020-11-03 22:29:22 +01:00
if (WidgetIsPressed(w, WIDX_CHAT))
Part of #11569: Use ScreenCoordsXY instead of <x,y>
2020-06-11 15:11:12 +02:00
screenPos.y++;
Allow passing ImageId into gfx_draw_sprite()
2021-03-23 11:58:09 +01:00
gfx_draw_sprite(dpi, ImageId(SPR_G2_CHAT), screenPos);
Chat toggle button (#8648) * Add chat_available() * Add appropriate strings * Add new Chat icon * Implement Chat button * CS * Fix chat icon * Make chat icon a bit smaller and less bright * Update chat icon * Update changelog
2019-02-03 23:30:34 +01:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Draw debug button
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
if (window_top_toolbar_widgets[WIDX_DEBUG].type != WindowWidgetType::Empty)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
screenPos = w->windowPos
+ ScreenCoordsXY{ window_top_toolbar_widgets[WIDX_DEBUG].left, window_top_toolbar_widgets[WIDX_DEBUG].top - 1 };
Refactor Widget to TitleCase (#13355)
2020-11-03 22:29:22 +01:00
if (WidgetIsPressed(w, WIDX_DEBUG))
Part of #11569: Use ScreenCoordsXY instead of <x,y>
2020-06-11 15:11:12 +02:00
screenPos.y++;
Allow passing ImageId into gfx_draw_sprite()
2021-03-23 11:58:09 +01:00
gfx_draw_sprite(dpi, ImageId(SPR_TAB_GEARS_0), screenPos);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Draw research button
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
if (window_top_toolbar_widgets[WIDX_RESEARCH].type != WindowWidgetType::Empty)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
screenPos = w->windowPos
+ ScreenCoordsXY{ window_top_toolbar_widgets[WIDX_RESEARCH].left - 1,
window_top_toolbar_widgets[WIDX_RESEARCH].top };
Refactor Widget to TitleCase (#13355)
2020-11-03 22:29:22 +01:00
if (WidgetIsPressed(w, WIDX_RESEARCH))
Part of #11569: Use ScreenCoordsXY instead of <x,y>
2020-06-11 15:11:12 +02:00
screenPos.y++;
Allow passing ImageId into gfx_draw_sprite()
2021-03-23 11:58:09 +01:00
gfx_draw_sprite(dpi, ImageId(SPR_TAB_FINANCES_RESEARCH_0), screenPos);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Draw finances button
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
if (window_top_toolbar_widgets[WIDX_FINANCES].type != WindowWidgetType::Empty)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
screenPos = w->windowPos
+ ScreenCoordsXY{ window_top_toolbar_widgets[WIDX_FINANCES].left + 3,
window_top_toolbar_widgets[WIDX_FINANCES].top + 1 };
Refactor Widget to TitleCase (#13355)
2020-11-03 22:29:22 +01:00
if (WidgetIsPressed(w, WIDX_FINANCES))
Part of #11569: Use ScreenCoordsXY instead of <x,y>
2020-06-11 15:11:12 +02:00
screenPos.y++;
Allow passing ImageId into gfx_draw_sprite()
2021-03-23 11:58:09 +01:00
gfx_draw_sprite(dpi, ImageId(SPR_FINANCE), screenPos);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Draw news button
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
if (window_top_toolbar_widgets[WIDX_NEWS].type != WindowWidgetType::Empty)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
screenPos = w->windowPos
+ ScreenCoordsXY{ window_top_toolbar_widgets[WIDX_NEWS].left + 3, window_top_toolbar_widgets[WIDX_NEWS].top + 0 };
Refactor Widget to TitleCase (#13355)
2020-11-03 22:29:22 +01:00
if (WidgetIsPressed(w, WIDX_NEWS))
Part of #11569: Use ScreenCoordsXY instead of <x,y>
2020-06-11 15:11:12 +02:00
screenPos.y++;
Allow passing ImageId into gfx_draw_sprite()
2021-03-23 11:58:09 +01:00
gfx_draw_sprite(dpi, ImageId(SPR_G2_TAB_NEWS), screenPos);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
// Draw network button
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
if (window_top_toolbar_widgets[WIDX_NETWORK].type != WindowWidgetType::Empty)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
FIx #12017 - Create gfx_draw_sprite overload (#12049) Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 17:48:17 +02:00
screenPos = w->windowPos
+ ScreenCoordsXY{ window_top_toolbar_widgets[WIDX_NETWORK].left + 3,
window_top_toolbar_widgets[WIDX_NETWORK].top + 0 };
Refactor Widget to TitleCase (#13355)
2020-11-03 22:29:22 +01:00
if (WidgetIsPressed(w, WIDX_NETWORK))
Part of #11569: Use ScreenCoordsXY instead of <x,y>
2020-06-11 15:11:12 +02:00
screenPos.y++;
Change multiplayer toolbar image to framed globe, with pressed state.
2019-05-02 12:32:45 +02:00
// Draw (de)sync icon.
Add graphics for desync notice
2019-02-05 10:43:27 +01:00
imgId = (network_is_desynchronised() ? SPR_G2_MULTIPLAYER_DESYNC : SPR_G2_MULTIPLAYER_SYNC);
Allow passing ImageId into gfx_draw_sprite()
2021-03-23 11:58:09 +01:00
gfx_draw_sprite(dpi, ImageId(imgId), screenPos + ScreenCoordsXY{ 3, 11 });
Add graphics for desync notice
2019-02-05 10:43:27 +01:00
Change multiplayer toolbar image to framed globe, with pressed state.
2019-05-02 12:32:45 +02:00
// Draw number of players.
Replace gfx_draw_string_right() with DrawTextBasic (#12966)
2020-09-19 02:39:00 +02:00
auto ft = Formatter();
ft.Add<int32_t>(network_get_num_players());
DrawTextBasic(
Unify calls to DrawTextBasic
2021-02-27 14:32:13 +01:00
dpi, screenPos + ScreenCoordsXY{ 23, 1 }, STR_COMMA16, ft,
{ COLOUR_WHITE | COLOUR_FLAG_OUTLINE, TextAlignment::RIGHT });
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Add newlines to the end of every file (sed/unix do this)
2014-04-21 11:27:48 +02:00
}
Window banner complete
2014-10-21 18:59:47 +02:00
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x006E3158
*/
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
static void repaint_scenery_tool_down(const ScreenCoordsXY& windowPos, rct_widgetindex widgetIndex)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Refactor viewport interaction flags and add plugin API
2021-02-10 02:06:18 +01:00
auto flags = EnumsToFlags(
ViewportInteractionItem::Scenery, ViewportInteractionItem::Wall, ViewportInteractionItem::LargeScenery,
ViewportInteractionItem::Banner);
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
auto info = get_map_coordinates_from_pos(windowPos, flags);
switch (info.SpriteType)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{
Close #13624: Refactor ViewportInteractionItem to use strong enum (#13657) * Closes #13624: Refactor ViewportInteractionItem to use strong enum
2020-12-29 19:09:15 +01:00
case ViewportInteractionItem::Scenery:
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Refactor SmallSceneryEntry (#14815)
2021-06-04 03:14:41 +02:00
auto* sceneryEntry = info.Element->AsSmallScenery()->GetEntry();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
// If can't repaint
Make scenery_small_entry_has_flag a member function (#15509)
2021-10-01 21:50:05 +02:00
if (!sceneryEntry->HasFlag(SMALL_SCENERY_FLAG_HAS_PRIMARY_COLOUR | SMALL_SCENERY_FLAG_HAS_GLASS))
clang-format UI windows
2018-06-22 23:21:44 +02:00
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
uint8_t quadrant = info.Element->AsSmallScenery()->GetSceneryQuadrant();
Implement small scenery set colour action
2019-04-06 16:59:40 +02:00
auto repaintScenery = SmallScenerySetColourAction(
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
{ info.Loc, info.Element->GetBaseZ() }, quadrant, info.Element->AsSmallScenery()->GetEntryIndex(),
gWindowSceneryPrimaryColour, gWindowScenerySecondaryColour);
Implement small scenery set colour action
2019-04-06 16:59:40 +02:00
GameActions::Execute(&repaintScenery);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
}
Close #13624: Refactor ViewportInteractionItem to use strong enum (#13657) * Closes #13624: Refactor ViewportInteractionItem to use strong enum
2020-12-29 19:09:15 +01:00
case ViewportInteractionItem::Wall:
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Rearrange WallSceneryEntry to enforce types (#14808) * Rearrange WallSceneryEntry to enforce types * Clang format Correct inverted nullptr check
2021-06-03 14:26:00 +02:00
auto* scenery_entry = info.Element->AsWall()->GetEntry();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
// If can't repaint
Rearrange WallSceneryEntry to enforce types (#14808) * Rearrange WallSceneryEntry to enforce types * Clang format Correct inverted nullptr check
2021-06-03 14:26:00 +02:00
if (!(scenery_entry->flags & (WALL_SCENERY_HAS_PRIMARY_COLOUR | WALL_SCENERY_HAS_GLASS)))
clang-format UI windows
2018-06-22 23:21:44 +02:00
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Implement wall set colour action
2019-04-06 20:36:44 +02:00
auto repaintScenery = WallSetColourAction(
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
{ info.Loc, info.Element->GetBaseZ(), info.Element->GetDirection() }, gWindowSceneryPrimaryColour,
gWindowScenerySecondaryColour, gWindowSceneryTertiaryColour);
Implement wall set colour action
2019-04-06 20:36:44 +02:00
GameActions::Execute(&repaintScenery);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
}
Close #13624: Refactor ViewportInteractionItem to use strong enum (#13657) * Closes #13624: Refactor ViewportInteractionItem to use strong enum
2020-12-29 19:09:15 +01:00
case ViewportInteractionItem::LargeScenery:
Name only flag for banner objects
2017-11-22 23:06:56 +01:00
{
Refactor LargeSceneryEntry and remove rct_scenery_entry (#14816)
2021-06-04 13:41:23 +02:00
auto* sceneryEntry = info.Element->AsLargeScenery()->GetEntry();
clang-format UI windows
2018-06-22 23:21:44 +02:00
// If can't repaint
Refactor LargeSceneryEntry and remove rct_scenery_entry (#14816)
2021-06-04 13:41:23 +02:00
if (!(sceneryEntry->flags & LARGE_SCENERY_FLAG_HAS_PRIMARY_COLOUR))
clang-format UI windows
2018-06-22 23:21:44 +02:00
return;
Implement large scenery set colour action
2019-04-07 09:51:14 +02:00
auto repaintScenery = LargeScenerySetColourAction(
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
{ info.Loc, info.Element->GetBaseZ(), info.Element->GetDirection() },
info.Element->AsLargeScenery()->GetSequenceIndex(), gWindowSceneryPrimaryColour, gWindowScenerySecondaryColour);
Implement large scenery set colour action
2019-04-07 09:51:14 +02:00
GameActions::Execute(&repaintScenery);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Name only flag for banner objects
2017-11-22 23:06:56 +01:00
}
Close #13624: Refactor ViewportInteractionItem to use strong enum (#13657) * Closes #13624: Refactor ViewportInteractionItem to use strong enum
2020-12-29 19:09:15 +01:00
case ViewportInteractionItem::Banner:
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
auto banner = info.Element->AsBanner()->GetBanner();
Refactor get banner
2019-07-25 18:51:22 +02:00
if (banner != nullptr)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
BannerSceneryEntry Refactor (#14810) * Refactor BannerSceneryEntry to enforce type * Remove old comment * Fix incorrect renameing
2021-06-03 22:43:30 +02:00
auto* bannerEntry = get_banner_entry(banner->type);
if (bannerEntry->flags & BANNER_ENTRY_FLAG_HAS_PRIMARY_COLOUR)
Refactor get banner
2019-07-25 18:51:22 +02:00
{
auto repaintScenery = BannerSetColourAction(
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
{ info.Loc, info.Element->GetBaseZ(), info.Element->AsBanner()->GetPosition() },
Refactor get banner
2019-07-25 18:51:22 +02:00
gWindowSceneryPrimaryColour);
Implement banner set colour action
2019-04-07 10:15:41 +02:00
Refactor get banner
2019-07-25 18:51:22 +02:00
GameActions::Execute(&repaintScenery);
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
break;
}
default:
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Started repaint_scenery_tool_down
2015-04-15 21:52:19 +02:00
}
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
static void scenery_eyedropper_tool_down(const ScreenCoordsXY& windowPos, rct_widgetindex widgetIndex)
Add scenery eyedropper button
2017-03-13 19:05:13 +01:00
{
Refactor viewport interaction flags and add plugin API
2021-02-10 02:06:18 +01:00
auto flags = EnumsToFlags(
ViewportInteractionItem::Scenery, ViewportInteractionItem::Wall, ViewportInteractionItem::LargeScenery,
ViewportInteractionItem::Banner, ViewportInteractionItem::FootpathItem);
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
auto info = get_map_coordinates_from_pos(windowPos, flags);
switch (info.SpriteType)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{
Close #13624: Refactor ViewportInteractionItem to use strong enum (#13657) * Closes #13624: Refactor ViewportInteractionItem to use strong enum
2020-12-29 19:09:15 +01:00
case ViewportInteractionItem::Scenery:
Replace direct access to large scenery colour with helper functions
2017-11-17 17:15:55 +01:00
{
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
SmallSceneryElement* sceneryElement = info.Element->AsSmallScenery();
Implement review requests
2020-03-18 16:22:08 +01:00
auto entryIndex = sceneryElement->GetEntryIndex();
Refactor SmallSceneryEntry (#14815)
2021-06-04 03:14:41 +02:00
auto* sceneryEntry = get_small_scenery_entry(entryIndex);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (sceneryEntry != nullptr)
Replace direct access to large scenery colour with helper functions
2017-11-17 17:15:55 +01:00
{
Clean up scenery handling
2020-03-13 14:44:34 +01:00
if (window_scenery_set_selected_item({ SCENERY_TYPE_SMALL, entryIndex }))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Remove remnants of old small scenery code
2018-09-13 18:12:20 +02:00
gWindowSceneryRotation = sceneryElement->GetDirectionWithOffset(get_current_rotation());
gWindowSceneryPrimaryColour = sceneryElement->GetPrimaryColour();
gWindowScenerySecondaryColour = sceneryElement->GetSecondaryColour();
clang-format UI windows
2018-06-22 23:21:44 +02:00
gWindowSceneryEyedropperEnabled = false;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Close #13624: Refactor ViewportInteractionItem to use strong enum (#13657) * Closes #13624: Refactor ViewportInteractionItem to use strong enum
2020-12-29 19:09:15 +01:00
case ViewportInteractionItem::Wall:
Replace direct access to large scenery colour with helper functions
2017-11-17 17:15:55 +01:00
{
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
auto entryIndex = info.Element->AsWall()->GetEntryIndex();
Rearrange WallSceneryEntry to enforce types (#14808) * Rearrange WallSceneryEntry to enforce types * Clang format Correct inverted nullptr check
2021-06-03 14:26:00 +02:00
auto* sceneryEntry = get_wall_entry(entryIndex);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (sceneryEntry != nullptr)
Replace direct access to large scenery colour with helper functions
2017-11-17 17:15:55 +01:00
{
Clean up scenery handling
2020-03-13 14:44:34 +01:00
if (window_scenery_set_selected_item({ SCENERY_TYPE_WALL, entryIndex }))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
gWindowSceneryPrimaryColour = info.Element->AsWall()->GetPrimaryColour();
gWindowScenerySecondaryColour = info.Element->AsWall()->GetSecondaryColour();
gWindowSceneryTertiaryColour = info.Element->AsWall()->GetTertiaryColour();
clang-format UI windows
2018-06-22 23:21:44 +02:00
gWindowSceneryEyedropperEnabled = false;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Close #13624: Refactor ViewportInteractionItem to use strong enum (#13657) * Closes #13624: Refactor ViewportInteractionItem to use strong enum
2020-12-29 19:09:15 +01:00
case ViewportInteractionItem::LargeScenery:
Replace direct access to large scenery colour with helper functions
2017-11-17 17:15:55 +01:00
{
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
auto entryIndex = info.Element->AsLargeScenery()->GetEntryIndex();
Refactor LargeSceneryEntry and remove rct_scenery_entry (#14816)
2021-06-04 13:41:23 +02:00
auto* sceneryEntry = get_large_scenery_entry(entryIndex);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (sceneryEntry != nullptr)
Replace direct access to large scenery colour with helper functions
2017-11-17 17:15:55 +01:00
{
Clean up scenery handling
2020-03-13 14:44:34 +01:00
if (window_scenery_set_selected_item({ SCENERY_TYPE_LARGE, entryIndex }))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
gWindowSceneryRotation = (get_current_rotation() + info.Element->GetDirection()) & 3;
gWindowSceneryPrimaryColour = info.Element->AsLargeScenery()->GetPrimaryColour();
gWindowScenerySecondaryColour = info.Element->AsLargeScenery()->GetSecondaryColour();
clang-format UI windows
2018-06-22 23:21:44 +02:00
gWindowSceneryEyedropperEnabled = false;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Close #13624: Refactor ViewportInteractionItem to use strong enum (#13657) * Closes #13624: Refactor ViewportInteractionItem to use strong enum
2020-12-29 19:09:15 +01:00
case ViewportInteractionItem::Banner:
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
auto banner = info.Element->AsBanner()->GetBanner();
Refactor get banner
2019-07-25 18:51:22 +02:00
if (banner != nullptr)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Refactor get banner
2019-07-25 18:51:22 +02:00
auto sceneryEntry = get_banner_entry(banner->type);
if (sceneryEntry != nullptr)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Clean up scenery handling
2020-03-13 14:44:34 +01:00
if (window_scenery_set_selected_item({ SCENERY_TYPE_BANNER, banner->type }))
Refactor get banner
2019-07-25 18:51:22 +02:00
{
gWindowSceneryEyedropperEnabled = false;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Close #13624: Refactor ViewportInteractionItem to use strong enum (#13657) * Closes #13624: Refactor ViewportInteractionItem to use strong enum
2020-12-29 19:09:15 +01:00
case ViewportInteractionItem::FootpathItem:
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
auto entryIndex = info.Element->AsPath()->GetAdditionEntryIndex();
Rework and refactor PathBitEntry (#14809)
2021-06-03 22:23:00 +02:00
auto* pathBitEntry = get_footpath_item_entry(entryIndex);
if (pathBitEntry != nullptr)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Clean up scenery handling
2020-03-13 14:44:34 +01:00
if (window_scenery_set_selected_item({ SCENERY_TYPE_PATH_ITEM, entryIndex }))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
gWindowSceneryEyedropperEnabled = false;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
default:
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Add scenery eyedropper button
2017-03-13 19:05:13 +01:00
}
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
static void sub_6E1F34_update_screen_coords_and_buttons_pressed(bool canRaiseItem, ScreenCoordsXY& screenPos)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
if (!canRaiseItem && !gCheatsDisableSupportLimits)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gSceneryCtrlPressed = false;
gSceneryShiftPressed = false;
Rename some small scenery flags, tidy up sub_6E1F34
2017-07-15 11:55:20 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
else
{
if (!gSceneryCtrlPressed)
{
Refactor UI/Input MouseInput to Title Case
2020-11-02 14:43:35 +01:00
if (InputTestPlaceObjectModifier(PLACE_OBJECT_MODIFIER_COPY_Z))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// CTRL pressed
Minor cleanups (#14954) * Fix uninitialized variables in InputManager * Use constexpr for const values * Add break statements instead of implicit fallthrough * Default initialize variables in Cheats window * Default initialize variables in News window * Default initialize window event pointers
2021-06-26 06:43:05 +02:00
constexpr auto flags = EnumsToFlags(
Refactor viewport interaction flags and add plugin API
2021-02-10 02:06:18 +01:00
ViewportInteractionItem::Terrain, ViewportInteractionItem::Ride, ViewportInteractionItem::Scenery,
ViewportInteractionItem::Footpath, ViewportInteractionItem::Wall, ViewportInteractionItem::LargeScenery);
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
auto info = get_map_coordinates_from_pos(screenPos, flags);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Close #13624: Refactor ViewportInteractionItem to use strong enum (#13657) * Closes #13624: Refactor ViewportInteractionItem to use strong enum
2020-12-29 19:09:15 +01:00
if (info.SpriteType != ViewportInteractionItem::None)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gSceneryCtrlPressed = true;
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
gSceneryCtrlPressZ = info.Element->GetBaseZ();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
Rename some small scenery flags, tidy up sub_6E1F34
2017-07-15 11:55:20 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
else
{
Refactor UI/Input MouseInput to Title Case
2020-11-02 14:43:35 +01:00
if (!(InputTestPlaceObjectModifier(PLACE_OBJECT_MODIFIER_COPY_Z)))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// CTRL not pressed
gSceneryCtrlPressed = false;
}
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (!gSceneryShiftPressed)
{
Refactor UI/Input MouseInput to Title Case
2020-11-02 14:43:35 +01:00
if (InputTestPlaceObjectModifier(PLACE_OBJECT_MODIFIER_SHIFT_Z))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// SHIFT pressed
gSceneryShiftPressed = true;
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
gSceneryShiftPressX = screenPos.x;
gSceneryShiftPressY = screenPos.y;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gSceneryShiftPressZOffset = 0;
}
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
else
{
Refactor UI/Input MouseInput to Title Case
2020-11-02 14:43:35 +01:00
if (InputTestPlaceObjectModifier(PLACE_OBJECT_MODIFIER_SHIFT_Z))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// SHIFT pressed
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
gSceneryShiftPressZOffset = (gSceneryShiftPressY - screenPos.y + 4);
Scale mouse delta by zoom when using shift. (#7868) * Scale mouse delta by zoom when using shift. * Clamp maximum height of object drag. * Address code review comments; add changelog entry.
2018-08-12 11:47:46 +02:00
// Scale delta by zoom to match mouse position.
auto* mainWnd = window_get_main();
Check for nullptr explicitly in operct2-ui (#15460)
2021-09-25 08:45:06 +02:00
if (mainWnd != nullptr && mainWnd->viewport != nullptr)
Scale mouse delta by zoom when using shift. (#7868) * Scale mouse delta by zoom when using shift. * Clamp maximum height of object drag. * Address code review comments; add changelog entry.
2018-08-12 11:47:46 +02:00
{
Create ZoomLevel struct to add two new zoom levels
2020-02-20 01:18:05 +01:00
gSceneryShiftPressZOffset = gSceneryShiftPressZOffset * mainWnd->viewport->zoom;
Scale mouse delta by zoom when using shift. (#7868) * Scale mouse delta by zoom when using shift. * Clamp maximum height of object drag. * Address code review comments; add changelog entry.
2018-08-12 11:47:46 +02:00
}
gSceneryShiftPressZOffset = floor2(gSceneryShiftPressZOffset, 8);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
screenPos.x = gSceneryShiftPressX;
screenPos.y = gSceneryShiftPressY;
Rename some small scenery flags, tidy up sub_6E1F34
2017-07-15 11:55:20 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
else
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// SHIFT not pressed
gSceneryShiftPressed = false;
}
}
}
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
static void sub_6E1F34_small_scenery(
const ScreenCoordsXY& sourceScreenPos, ObjectEntryIndex sceneryIndex, CoordsXY& gridPos, uint8_t* outQuadrant,
Close #13476: Unneeded colour variables in TopToolbar.cpp
2020-12-02 12:23:38 +01:00
Direction* outRotation)
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
{
rct_window* w = window_find_by_class(WC_SCENERY);
clang-format UI windows
2018-06-22 23:21:44 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
if (w == nullptr)
{
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
gridPos.SetNull();
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
return;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
auto screenPos = sourceScreenPos;
uint16_t maxPossibleHeight = (std::numeric_limits<decltype(TileElement::base_height)>::max() - 32) * ZoomLevel::max();
bool can_raise_item = false;
clang-format UI windows
2018-06-22 23:21:44 +02:00
Refactor SmallSceneryEntry (#14815)
2021-06-04 03:14:41 +02:00
auto* sceneryEntry = get_small_scenery_entry(sceneryIndex);
maxPossibleHeight -= sceneryEntry->height;
Make scenery_small_entry_has_flag a member function (#15509)
2021-10-01 21:50:05 +02:00
if (sceneryEntry->HasFlag(SMALL_SCENERY_FLAG_STACKABLE))
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
{
can_raise_item = true;
}
Remove LocationXY usage on openrct2-ui\windows\TopToolbar.cpp
2019-12-24 21:09:22 +01:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
sub_6E1F34_update_screen_coords_and_buttons_pressed(can_raise_item, screenPos);
clang-format UI windows
2018-06-22 23:21:44 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
// Small scenery
Make scenery_small_entry_has_flag a member function (#15509)
2021-10-01 21:50:05 +02:00
if (!sceneryEntry->HasFlag(SMALL_SCENERY_FLAG_FULL_TILE))
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
{
uint8_t quadrant = 0;
clang-format UI windows
2018-06-22 23:21:44 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
// If CTRL not pressed
if (!gSceneryCtrlPressed)
{
auto gridCoords = screen_get_map_xy_quadrant(screenPos, &quadrant);
Make use of std::optional strict
2021-09-13 18:47:13 +02:00
if (!gridCoords.has_value())
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
{
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
gridPos.SetNull();
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
return;
}
Make use of std::optional strict
2021-09-13 18:47:13 +02:00
gridPos = gridCoords.value();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
gSceneryPlaceZ = 0;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
// If SHIFT pressed
if (gSceneryShiftPressed)
{
auto* surfaceElement = map_get_surface_element_at(gridPos);
clang-format UI windows
2018-06-22 23:21:44 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
if (surfaceElement == nullptr)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
gridPos.SetNull();
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
return;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
int16_t z = (surfaceElement->GetBaseZ()) & 0xFFF0;
z += gSceneryShiftPressZOffset;
clang-format UI windows
2018-06-22 23:21:44 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
z = std::clamp<int16_t>(z, 16, maxPossibleHeight);
clang-format UI windows
2018-06-22 23:21:44 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
gSceneryPlaceZ = z;
}
}
else
{
int16_t z = gSceneryCtrlPressZ;
clang-format UI windows
2018-06-22 23:21:44 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
auto mapCoords = screen_get_map_xy_quadrant_with_z(screenPos, z, &quadrant);
Make use of std::optional strict
2021-09-13 18:47:13 +02:00
if (!mapCoords.has_value())
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
{
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
gridPos.SetNull();
clang-format UI windows
2018-06-22 23:21:44 +02:00
return;
}
Make use of std::optional strict
2021-09-13 18:47:13 +02:00
gridPos = mapCoords.value();
clang-format UI windows
2018-06-22 23:21:44 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
// If SHIFT pressed
if (gSceneryShiftPressed)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
z += gSceneryShiftPressZOffset;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
z = std::clamp<int16_t>(z, 16, maxPossibleHeight);
clang-format UI windows
2018-06-22 23:21:44 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
gSceneryPlaceZ = z;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
if (gridPos.IsNull())
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
uint8_t rotation = gWindowSceneryRotation;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Make scenery_small_entry_has_flag a member function (#15509)
2021-10-01 21:50:05 +02:00
if (!sceneryEntry->HasFlag(SMALL_SCENERY_FLAG_ROTATABLE))
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
{
rotation = util_rand() & 0xFF;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
rotation -= get_current_rotation();
rotation &= 0x3;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
if (gConfigGeneral.virtual_floor_style != VirtualFloorStyles::Off)
{
virtual_floor_set_height(gSceneryPlaceZ);
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
*outQuadrant = quadrant ^ 2;
*outRotation = rotation;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
return;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
// If CTRL not pressed
if (!gSceneryCtrlPressed)
{
Minor cleanups (#14954) * Fix uninitialized variables in InputManager * Use constexpr for const values * Add break statements instead of implicit fallthrough * Default initialize variables in Cheats window * Default initialize variables in News window * Default initialize window event pointers
2021-06-26 06:43:05 +02:00
constexpr auto flags = EnumsToFlags(ViewportInteractionItem::Terrain, ViewportInteractionItem::Water);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
auto info = get_map_coordinates_from_pos(screenPos, flags);
gridPos = info.Loc;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Close #13624: Refactor ViewportInteractionItem to use strong enum (#13657) * Closes #13624: Refactor ViewportInteractionItem to use strong enum
2020-12-29 19:09:15 +01:00
if (info.SpriteType == ViewportInteractionItem::None)
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
{
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
gridPos.SetNull();
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
return;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
// If CTRL and SHIFT not pressed
gSceneryPlaceZ = 0;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
// If SHIFT pressed
if (gSceneryShiftPressed)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
auto surfaceElement = map_get_surface_element_at(gridPos);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
if (surfaceElement == nullptr)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
gridPos.SetNull();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
}
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
int16_t z = (surfaceElement->GetBaseZ()) & 0xFFF0;
z += gSceneryShiftPressZOffset;
z = std::clamp<int16_t>(z, 16, maxPossibleHeight);
gSceneryPlaceZ = z;
}
}
else
{
int16_t z = gSceneryCtrlPressZ;
auto coords = screen_get_map_xy_with_z(screenPos, z);
Make use of std::optional strict
2021-09-13 18:47:13 +02:00
if (coords.has_value())
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
{
gridPos = *coords;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
else
Create scenery_small_entry_has_flag()
2017-12-04 20:09:38 +01:00
{
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
gridPos.SetNull();
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
}
// If SHIFT pressed
if (gSceneryShiftPressed)
{
z += gSceneryShiftPressZOffset;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
z = std::clamp<int16_t>(z, 16, maxPossibleHeight);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
gSceneryPlaceZ = z;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
if (gridPos.IsNull())
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
gridPos = gridPos.ToTileStart();
uint8_t rotation = gWindowSceneryRotation;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Make scenery_small_entry_has_flag a member function (#15509)
2021-10-01 21:50:05 +02:00
if (!sceneryEntry->HasFlag(SMALL_SCENERY_FLAG_ROTATABLE))
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
{
rotation = util_rand() & 0xFF;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
rotation -= get_current_rotation();
rotation &= 0x3;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
if (gConfigGeneral.virtual_floor_style != VirtualFloorStyles::Off)
{
virtual_floor_set_height(gSceneryPlaceZ);
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
*outQuadrant = 0;
*outRotation = rotation;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
static void sub_6E1F34_path_item(
const ScreenCoordsXY& sourceScreenPos, ObjectEntryIndex sceneryIndex, CoordsXY& gridPos, int32_t* outZ)
{
rct_window* w = window_find_by_class(WC_SCENERY);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
if (w == nullptr)
{
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
gridPos.SetNull();
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
return;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
auto screenPos = sourceScreenPos;
sub_6E1F34_update_screen_coords_and_buttons_pressed(false, screenPos);
// Path bits
Minor cleanups (#14954) * Fix uninitialized variables in InputManager * Use constexpr for const values * Add break statements instead of implicit fallthrough * Default initialize variables in Cheats window * Default initialize variables in News window * Default initialize window event pointers
2021-06-26 06:43:05 +02:00
constexpr auto flags = EnumsToFlags(ViewportInteractionItem::Footpath, ViewportInteractionItem::FootpathItem);
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
auto info = get_map_coordinates_from_pos(screenPos, flags);
gridPos = info.Loc;
Close #13624: Refactor ViewportInteractionItem to use strong enum (#13657) * Closes #13624: Refactor ViewportInteractionItem to use strong enum
2020-12-29 19:09:15 +01:00
if (info.SpriteType == ViewportInteractionItem::None)
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
{
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
gridPos.SetNull();
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
return;
}
if (gConfigGeneral.virtual_floor_style != VirtualFloorStyles::Off)
{
virtual_floor_set_height(gSceneryPlaceZ);
}
*outZ = info.Element->GetBaseZ();
}
static void sub_6E1F34_wall(
Close #13476: Unneeded colour variables in TopToolbar.cpp
2020-12-02 12:23:38 +01:00
const ScreenCoordsXY& sourceScreenPos, ObjectEntryIndex sceneryIndex, CoordsXY& gridPos, uint8_t* outEdges)
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
{
rct_window* w = window_find_by_class(WC_SCENERY);
if (w == nullptr)
{
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
gridPos.SetNull();
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
return;
}
auto screenPos = sourceScreenPos;
uint16_t maxPossibleHeight = (std::numeric_limits<decltype(TileElement::base_height)>::max() - 32) * ZoomLevel::max();
Rearrange WallSceneryEntry to enforce types (#14808) * Rearrange WallSceneryEntry to enforce types * Clang format Correct inverted nullptr check
2021-06-03 14:26:00 +02:00
auto* wallEntry = get_wall_entry(sceneryIndex);
if (wallEntry != nullptr)
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
{
Rearrange WallSceneryEntry to enforce types (#14808) * Rearrange WallSceneryEntry to enforce types * Clang format Correct inverted nullptr check
2021-06-03 14:26:00 +02:00
maxPossibleHeight -= wallEntry->height;
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
}
sub_6E1F34_update_screen_coords_and_buttons_pressed(true, screenPos);
// Walls
uint8_t edge;
// If CTRL not pressed
if (!gSceneryCtrlPressed)
{
auto gridCoords = screen_get_map_xy_side(screenPos, &edge);
Make use of std::optional strict
2021-09-13 18:47:13 +02:00
if (!gridCoords.has_value())
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
{
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
gridPos.SetNull();
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Make use of std::optional strict
2021-09-13 18:47:13 +02:00
gridPos = gridCoords.value();
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
gSceneryPlaceZ = 0;
// If SHIFT pressed
if (gSceneryShiftPressed)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
auto* surfaceElement = map_get_surface_element_at(gridPos);
if (surfaceElement == nullptr)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
gridPos.SetNull();
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
return;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
int16_t z = (surfaceElement->GetBaseZ()) & 0xFFF0;
z += gSceneryShiftPressZOffset;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
z = std::clamp<int16_t>(z, 16, maxPossibleHeight);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
gSceneryPlaceZ = z;
}
}
else
{
int16_t z = gSceneryCtrlPressZ;
auto mapCoords = screen_get_map_xy_side_with_z(screenPos, z, &edge);
Make use of std::optional strict
2021-09-13 18:47:13 +02:00
if (!mapCoords.has_value())
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
{
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
gridPos.SetNull();
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
return;
}
Make use of std::optional strict
2021-09-13 18:47:13 +02:00
gridPos = mapCoords.value();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
// If SHIFT pressed
if (gSceneryShiftPressed)
{
z += gSceneryShiftPressZOffset;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
z = std::clamp<int16_t>(z, 16, maxPossibleHeight);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
gSceneryPlaceZ = z;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
if (gridPos.IsNull())
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
if (gConfigGeneral.virtual_floor_style != VirtualFloorStyles::Off)
{
virtual_floor_set_height(gSceneryPlaceZ);
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
*outEdges = edge;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
static void sub_6E1F34_large_scenery(
Close #13476: Unneeded colour variables in TopToolbar.cpp
2020-12-02 12:23:38 +01:00
const ScreenCoordsXY& sourceScreenPos, ObjectEntryIndex sceneryIndex, CoordsXY& gridPos, Direction* outDirection)
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
{
rct_window* w = window_find_by_class(WC_SCENERY);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
if (w == nullptr)
{
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
gridPos.SetNull();
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
return;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
auto screenPos = sourceScreenPos;
uint16_t maxPossibleHeight = (std::numeric_limits<decltype(TileElement::base_height)>::max() - 32) * ZoomLevel::max();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor LargeSceneryEntry and remove rct_scenery_entry (#14816)
2021-06-04 13:41:23 +02:00
auto* sceneryEntry = get_large_scenery_entry(sceneryIndex);
if (sceneryEntry)
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
{
int16_t maxClearZ = 0;
Refactor LargeSceneryEntry and remove rct_scenery_entry (#14816)
2021-06-04 13:41:23 +02:00
for (int32_t i = 0; sceneryEntry->tiles[i].x_offset != -1; ++i)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Refactor LargeSceneryEntry and remove rct_scenery_entry (#14816)
2021-06-04 13:41:23 +02:00
maxClearZ = std::max<int16_t>(maxClearZ, sceneryEntry->tiles[i].z_clearance);
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
}
maxPossibleHeight = std::max(0, maxPossibleHeight - maxClearZ);
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
sub_6E1F34_update_screen_coords_and_buttons_pressed(true, screenPos);
// Large scenery
// If CTRL not pressed
if (!gSceneryCtrlPressed)
{
const CoordsXY mapCoords = ViewportInteractionGetTileStartAtCursor(screenPos);
gridPos = mapCoords;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
if (gridPos.IsNull())
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
return;
gSceneryPlaceZ = 0;
// If SHIFT pressed
if (gSceneryShiftPressed)
{
auto* surfaceElement = map_get_surface_element_at(gridPos);
if (surfaceElement == nullptr)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
gridPos.SetNull();
clang-format UI windows
2018-06-22 23:21:44 +02:00
return;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
int16_t z = (surfaceElement->GetBaseZ()) & 0xFFF0;
z += gSceneryShiftPressZOffset;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
z = std::clamp<int16_t>(z, 16, maxPossibleHeight);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
gSceneryPlaceZ = z;
}
}
else
{
int16_t z = gSceneryCtrlPressZ;
auto coords = screen_get_map_xy_with_z(screenPos, z);
Make use of std::optional strict
2021-09-13 18:47:13 +02:00
if (coords.has_value())
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
{
gridPos = *coords;
}
else
{
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
gridPos.SetNull();
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
// If SHIFT pressed
if (gSceneryShiftPressed)
{
z += gSceneryShiftPressZOffset;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
z = std::clamp<int16_t>(z, 16, maxPossibleHeight);
gSceneryPlaceZ = z;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Make placing scenery set virtual floor height
2017-09-29 04:45:20 +02:00
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
if (gridPos.IsNull())
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
return;
gridPos = gridPos.ToTileStart();
Direction rotation = gWindowSceneryRotation;
rotation -= get_current_rotation();
rotation &= 0x3;
Close #12431 Refactor VirtualFloorStyles to use strong enum (#12790)
2020-08-28 02:06:39 +02:00
if (gConfigGeneral.virtual_floor_style != VirtualFloorStyles::Off)
Make the virtual floor optional, on by default.
2018-01-10 15:05:05 +01:00
{
Move all Virtual Floor code from Map to its own file.
2018-03-04 17:44:42 +01:00
virtual_floor_set_height(gSceneryPlaceZ);
Make the virtual floor optional, on by default.
2018-01-10 15:05:05 +01:00
}
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
*outDirection = rotation;
Started 6e1f34
2015-04-18 13:17:44 +02:00
}
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
static void sub_6E1F34_banner(
const ScreenCoordsXY& sourceScreenPos, ObjectEntryIndex sceneryIndex, CoordsXY& gridPos, int32_t* outZ,
Direction* outDirection)
Clean up scenery handling
2020-03-13 14:44:34 +01:00
{
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
rct_window* w = window_find_by_class(WC_SCENERY);
Clean up scenery handling
2020-03-13 14:44:34 +01:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
if (w == nullptr)
{
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
gridPos.SetNull();
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
return;
}
Clean up scenery handling
2020-03-13 14:44:34 +01:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
auto screenPos = sourceScreenPos;
sub_6E1F34_update_screen_coords_and_buttons_pressed(false, screenPos);
Clean up scenery handling
2020-03-13 14:44:34 +01:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
// Banner
Minor cleanups (#14954) * Fix uninitialized variables in InputManager * Use constexpr for const values * Add break statements instead of implicit fallthrough * Default initialize variables in Cheats window * Default initialize variables in News window * Default initialize window event pointers
2021-06-26 06:43:05 +02:00
constexpr auto flags = EnumsToFlags(ViewportInteractionItem::Footpath, ViewportInteractionItem::FootpathItem);
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
auto info = get_map_coordinates_from_pos(screenPos, flags);
gridPos = info.Loc;
Clean up scenery handling
2020-03-13 14:44:34 +01:00
Close #13624: Refactor ViewportInteractionItem to use strong enum (#13657) * Closes #13624: Refactor ViewportInteractionItem to use strong enum
2020-12-29 19:09:15 +01:00
if (info.SpriteType == ViewportInteractionItem::None)
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
{
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
gridPos.SetNull();
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
return;
}
Clean up scenery handling
2020-03-13 14:44:34 +01:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
uint8_t rotation = gWindowSceneryRotation;
rotation -= get_current_rotation();
rotation &= 0x3;
Clean up scenery handling
2020-03-13 14:44:34 +01:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
auto z = info.Element->GetBaseZ();
Clean up scenery handling
2020-03-13 14:44:34 +01:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
if (info.Element->AsPath()->IsSloped())
{
if (rotation != direction_reverse(info.Element->AsPath()->GetSlopeDirection()))
{
z += (2 * COORDS_Z_STEP);
}
}
if (gConfigGeneral.virtual_floor_style != VirtualFloorStyles::Off)
{
virtual_floor_set_height(gSceneryPlaceZ);
}
Clean up scenery handling
2020-03-13 14:44:34 +01:00
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
*outDirection = rotation;
*outZ = z;
Clean up scenery handling
2020-03-13 14:44:34 +01:00
}
Window banner complete
2014-10-21 18:59:47 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
fix #1843
2015-08-31 00:45:45 +02:00
* rct2: 0x006E2CC6
Window banner complete
2014-10-21 18:59:47 +02:00
*/
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
static void window_top_toolbar_scenery_tool_down(const ScreenCoordsXY& windowPos, rct_window* w, rct_widgetindex widgetIndex)
fix #1843
2015-08-31 00:45:45 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
scenery_remove_ghost_tool_placement();
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gWindowSceneryPaintEnabled & 1)
{
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
repaint_scenery_tool_down(windowPos, widgetIndex);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Remove unnecessary else blocks
2021-09-15 22:22:15 +02:00
if (gWindowSceneryEyedropperEnabled)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
scenery_eyedropper_tool_down(windowPos, widgetIndex);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
}
Clean up scenery handling
2020-03-13 14:44:34 +01:00
ScenerySelection selectedTab = gWindowSceneryTabSelections[gWindowSceneryActiveTabIndex];
uint8_t sceneryType = selectedTab.SceneryType;
uint16_t selectedScenery = selectedTab.EntryIndex;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Make ScenerySelection implementation a bit cleaner
2020-03-15 13:19:26 +01:00
if (selectedTab.IsUndefined())
clang-format UI windows
2018-06-22 23:21:44 +02:00
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Remove LocationXY usage on openrct2-ui\windows\TopToolbar.cpp
2019-12-24 21:09:22 +01:00
CoordsXY gridPos;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (sceneryType)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
case SCENERY_TYPE_SMALL:
{
Clean up scenery handling
2020-03-13 14:44:34 +01:00
uint8_t quadrant;
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
Direction rotation;
Close #13476: Unneeded colour variables in TopToolbar.cpp
2020-12-02 12:23:38 +01:00
sub_6E1F34_small_scenery(windowPos, selectedScenery, gridPos, &quadrant, &rotation);
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
if (gridPos.IsNull())
Clean up scenery handling
2020-03-13 14:44:34 +01:00
return;
clang-format UI windows
2018-06-22 23:21:44 +02:00
int32_t quantity = 1;
Introduce Scenery-Scatter Tool Window.
2019-12-12 16:42:19 +01:00
bool isCluster = gWindowSceneryScatterEnabled
clang-format UI windows
2018-06-22 23:21:44 +02:00
&& (network_get_mode() != NETWORK_MODE_CLIENT
|| network_can_perform_command(network_get_current_player_group_index(), -2));
Introduce low, medium, and high density buttons to the scatter tool. Change window lay-out to more closely resemble others by introducing density buttons, along with new sprites. The amount of elements varies by density as follows: * Low: number of elements equal to tool size * Medium: twice as many elements as the tool size * High: three times as many elements as the tool size. Remove extraneous 'retry' clause.
2020-02-19 14:05:36 +01:00
Create scenery_small_entry_has_flag()
2017-12-04 20:09:38 +01:00
if (isCluster)
{
Introduce low, medium, and high density buttons to the scatter tool. Change window lay-out to more closely resemble others by introducing density buttons, along with new sprites. The amount of elements varies by density as follows: * Low: number of elements equal to tool size * Medium: twice as many elements as the tool size * High: three times as many elements as the tool size. Remove extraneous 'retry' clause.
2020-02-19 14:05:36 +01:00
switch (gWindowSceneryScatterDensity)
{
case ScatterToolDensity::LowDensity:
quantity = gWindowSceneryScatterSize;
break;
case ScatterToolDensity::MediumDensity:
quantity = gWindowSceneryScatterSize * 2;
break;
case ScatterToolDensity::HighDensity:
quantity = gWindowSceneryScatterSize * 3;
break;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Use game action for track design. Fix error titles. Add files to xcode project (#20) Finally get the placement code working Use game action for ghosts. Fix basequarter Remove references to old command Fix formating remove unused var Fix clang format
2019-02-26 14:19:17 +01:00
bool forceError = true;
Introduce low, medium, and high density buttons to the scatter tool. Change window lay-out to more closely resemble others by introducing density buttons, along with new sprites. The amount of elements varies by density as follows: * Low: number of elements equal to tool size * Medium: twice as many elements as the tool size * High: three times as many elements as the tool size. Remove extraneous 'retry' clause.
2020-02-19 14:05:36 +01:00
for (int32_t q = 0; q < quantity; q++)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
int32_t zCoordinate = gSceneryPlaceZ;
Refactor SmallSceneryEntry (#14815)
2021-06-04 03:14:41 +02:00
auto* sceneryEntry = get_small_scenery_entry(selectedScenery);
clang-format UI windows
2018-06-22 23:21:44 +02:00
Remove LocationXY usage on openrct2-ui\windows\TopToolbar.cpp
2019-12-24 21:09:22 +01:00
int16_t cur_grid_x = gridPos.x;
int16_t cur_grid_y = gridPos.y;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (isCluster)
{
Make scenery_small_entry_has_flag a member function (#15509)
2021-10-01 21:50:05 +02:00
if (!sceneryEntry->HasFlag(SMALL_SCENERY_FLAG_FULL_TILE))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Clean up scenery handling
2020-03-13 14:44:34 +01:00
quadrant = util_rand() & 3;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Refactor common parts of branched code. Change shifts to COORDS_XY_STEP multiplication.
2020-02-20 14:49:27 +01:00
int16_t grid_x_offset = (util_rand() % gWindowSceneryScatterSize) - (gWindowSceneryScatterSize / 2);
int16_t grid_y_offset = (util_rand() % gWindowSceneryScatterSize) - (gWindowSceneryScatterSize / 2);
if (gWindowSceneryScatterSize % 2 == 0)
Introduce Scenery-Scatter Tool Window.
2019-12-12 16:42:19 +01:00
{
Refactor common parts of branched code. Change shifts to COORDS_XY_STEP multiplication.
2020-02-20 14:49:27 +01:00
grid_x_offset += 1;
grid_y_offset += 1;
Introduce Scenery-Scatter Tool Window.
2019-12-12 16:42:19 +01:00
}
Refactor common parts of branched code. Change shifts to COORDS_XY_STEP multiplication.
2020-02-20 14:49:27 +01:00
cur_grid_x += grid_x_offset * COORDS_XY_STEP;
cur_grid_y += grid_y_offset * COORDS_XY_STEP;
clang-format UI windows
2018-06-22 23:21:44 +02:00
Make scenery_small_entry_has_flag a member function (#15509)
2021-10-01 21:50:05 +02:00
if (!sceneryEntry->HasFlag(SMALL_SCENERY_FLAG_ROTATABLE))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
gSceneryPlaceRotation = (gSceneryPlaceRotation + 1) & 3;
}
}
uint8_t zAttemptRange = 1;
if (gSceneryPlaceZ != 0 && gSceneryShiftPressed)
Create scenery_small_entry_has_flag()
2017-12-04 20:09:38 +01:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
zAttemptRange = 20;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Rename GameActionResult and use GameActions namespace instead (#13184)
2020-10-15 03:04:39 +02:00
auto success = GameActions::Status::Unknown;
Use game action for track design. Fix error titles. Add files to xcode project (#20) Finally get the placement code working Use game action for ghosts. Fix basequarter Remove references to old command Fix formating remove unused var Fix clang format
2019-02-26 14:19:17 +01:00
// Try find a valid z coordinate
clang-format UI windows
2018-06-22 23:21:44 +02:00
for (; zAttemptRange != 0; zAttemptRange--)
{
Use game action for track design. Fix error titles. Add files to xcode project (#20) Finally get the placement code working Use game action for ghosts. Fix basequarter Remove references to old command Fix formating remove unused var Fix clang format
2019-02-26 14:19:17 +01:00
auto smallSceneryPlaceAction = SmallSceneryPlaceAction(
Clean up scenery handling
2020-03-13 14:44:34 +01:00
{ cur_grid_x, cur_grid_y, gSceneryPlaceZ, gSceneryPlaceRotation }, quadrant, selectedScenery,
Close #13476: Unneeded colour variables in TopToolbar.cpp
2020-12-02 12:23:38 +01:00
gWindowSceneryPrimaryColour, gWindowScenerySecondaryColour);
Use game action for track design. Fix error titles. Add files to xcode project (#20) Finally get the placement code working Use game action for ghosts. Fix basequarter Remove references to old command Fix formating remove unused var Fix clang format
2019-02-26 14:19:17 +01:00
auto res = GameActions::Query(&smallSceneryPlaceAction);
success = res->Error;
Rename GameActionResult and use GameActions namespace instead (#13184)
2020-10-15 03:04:39 +02:00
if (res->Error == GameActions::Status::Ok)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
break;
}
Rename GameActionResult and use GameActions namespace instead (#13184)
2020-10-15 03:04:39 +02:00
if (res->Error == GameActions::Status::InsufficientFunds)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
break;
}
Use game action for track design. Fix error titles. Add files to xcode project (#20) Finally get the placement code working Use game action for ghosts. Fix basequarter Remove references to old command Fix formating remove unused var Fix clang format
2019-02-26 14:19:17 +01:00
if (zAttemptRange != 1)
{
gSceneryPlaceZ += 8;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Use game action for track design. Fix error titles. Add files to xcode project (#20) Finally get the placement code working Use game action for ghosts. Fix basequarter Remove references to old command Fix formating remove unused var Fix clang format
2019-02-26 14:19:17 +01:00
// Actually place
Rename GameActionResult and use GameActions namespace instead (#13184)
2020-10-15 03:04:39 +02:00
if (success == GameActions::Status::Ok || ((q + 1 == quantity) && forceError))
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Use game action for track design. Fix error titles. Add files to xcode project (#20) Finally get the placement code working Use game action for ghosts. Fix basequarter Remove references to old command Fix formating remove unused var Fix clang format
2019-02-26 14:19:17 +01:00
auto smallSceneryPlaceAction = SmallSceneryPlaceAction(
Clean up scenery handling
2020-03-13 14:44:34 +01:00
{ cur_grid_x, cur_grid_y, gSceneryPlaceZ, gSceneryPlaceRotation }, quadrant, selectedScenery,
Close #13476: Unneeded colour variables in TopToolbar.cpp
2020-12-02 12:23:38 +01:00
gWindowSceneryPrimaryColour, gWindowScenerySecondaryColour);
Use game action for track design. Fix error titles. Add files to xcode project (#20) Finally get the placement code working Use game action for ghosts. Fix basequarter Remove references to old command Fix formating remove unused var Fix clang format
2019-02-26 14:19:17 +01:00
Rename GameActionResult and use GameActions namespace instead (#13184)
2020-10-15 03:04:39 +02:00
smallSceneryPlaceAction.SetCallback([=](const GameAction* ga, const GameActions::Result* result) {
if (result->Error == GameActions::Status::Ok)
Use game action for track design. Fix error titles. Add files to xcode project (#20) Finally get the placement code working Use game action for ghosts. Fix basequarter Remove references to old command Fix formating remove unused var Fix clang format
2019-02-26 14:19:17 +01:00
{
Move the audio code into OpenRCT2 namespace
2020-10-06 23:34:42 +02:00
OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::PlaceItem, result->Position);
Use game action for track design. Fix error titles. Add files to xcode project (#20) Finally get the placement code working Use game action for ghosts. Fix basequarter Remove references to old command Fix formating remove unused var Fix clang format
2019-02-26 14:19:17 +01:00
}
});
auto res = GameActions::Execute(&smallSceneryPlaceAction);
Rename GameActionResult and use GameActions namespace instead (#13184)
2020-10-15 03:04:39 +02:00
if (res->Error == GameActions::Status::Ok)
Use game action for track design. Fix error titles. Add files to xcode project (#20) Finally get the placement code working Use game action for ghosts. Fix basequarter Remove references to old command Fix formating remove unused var Fix clang format
2019-02-26 14:19:17 +01:00
{
forceError = false;
}
Rename GameActionResult and use GameActions namespace instead (#13184)
2020-10-15 03:04:39 +02:00
if (res->Error == GameActions::Status::InsufficientFunds)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
break;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
gSceneryPlaceZ = zCoordinate;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
}
case SCENERY_TYPE_PATH_ITEM:
{
Clean up scenery handling
2020-03-13 14:44:34 +01:00
int32_t z;
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
sub_6E1F34_path_item(windowPos, selectedScenery, gridPos, &z);
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
if (gridPos.IsNull())
Clean up scenery handling
2020-03-13 14:44:34 +01:00
return;
Close #13346: Change FootpathScenery to FootpathAddition (#13350)
2020-11-03 09:17:29 +01:00
auto footpathAdditionPlaceAction = FootpathAdditionPlaceAction({ gridPos, z }, selectedScenery + 1);
clang-format UI windows
2018-06-22 23:21:44 +02:00
Close #13346: Change FootpathScenery to FootpathAddition (#13350)
2020-11-03 09:17:29 +01:00
footpathAdditionPlaceAction.SetCallback([](const GameAction* ga, const GameActions::Result* result) {
Rename GameActionResult and use GameActions namespace instead (#13184)
2020-10-15 03:04:39 +02:00
if (result->Error != GameActions::Status::Ok)
Add FootpathSceneryPlaceAction
2019-03-01 11:53:52 +01:00
{
return;
}
Move the audio code into OpenRCT2 namespace
2020-10-06 23:34:42 +02:00
OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::PlaceItem, result->Position);
Add FootpathSceneryPlaceAction
2019-03-01 11:53:52 +01:00
});
Close #13346: Change FootpathScenery to FootpathAddition (#13350)
2020-11-03 09:17:29 +01:00
auto res = GameActions::Execute(&footpathAdditionPlaceAction);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
}
case SCENERY_TYPE_WALL:
{
Clean up scenery handling
2020-03-13 14:44:34 +01:00
uint8_t edges;
Close #13476: Unneeded colour variables in TopToolbar.cpp
2020-12-02 12:23:38 +01:00
sub_6E1F34_wall(windowPos, selectedScenery, gridPos, &edges);
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
if (gridPos.IsNull())
Clean up scenery handling
2020-03-13 14:44:34 +01:00
return;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint8_t zAttemptRange = 1;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gSceneryPlaceZ != 0 && gSceneryShiftPressed)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
zAttemptRange = 20;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
for (; zAttemptRange != 0; zAttemptRange--)
{
Implement wall place game action
2019-03-25 20:20:31 +01:00
auto wallPlaceAction = WallPlaceAction(
Close #13476: Unneeded colour variables in TopToolbar.cpp
2020-12-02 12:23:38 +01:00
selectedScenery, { gridPos, gSceneryPlaceZ }, edges, gWindowSceneryPrimaryColour,
gWindowScenerySecondaryColour, gWindowSceneryTertiaryColour);
Implement wall place game action
2019-03-25 20:20:31 +01:00
auto res = GameActions::Query(&wallPlaceAction);
Rename GameActionResult and use GameActions namespace instead (#13184)
2020-10-15 03:04:39 +02:00
if (res->Error == GameActions::Status::Ok)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Implement wall place game action
2019-03-25 20:20:31 +01:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Remove use of std::variant
2020-04-21 00:30:37 +02:00
if (auto message = res->ErrorMessage.AsStringId())
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Implement strings for GameAction errors
2020-03-03 22:11:26 +01:00
if (*message == STR_NOT_ENOUGH_CASH_REQUIRES || *message == STR_CAN_ONLY_BUILD_THIS_ON_WATER)
{
break;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Fix function.
2019-03-28 18:45:39 +01:00
if (zAttemptRange != 1)
{
gSceneryPlaceZ += 8;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Implement wall place game action
2019-03-25 20:20:31 +01:00
auto wallPlaceAction = WallPlaceAction(
Close #13476: Unneeded colour variables in TopToolbar.cpp
2020-12-02 12:23:38 +01:00
selectedScenery, { gridPos, gSceneryPlaceZ }, edges, gWindowSceneryPrimaryColour, gWindowScenerySecondaryColour,
gWindowSceneryTertiaryColour);
Implement wall place game action
2019-03-25 20:20:31 +01:00
Rename GameActionResult and use GameActions namespace instead (#13184)
2020-10-15 03:04:39 +02:00
wallPlaceAction.SetCallback([](const GameAction* ga, const GameActions::Result* result) {
if (result->Error == GameActions::Status::Ok)
Implement wall place game action
2019-03-25 20:20:31 +01:00
{
Move the audio code into OpenRCT2 namespace
2020-10-06 23:34:42 +02:00
OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::PlaceItem, result->Position);
Implement wall place game action
2019-03-25 20:20:31 +01:00
}
});
auto res = GameActions::Execute(&wallPlaceAction);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
case SCENERY_TYPE_LARGE:
{
Clean up scenery handling
2020-03-13 14:44:34 +01:00
Direction direction;
Close #13476: Unneeded colour variables in TopToolbar.cpp
2020-12-02 12:23:38 +01:00
sub_6E1F34_large_scenery(windowPos, selectedScenery, gridPos, &direction);
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
if (gridPos.IsNull())
Clean up scenery handling
2020-03-13 14:44:34 +01:00
return;
clang-format UI windows
2018-06-22 23:21:44 +02:00
uint8_t zAttemptRange = 1;
if (gSceneryPlaceZ != 0 && gSceneryShiftPressed)
{
zAttemptRange = 20;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
for (; zAttemptRange != 0; zAttemptRange--)
{
Remove LocationXY usage on openrct2-ui\windows\TopToolbar.cpp
2019-12-24 21:09:22 +01:00
CoordsXYZD loc = { gridPos, gSceneryPlaceZ, direction };
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Close #13476: Unneeded colour variables in TopToolbar.cpp
2020-12-02 12:23:38 +01:00
auto sceneryPlaceAction = LargeSceneryPlaceAction(
loc, selectedScenery, gWindowSceneryPrimaryColour, gWindowScenerySecondaryColour);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Implement LargeSceneryPlaceAction
2019-04-05 20:16:23 +02:00
auto res = GameActions::Query(&sceneryPlaceAction);
Rename GameActionResult and use GameActions namespace instead (#13184)
2020-10-15 03:04:39 +02:00
if (res->Error == GameActions::Status::Ok)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Implement LargeSceneryPlaceAction
2019-04-05 20:16:23 +02:00
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Remove use of std::variant
2020-04-21 00:30:37 +02:00
if (auto message = res->ErrorMessage.AsStringId())
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Implement strings for GameAction errors
2020-03-03 22:11:26 +01:00
if (*message == STR_NOT_ENOUGH_CASH_REQUIRES || *message == STR_CAN_ONLY_BUILD_THIS_ON_WATER)
{
break;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Implement LargeSceneryPlaceAction
2019-04-05 20:16:23 +02:00
if (zAttemptRange != 1)
{
gSceneryPlaceZ += 8;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Clean up scenery handling
2020-03-13 14:44:34 +01:00
Remove LocationXY usage on openrct2-ui\windows\TopToolbar.cpp
2019-12-24 21:09:22 +01:00
CoordsXYZD loc = { gridPos, gSceneryPlaceZ, direction };
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Close #13476: Unneeded colour variables in TopToolbar.cpp
2020-12-02 12:23:38 +01:00
auto sceneryPlaceAction = LargeSceneryPlaceAction(
loc, selectedScenery, gWindowSceneryPrimaryColour, gWindowScenerySecondaryColour);
Rename GameActionResult and use GameActions namespace instead (#13184)
2020-10-15 03:04:39 +02:00
sceneryPlaceAction.SetCallback([=](const GameAction* ga, const GameActions::Result* result) {
if (result->Error == GameActions::Status::Ok)
Implement LargeSceneryPlaceAction
2019-04-05 20:16:23 +02:00
{
Move the audio code into OpenRCT2 namespace
2020-10-06 23:34:42 +02:00
OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::PlaceItem, result->Position);
Implement LargeSceneryPlaceAction
2019-04-05 20:16:23 +02:00
}
else
{
Move the audio code into OpenRCT2 namespace
2020-10-06 23:34:42 +02:00
OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::Error, { loc.x, loc.y, gSceneryPlaceZ });
Implement LargeSceneryPlaceAction
2019-04-05 20:16:23 +02:00
}
});
auto res = GameActions::Execute(&sceneryPlaceAction);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
case SCENERY_TYPE_BANNER:
{
Clean up scenery handling
2020-03-13 14:44:34 +01:00
int32_t z;
Direction direction;
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
sub_6E1F34_banner(windowPos, selectedScenery, gridPos, &z, &direction);
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
if (gridPos.IsNull())
Clean up scenery handling
2020-03-13 14:44:34 +01:00
return;
Remove LocationXY usage on openrct2-ui\windows\TopToolbar.cpp
2019-12-24 21:09:22 +01:00
CoordsXYZD loc{ gridPos, z, direction };
Implement Banner Place/Remove Actions
2019-04-06 10:44:07 +02:00
auto primaryColour = gWindowSceneryPrimaryColour;
Banner Refactor from NSF (#14788) * Banner refactor * Fix mistake in fix_duplicated_banners * Reduce limit back * Fix export * Free banner on delete * Increment network version * Fix potential banner pointer crashes Co-authored-by: Ted John <ted@brambles.org>
2021-07-27 11:25:58 +02:00
auto bannerPlaceAction = BannerPlaceAction(loc, selectedScenery, primaryColour);
Allow game actions to store custom data instead of using inheritance
2021-09-12 17:24:55 +02:00
bannerPlaceAction.SetCallback([=](const GameAction* ga, const GameActions::Result* result) {
Rename GameActionResult and use GameActions namespace instead (#13184)
2020-10-15 03:04:39 +02:00
if (result->Error == GameActions::Status::Ok)
Implement Banner Place/Remove Actions
2019-04-06 10:44:07 +02:00
{
Allow game actions to store custom data instead of using inheritance
2021-09-12 17:24:55 +02:00
auto data = result->GetData<BannerPlaceActionResult>();
Move the audio code into OpenRCT2 namespace
2020-10-06 23:34:42 +02:00
OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::PlaceItem, result->Position);
Allow game actions to store custom data instead of using inheritance
2021-09-12 17:24:55 +02:00
context_open_detail_window(WD_BANNER, data.bannerId);
Implement Banner Place/Remove Actions
2019-04-06 10:44:07 +02:00
}
});
GameActions::Execute(&bannerPlaceAction);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
Window banner complete
2014-10-21 18:59:47 +02:00
}
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
static uint8_t top_toolbar_tool_update_land_paint(const ScreenCoordsXY& screenPos)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Remove duplicate functions (#10067) * Reduce code duplication in src\openrct2\interface\Window.cpp `window_resize_gui_scenario_editor` was a subset of `window_resize_gui` * Reduce code duplication in src\openrct2\network\Twitch.cpp Both `GetFollowers()` and `GetMessage()` were very similar * Reduce code duplication in src/openrct2/world/SmallScenery.cpp `map_place_non_scenery_clear_func` and `map_place_scenery_clear_func` did basically the same thing, with a single branch difference * Reduce code duplication in src/openrct2-ui/windows/TopToolbar.cpp Make `top_toolbar_tool_update_scenery_clear` call `top_toolbar_tool_update_land_paint` and then do the additional differing calculation it did.
2019-10-19 15:38:26 +02:00
uint8_t state_changed = 0;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
map_invalidate_selection_rect();
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE;
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
auto mapTile = screen_get_map_xy(screenPos, nullptr);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Make use of std::optional strict
2021-09-13 18:47:13 +02:00
if (!mapTile.has_value())
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Change gClearSceneryCost to money64
2021-07-27 17:59:49 +02:00
if (gClearSceneryCost != MONEY64_UNDEFINED)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Change gClearSceneryCost to money64
2021-07-27 17:59:49 +02:00
gClearSceneryCost = MONEY64_UNDEFINED;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_invalidate_by_class(WC_CLEAR_SCENERY);
}
Remove duplicate functions (#10067) * Reduce code duplication in src\openrct2\interface\Window.cpp `window_resize_gui_scenario_editor` was a subset of `window_resize_gui` * Reduce code duplication in src\openrct2\network\Twitch.cpp Both `GetFollowers()` and `GetMessage()` were very similar * Reduce code duplication in src/openrct2/world/SmallScenery.cpp `map_place_non_scenery_clear_func` and `map_place_scenery_clear_func` did basically the same thing, with a single branch difference * Reduce code duplication in src/openrct2-ui/windows/TopToolbar.cpp Make `top_toolbar_tool_update_scenery_clear` call `top_toolbar_tool_update_land_paint` and then do the additional differing calculation it did.
2019-10-19 15:38:26 +02:00
return state_changed;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (!(gMapSelectFlags & MAP_SELECT_FLAG_ENABLE))
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE;
state_changed++;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gMapSelectType != MAP_SELECT_TYPE_FULL)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gMapSelectType = MAP_SELECT_TYPE_FULL;
state_changed++;
}
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int16_t tool_size = std::max<uint16_t>(1, gLandToolSize);
int16_t tool_length = (tool_size - 1) * 32;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Move to tool bottom left
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
mapTile->x -= (tool_size - 1) * 16;
mapTile->y -= (tool_size - 1) * 16;
Create CoordsXY::ToTileStart() and CoordsXY::ToTileCentre()
2019-11-30 16:47:23 +01:00
mapTile = mapTile->ToTileStart();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
if (gMapSelectPositionA.x != mapTile->x)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
gMapSelectPositionA.x = mapTile->x;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
state_changed++;
}
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
if (gMapSelectPositionA.y != mapTile->y)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
gMapSelectPositionA.y = mapTile->y;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
state_changed++;
}
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
mapTile->x += tool_length;
mapTile->y += tool_length;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
if (gMapSelectPositionB.x != mapTile->x)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
gMapSelectPositionB.x = mapTile->x;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
state_changed++;
}
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
if (gMapSelectPositionB.y != mapTile->y)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
gMapSelectPositionB.y = mapTile->y;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
state_changed++;
}
map_invalidate_selection_rect();
Remove duplicate functions (#10067) * Reduce code duplication in src\openrct2\interface\Window.cpp `window_resize_gui_scenario_editor` was a subset of `window_resize_gui` * Reduce code duplication in src\openrct2\network\Twitch.cpp Both `GetFollowers()` and `GetMessage()` were very similar * Reduce code duplication in src/openrct2/world/SmallScenery.cpp `map_place_non_scenery_clear_func` and `map_place_scenery_clear_func` did basically the same thing, with a single branch difference * Reduce code duplication in src/openrct2-ui/windows/TopToolbar.cpp Make `top_toolbar_tool_update_scenery_clear` call `top_toolbar_tool_update_land_paint` and then do the additional differing calculation it did.
2019-10-19 15:38:26 +02:00
return state_changed;
}
/**
*
* rct2: 0x0068E213
*/
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
static void top_toolbar_tool_update_scenery_clear(const ScreenCoordsXY& screenPos)
Remove duplicate functions (#10067) * Reduce code duplication in src\openrct2\interface\Window.cpp `window_resize_gui_scenario_editor` was a subset of `window_resize_gui` * Reduce code duplication in src\openrct2\network\Twitch.cpp Both `GetFollowers()` and `GetMessage()` were very similar * Reduce code duplication in src/openrct2/world/SmallScenery.cpp `map_place_non_scenery_clear_func` and `map_place_scenery_clear_func` did basically the same thing, with a single branch difference * Reduce code duplication in src/openrct2-ui/windows/TopToolbar.cpp Make `top_toolbar_tool_update_scenery_clear` call `top_toolbar_tool_update_land_paint` and then do the additional differing calculation it did.
2019-10-19 15:38:26 +02:00
{
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
if (!top_toolbar_tool_update_land_paint(screenPos))
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
Implement ClearAction.
2019-01-02 12:59:37 +01:00
auto action = GetClearAction();
auto result = GameActions::Query(&action);
Change gClearSceneryCost to money64
2021-07-27 17:59:49 +02:00
auto cost = (result->Error == GameActions::Status::Ok ? result->Cost : MONEY64_UNDEFINED);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gClearSceneryCost != cost)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gClearSceneryCost = cost;
window_invalidate_by_class(WC_CLEAR_SCENERY);
}
Implemented clear scenery update Not tested.
2015-05-25 18:24:18 +02:00
}
Added tool_update_land Not tested
2015-05-26 21:36:05 +02:00
/**
clang-format UI windows
2018-06-22 23:21:44 +02:00
*
* rct2: 0x00664280
*/
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
static void top_toolbar_tool_update_land(const ScreenCoordsXY& screenPos)
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
{
Refactor UI/Input MouseInput to Title Case
2020-11-02 14:43:35 +01:00
const bool mapCtrlPressed = InputTestPlaceObjectModifier(PLACE_OBJECT_MODIFIER_COPY_Z);
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
map_invalidate_selection_rect();
Close #13625: Refactor TOOL_IDX to use strong enum
2020-12-23 05:11:15 +01:00
if (gCurrentToolId == Tool::UpDownArrow)
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (!(gMapSelectFlags & MAP_SELECT_FLAG_ENABLE))
return;
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
money64 lower_cost = selection_lower_land(0);
money64 raise_cost = selection_raise_land(0);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
if (gLandToolRaiseCost != raise_cost || gLandToolLowerCost != lower_cost)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gLandToolRaiseCost = raise_cost;
gLandToolLowerCost = lower_cost;
window_invalidate_by_class(WC_LAND);
}
return;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
int16_t tool_size = gLandToolSize;
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
std::optional<CoordsXY> mapTile;
Initialise variable to fix Launchpad ppc64el builds `src/openrct2-ui/windows/TopToolbar.cpp:2112:13: error: ‘side’ may be used uninitialized in this function [-Werror=maybe-uninitialized]`
2021-03-29 09:52:52 +02:00
uint8_t side{};
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE;
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
if (tool_size == 1)
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t selectionType;
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
// Get selection type and map coordinates from mouse x,y position
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
screen_pos_to_map_pos(screenPos, &selectionType);
mapTile = screen_get_map_xy_side(screenPos, &side);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Make use of std::optional strict
2021-09-13 18:47:13 +02:00
if (!mapTile.has_value())
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
{
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
money64 lower_cost = MONEY64_UNDEFINED;
money64 raise_cost = MONEY64_UNDEFINED;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
if (gLandToolRaiseCost != raise_cost || gLandToolLowerCost != lower_cost)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gLandToolRaiseCost = raise_cost;
gLandToolLowerCost = lower_cost;
window_invalidate_by_class(WC_LAND);
}
return;
}
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint8_t state_changed = 0;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
if (!(gMapSelectFlags & MAP_SELECT_FLAG_ENABLE))
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE;
state_changed++;
}
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
if (gMapSelectType != selectionType)
{
gMapSelectType = selectionType;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
state_changed++;
}
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
if ((gMapSelectType != MAP_SELECT_TYPE_EDGE_0 + (side & 0xFF)) && mapCtrlPressed)
{
gMapSelectType = MAP_SELECT_TYPE_EDGE_0 + (side & 0xFF);
state_changed++;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
if (gMapSelectPositionA.x != mapTile->x)
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
{
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
gMapSelectPositionA.x = mapTile->x;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
state_changed++;
}
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
if (gMapSelectPositionA.y != mapTile->y)
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
{
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
gMapSelectPositionA.y = mapTile->y;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
state_changed++;
}
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
if (gMapSelectPositionB.x != mapTile->x)
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
{
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
gMapSelectPositionB.x = mapTile->x;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
state_changed++;
}
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
if (gMapSelectPositionB.y != mapTile->y)
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
{
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
gMapSelectPositionB.y = mapTile->y;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
state_changed++;
}
map_invalidate_selection_rect();
if (!state_changed)
return;
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
money64 lower_cost = selection_lower_land(0);
money64 raise_cost = selection_raise_land(0);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gLandToolRaiseCost != raise_cost || gLandToolLowerCost != lower_cost)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gLandToolRaiseCost = raise_cost;
gLandToolLowerCost = lower_cost;
window_invalidate_by_class(WC_LAND);
}
return;
}
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
// Get map coordinates and the side of the tile that is being hovered over
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
mapTile = screen_get_map_xy_side(screenPos, &side);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Make use of std::optional strict
2021-09-13 18:47:13 +02:00
if (!mapTile.has_value())
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
money64 lower_cost = MONEY64_UNDEFINED;
money64 raise_cost = MONEY64_UNDEFINED;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gLandToolRaiseCost != raise_cost || gLandToolLowerCost != lower_cost)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gLandToolRaiseCost = raise_cost;
gLandToolLowerCost = lower_cost;
window_invalidate_by_class(WC_LAND);
}
return;
}
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint8_t state_changed = 0;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (!(gMapSelectFlags & MAP_SELECT_FLAG_ENABLE))
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE;
state_changed++;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gMapSelectType != MAP_SELECT_TYPE_FULL)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gMapSelectType = MAP_SELECT_TYPE_FULL;
state_changed++;
}
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
if ((gMapSelectType != MAP_SELECT_TYPE_EDGE_0 + (side & 0xFF)) && mapCtrlPressed)
{
gMapSelectType = MAP_SELECT_TYPE_EDGE_0 + (side & 0xFF);
state_changed++;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (tool_size == 0)
tool_size = 1;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int16_t tool_length = (tool_size - 1) * 32;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
// Decide on shape of the brush for bigger selection size
switch (gMapSelectType)
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
case MAP_SELECT_TYPE_EDGE_0:
case MAP_SELECT_TYPE_EDGE_2:
// Line
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
mapTile->y -= (tool_size - 1) * 16;
Create CoordsXY::ToTileStart() and CoordsXY::ToTileCentre()
2019-11-30 16:47:23 +01:00
mapTile->y = mapTile->ToTileStart().y;
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case MAP_SELECT_TYPE_EDGE_1:
case MAP_SELECT_TYPE_EDGE_3:
// Line
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
mapTile->x -= (tool_size - 1) * 16;
Create CoordsXY::ToTileStart() and CoordsXY::ToTileCentre()
2019-11-30 16:47:23 +01:00
mapTile->x = mapTile->ToTileStart().x;
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
default:
// Move to tool bottom left
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
mapTile->x -= (tool_size - 1) * 16;
mapTile->y -= (tool_size - 1) * 16;
Create CoordsXY::ToTileStart() and CoordsXY::ToTileCentre()
2019-11-30 16:47:23 +01:00
mapTile = mapTile->ToTileStart();
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
if (gMapSelectPositionA.x != mapTile->x)
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
{
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
gMapSelectPositionA.x = mapTile->x;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
state_changed++;
}
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
if (gMapSelectPositionA.y != mapTile->y)
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
{
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
gMapSelectPositionA.y = mapTile->y;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
state_changed++;
}
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
// Go to other side
switch (gMapSelectType)
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
case MAP_SELECT_TYPE_EDGE_0:
case MAP_SELECT_TYPE_EDGE_2:
// Line
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
mapTile->y += tool_length;
clang-format UI windows
2018-06-22 23:21:44 +02:00
gMapSelectType = MAP_SELECT_TYPE_FULL;
break;
case MAP_SELECT_TYPE_EDGE_1:
case MAP_SELECT_TYPE_EDGE_3:
// Line
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
mapTile->x += tool_length;
clang-format UI windows
2018-06-22 23:21:44 +02:00
gMapSelectType = MAP_SELECT_TYPE_FULL;
break;
default:
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
mapTile->x += tool_length;
mapTile->y += tool_length;
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
if (gMapSelectPositionB.x != mapTile->x)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
gMapSelectPositionB.x = mapTile->x;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
state_changed++;
}
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
if (gMapSelectPositionB.y != mapTile->y)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Prefer std::optional over LOCATION_NULL on Viewport (#10297)
2019-11-29 17:17:01 +01:00
gMapSelectPositionB.y = mapTile->y;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
state_changed++;
}
map_invalidate_selection_rect();
if (!state_changed)
return;
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
money64 lower_cost = selection_lower_land(0);
money64 raise_cost = selection_raise_land(0);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gLandToolRaiseCost != raise_cost || gLandToolLowerCost != lower_cost)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gLandToolRaiseCost = raise_cost;
gLandToolLowerCost = lower_cost;
window_invalidate_by_class(WC_LAND);
}
Added tool_update_land Not tested
2015-05-26 21:36:05 +02:00
}
Added update_water Refactored up/down water commands so that it used more standard layout. Not tested.
2015-05-27 18:40:57 +02:00
/**
clang-format UI windows
2018-06-22 23:21:44 +02:00
*
* rct2: 0x006E6BDC
*/
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
static void top_toolbar_tool_update_water(const ScreenCoordsXY& screenPos)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
map_invalidate_selection_rect();
Close #13625: Refactor TOOL_IDX to use strong enum
2020-12-23 05:11:15 +01:00
if (gCurrentToolId == Tool::UpDownArrow)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (!(gMapSelectFlags & MAP_SELECT_FLAG_ENABLE))
return;
Implement land/water lower raise
2019-03-04 17:57:01 +01:00
auto waterLowerAction = WaterLowerAction(
{ gMapSelectPositionA.x, gMapSelectPositionA.y, gMapSelectPositionB.x, gMapSelectPositionB.y });
auto waterRaiseAction = WaterRaiseAction(
{ gMapSelectPositionA.x, gMapSelectPositionA.y, gMapSelectPositionB.x, gMapSelectPositionB.y });
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Implement land/water lower raise
2019-03-04 17:57:01 +01:00
auto res = GameActions::Query(&waterLowerAction);
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
money64 lowerCost = res->Error == GameActions::Status::Ok ? res->Cost : MONEY64_UNDEFINED;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Implement land/water lower raise
2019-03-04 17:57:01 +01:00
res = GameActions::Query(&waterRaiseAction);
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
money64 raiseCost = res->Error == GameActions::Status::Ok ? res->Cost : MONEY64_UNDEFINED;
Implement land/water lower raise
2019-03-04 17:57:01 +01:00
if (gWaterToolRaiseCost != raiseCost || gWaterToolLowerCost != lowerCost)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Implement land/water lower raise
2019-03-04 17:57:01 +01:00
gWaterToolRaiseCost = raiseCost;
gWaterToolLowerCost = lowerCost;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_invalidate_by_class(WC_WATER);
}
return;
}
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE;
Refactor viewport interaction flags and add plugin API
2021-02-10 02:06:18 +01:00
auto info = get_map_coordinates_from_pos(
screenPos, EnumsToFlags(ViewportInteractionItem::Terrain, ViewportInteractionItem::Water));
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Close #13624: Refactor ViewportInteractionItem to use strong enum (#13657) * Closes #13624: Refactor ViewportInteractionItem to use strong enum
2020-12-29 19:09:15 +01:00
if (info.SpriteType == ViewportInteractionItem::None)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
if (gWaterToolRaiseCost != MONEY64_UNDEFINED || gWaterToolLowerCost != MONEY64_UNDEFINED)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
gWaterToolRaiseCost = MONEY64_UNDEFINED;
gWaterToolLowerCost = MONEY64_UNDEFINED;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_invalidate_by_class(WC_WATER);
}
return;
}
Close #12518: Viewport Refactor (#12541) * Remove viewport pointer from get_map_coordinates_from_pos * Removed viewport from get_window * Return a InteractionInfo from get_map_coord... * Remove viewport_interaction_info struct * Add Entity union to simplify code * Name the enum used for viewport interaction * Simplify functions further by returning the info struct * Add default switches
2020-08-02 09:32:59 +02:00
auto mapTile = info.Loc.ToTileCentre();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint8_t state_changed = 0;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (!(gMapSelectFlags & MAP_SELECT_FLAG_ENABLE))
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE;
state_changed++;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gMapSelectType != MAP_SELECT_TYPE_FULL_WATER)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gMapSelectType = MAP_SELECT_TYPE_FULL_WATER;
state_changed++;
}
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int16_t tool_size = std::max<uint16_t>(1, gLandToolSize);
int16_t tool_length = (tool_size - 1) * 32;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Move to tool bottom left
mapTile.x -= (tool_size - 1) * 16;
mapTile.y -= (tool_size - 1) * 16;
mapTile.x &= 0xFFE0;
mapTile.y &= 0xFFE0;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gMapSelectPositionA.x != mapTile.x)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gMapSelectPositionA.x = mapTile.x;
state_changed++;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gMapSelectPositionA.y != mapTile.y)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gMapSelectPositionA.y = mapTile.y;
state_changed++;
}
mapTile.x += tool_length;
mapTile.y += tool_length;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gMapSelectPositionB.x != mapTile.x)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gMapSelectPositionB.x = mapTile.x;
state_changed++;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gMapSelectPositionB.y != mapTile.y)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gMapSelectPositionB.y = mapTile.y;
state_changed++;
}
map_invalidate_selection_rect();
if (!state_changed)
return;
Implement land/water lower raise
2019-03-04 17:57:01 +01:00
auto waterLowerAction = WaterLowerAction(
{ gMapSelectPositionA.x, gMapSelectPositionA.y, gMapSelectPositionB.x, gMapSelectPositionB.y });
auto waterRaiseAction = WaterRaiseAction(
{ gMapSelectPositionA.x, gMapSelectPositionA.y, gMapSelectPositionB.x, gMapSelectPositionB.y });
auto res = GameActions::Query(&waterLowerAction);
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
money64 lowerCost = res->Error == GameActions::Status::Ok ? res->Cost : MONEY64_UNDEFINED;
clang-format UI windows
2018-06-22 23:21:44 +02:00
Implement land/water lower raise
2019-03-04 17:57:01 +01:00
res = GameActions::Query(&waterRaiseAction);
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
money64 raiseCost = res->Error == GameActions::Status::Ok ? res->Cost : MONEY64_UNDEFINED;
clang-format UI windows
2018-06-22 23:21:44 +02:00
Implement land/water lower raise
2019-03-04 17:57:01 +01:00
if (gWaterToolRaiseCost != raiseCost || gWaterToolLowerCost != lowerCost)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Implement land/water lower raise
2019-03-04 17:57:01 +01:00
gWaterToolRaiseCost = raiseCost;
gWaterToolLowerCost = lowerCost;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_invalidate_by_class(WC_WATER);
}
Added update_water Refactored up/down water commands so that it used more standard layout. Not tested.
2015-05-27 18:40:57 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x006E24F6
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
* On failure returns MONEY64_UNDEFINED
Added try_place_ghost_scenery. Ghost scenery placement is now performed by OpenRCT2 game commands.
2015-05-30 08:04:15 +02:00
* On success places ghost scenery and returns cost to place proper
*/
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
static money64 try_place_ghost_small_scenery(
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
CoordsXYZD loc, uint8_t quadrant, ObjectEntryIndex entryIndex, colour_t primaryColour, colour_t secondaryColour)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
scenery_remove_ghost_tool_placement();
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
// 6e252b
auto smallSceneryPlaceAction = SmallSceneryPlaceAction(loc, quadrant, entryIndex, primaryColour, secondaryColour);
smallSceneryPlaceAction.SetFlags(GAME_COMMAND_FLAG_GHOST | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED);
auto res = GameActions::Execute(&smallSceneryPlaceAction);
auto sspar = dynamic_cast<SmallSceneryPlaceActionResult*>(res.get());
if (sspar == nullptr || res->Error != GameActions::Status::Ok)
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
return MONEY64_UNDEFINED;
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
gSceneryPlaceRotation = loc.direction;
gSceneryPlaceObject.SceneryType = SCENERY_TYPE_SMALL;
gSceneryPlaceObject.EntryIndex = entryIndex;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
TileElement* tileElement = sspar->tileElement;
gSceneryGhostPosition = { loc, tileElement->GetBaseZ() };
gSceneryQuadrant = tileElement->AsSmallScenery()->GetSceneryQuadrant();
if (sspar->GroundFlags & ELEMENT_IS_UNDERGROUND)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
// Set underground on
viewport_set_visibility(4);
}
else
{
// Set underground off
viewport_set_visibility(5);
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
gSceneryGhostType |= SCENERY_GHOST_FLAG_0;
return res->Cost;
}
Fix #9625: Show correct cost in scenery selection
2019-07-23 18:02:46 +02:00
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
static money64 try_place_ghost_path_addition(CoordsXYZ loc, ObjectEntryIndex entryIndex)
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
{
scenery_remove_ghost_tool_placement();
// 6e265b
auto footpathAdditionPlaceAction = FootpathAdditionPlaceAction(loc, entryIndex + 1);
footpathAdditionPlaceAction.SetFlags(GAME_COMMAND_FLAG_GHOST | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED);
footpathAdditionPlaceAction.SetCallback([=](const GameAction* ga, const GameActions::Result* result) {
if (result->Error != GameActions::Status::Ok)
Implement wall place game action
2019-03-25 20:20:31 +01:00
{
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
return;
}
gSceneryGhostPosition = loc;
gSceneryGhostType |= SCENERY_GHOST_FLAG_1;
});
auto res = GameActions::Execute(&footpathAdditionPlaceAction);
if (res->Error != GameActions::Status::Ok)
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
return MONEY64_UNDEFINED;
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
return res->Cost;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
static money64 try_place_ghost_wall(
Close #13476: Unneeded colour variables in TopToolbar.cpp
2020-12-02 12:23:38 +01:00
CoordsXYZ loc, uint8_t edge, ObjectEntryIndex entryIndex, colour_t primaryColour, colour_t secondaryColour,
colour_t tertiaryColour)
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
{
scenery_remove_ghost_tool_placement();
clang-format UI windows
2018-06-22 23:21:44 +02:00
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
// 6e26b0
Close #13476: Unneeded colour variables in TopToolbar.cpp
2020-12-02 12:23:38 +01:00
auto wallPlaceAction = WallPlaceAction(entryIndex, loc, edge, primaryColour, secondaryColour, tertiaryColour);
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
wallPlaceAction.SetFlags(GAME_COMMAND_FLAG_GHOST | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_NO_SPEND);
wallPlaceAction.SetCallback([=](const GameAction* ga, const WallPlaceActionResult* result) {
if (result->Error != GameActions::Status::Ok)
return;
clang-format UI windows
2018-06-22 23:21:44 +02:00
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
gSceneryGhostPosition = { loc, result->tileElement->GetBaseZ() };
gSceneryGhostWallRotation = edge;
clang-format UI windows
2018-06-22 23:21:44 +02:00
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
gSceneryGhostType |= SCENERY_GHOST_FLAG_2;
});
clang-format UI windows
2018-06-22 23:21:44 +02:00
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
auto res = GameActions::Execute(&wallPlaceAction);
if (res->Error != GameActions::Status::Ok)
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
return MONEY64_UNDEFINED;
Fix formatting and added to contributors.md Adjusted formatting for CI tests
2019-04-19 08:18:55 +02:00
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
return res->Cost;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
static money64 try_place_ghost_large_scenery(
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
CoordsXYZD loc, ObjectEntryIndex entryIndex, colour_t primaryColour, colour_t secondaryColour)
{
scenery_remove_ghost_tool_placement();
// 6e25a7
auto sceneryPlaceAction = LargeSceneryPlaceAction(loc, entryIndex, primaryColour, secondaryColour);
sceneryPlaceAction.SetFlags(GAME_COMMAND_FLAG_GHOST | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_NO_SPEND);
auto res = GameActions::Execute(&sceneryPlaceAction);
auto lspar = dynamic_cast<LargeSceneryPlaceActionResult*>(res.get());
if (lspar == nullptr || res->Error != GameActions::Status::Ok)
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
return MONEY64_UNDEFINED;
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
gSceneryPlaceRotation = loc.direction;
Fix #15028, #15042. Crash when placing large scenery (#15043) * Fix #15028, #15042. Crash when placing large scenery When the fragmented tile element limit is reached whilst placing a large scenery ghost the game will perform a reorg of the map elements invalidating tile element pointers. As large scenery are multi tiled this can happen mid action invalidating the pointer that was allocated for the first tile element. Large scenery actions pass back the first tile element pointer to the calling function for use with ghost removal. When this pointer is invalid it causes the crash. The ultimate fix for this would be to create an undo function for actions. As an interim the function has been modified to return the first tile height. * Update changelog
2021-07-21 14:01:09 +02:00
gSceneryGhostPosition = { loc, lspar->firstTileHeight };
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
if (lspar->GroundFlags & ELEMENT_IS_UNDERGROUND)
{
// Set underground on
viewport_set_visibility(4);
}
else
{
// Set underground off
viewport_set_visibility(5);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
gSceneryGhostType |= SCENERY_GHOST_FLAG_3;
return res->Cost;
}
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
static money64 try_place_ghost_banner(CoordsXYZD loc, ObjectEntryIndex entryIndex)
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
{
scenery_remove_ghost_tool_placement();
// 6e2612
auto primaryColour = gWindowSceneryPrimaryColour;
Banner Refactor from NSF (#14788) * Banner refactor * Fix mistake in fix_duplicated_banners * Reduce limit back * Fix export * Free banner on delete * Increment network version * Fix potential banner pointer crashes Co-authored-by: Ted John <ted@brambles.org>
2021-07-27 11:25:58 +02:00
auto bannerPlaceAction = BannerPlaceAction(loc, entryIndex, primaryColour);
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
bannerPlaceAction.SetFlags(GAME_COMMAND_FLAG_GHOST | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_NO_SPEND);
auto res = GameActions::Execute(&bannerPlaceAction);
if (res->Error != GameActions::Status::Ok)
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
return MONEY64_UNDEFINED;
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
gSceneryGhostPosition = loc;
gSceneryGhostPosition.z += PATH_HEIGHT_STEP;
gSceneryPlaceRotation = loc.direction;
gSceneryGhostType |= SCENERY_GHOST_FLAG_4;
return res->Cost;
Added more of update_scenery Only large scenery missing
2015-05-28 23:07:39 +02:00
}
Started update_scenery
2015-05-28 20:33:09 +02:00
/**
clang-format UI windows
2018-06-22 23:21:44 +02:00
*
* rct2: 0x006E287B
*/
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
static void top_toolbar_tool_update_scenery(const ScreenCoordsXY& screenPos)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
map_invalidate_selection_rect();
map_invalidate_map_selection_tiles();
Make the virtual floor optional, on by default.
2018-01-10 15:05:05 +01:00
Close #12431 Refactor VirtualFloorStyles to use strong enum (#12790)
2020-08-28 02:06:39 +02:00
if (gConfigGeneral.virtual_floor_style != VirtualFloorStyles::Off)
Make the virtual floor optional, on by default.
2018-01-10 15:05:05 +01:00
{
Move all Virtual Floor code from Map to its own file.
2018-03-04 17:44:42 +01:00
virtual_floor_invalidate();
Make the virtual floor optional, on by default.
2018-01-10 15:05:05 +01:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE;
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_CONSTRUCT;
if (gWindowSceneryPaintEnabled)
return;
if (gWindowSceneryEyedropperEnabled)
return;
Implement review requests
2020-03-18 16:22:08 +01:00
ScenerySelection selection = gWindowSceneryTabSelections[gWindowSceneryActiveTabIndex];
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Implement review requests
2020-03-18 16:22:08 +01:00
if (selection.IsUndefined())
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
scenery_remove_ghost_tool_placement();
return;
}
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
money64 cost = 0;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
switch (selection.SceneryType)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
case SCENERY_TYPE_SMALL:
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
{
CoordsXY mapTile = {};
uint8_t quadrant;
Direction rotation;
Close #13476: Unneeded colour variables in TopToolbar.cpp
2020-12-02 12:23:38 +01:00
sub_6E1F34_small_scenery(screenPos, selection.EntryIndex, mapTile, &quadrant, &rotation);
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
if (mapTile.IsNull())
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
{
scenery_remove_ghost_tool_placement();
return;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE;
Introduce Scenery-Scatter Tool Window.
2019-12-12 16:42:19 +01:00
if (gWindowSceneryScatterEnabled)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Refactor common parts of branched code. Change shifts to COORDS_XY_STEP multiplication.
2020-02-20 14:49:27 +01:00
uint16_t cluster_size = (gWindowSceneryScatterSize - 1) * COORDS_XY_STEP;
gMapSelectPositionA.x = mapTile.x - cluster_size / 2;
gMapSelectPositionA.y = mapTile.y - cluster_size / 2;
gMapSelectPositionB.x = mapTile.x + cluster_size / 2;
gMapSelectPositionB.y = mapTile.y + cluster_size / 2;
if (gWindowSceneryScatterSize % 2 == 0)
Introduce Scenery-Scatter Tool Window.
2019-12-12 16:42:19 +01:00
{
Refactor common parts of branched code. Change shifts to COORDS_XY_STEP multiplication.
2020-02-20 14:49:27 +01:00
gMapSelectPositionB.x += COORDS_XY_STEP;
gMapSelectPositionB.y += COORDS_XY_STEP;
Introduce Scenery-Scatter Tool Window.
2019-12-12 16:42:19 +01:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
gMapSelectPositionA.x = mapTile.x;
gMapSelectPositionA.y = mapTile.y;
gMapSelectPositionB.x = mapTile.x;
gMapSelectPositionB.y = mapTile.y;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor SmallSceneryEntry (#14815)
2021-06-04 03:14:41 +02:00
auto* sceneryEntry = get_small_scenery_entry(selection.EntryIndex);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
gMapSelectType = MAP_SELECT_TYPE_FULL;
Make scenery_small_entry_has_flag a member function (#15509)
2021-10-01 21:50:05 +02:00
if (!sceneryEntry->HasFlag(SMALL_SCENERY_FLAG_FULL_TILE) && !gWindowSceneryScatterEnabled)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
gMapSelectType = MAP_SELECT_TYPE_QUARTER_0 + (quadrant ^ 2);
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
map_invalidate_selection_rect();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
// If no change in ghost placement
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
if ((gSceneryGhostType & SCENERY_GHOST_FLAG_0) && mapTile == gSceneryGhostPosition && quadrant == _unkF64F0E
&& gSceneryPlaceZ == _unkF64F0A && gSceneryPlaceObject.SceneryType == SCENERY_TYPE_SMALL
&& gSceneryPlaceObject.EntryIndex == selection.EntryIndex)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
return;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
scenery_remove_ghost_tool_placement();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
_unkF64F0E = quadrant;
clang-format UI windows
2018-06-22 23:21:44 +02:00
_unkF64F0A = gSceneryPlaceZ;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
uint8_t attemptsLeft = 1;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gSceneryPlaceZ != 0 && gSceneryShiftPressed)
{
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
attemptsLeft = 20;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
for (; attemptsLeft != 0; attemptsLeft--)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
cost = try_place_ghost_small_scenery(
Close #13476: Unneeded colour variables in TopToolbar.cpp
2020-12-02 12:23:38 +01:00
{ mapTile, gSceneryPlaceZ, rotation }, quadrant, selection.EntryIndex, gWindowSceneryPrimaryColour,
gWindowScenerySecondaryColour);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
if (cost != MONEY64_UNDEFINED)
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
gSceneryPlaceZ += 8;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
gSceneryPlaceCost = cost;
break;
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
case SCENERY_TYPE_PATH_ITEM:
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
{
CoordsXY mapTile = {};
int32_t z;
sub_6E1F34_path_item(screenPos, selection.EntryIndex, mapTile, &z);
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
if (mapTile.IsNull())
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
{
scenery_remove_ghost_tool_placement();
return;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE;
gMapSelectPositionA.x = mapTile.x;
gMapSelectPositionA.y = mapTile.y;
gMapSelectPositionB.x = mapTile.x;
gMapSelectPositionB.y = mapTile.y;
gMapSelectType = MAP_SELECT_TYPE_FULL;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
map_invalidate_selection_rect();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
// If no change in ghost placement
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
if ((gSceneryGhostType & SCENERY_GHOST_FLAG_1) && mapTile == gSceneryGhostPosition && z == gSceneryGhostPosition.z)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
return;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
scenery_remove_ghost_tool_placement();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
cost = try_place_ghost_path_addition({ mapTile, z }, selection.EntryIndex);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
gSceneryPlaceCost = cost;
break;
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
case SCENERY_TYPE_WALL:
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
{
CoordsXY mapTile = {};
uint8_t edge;
Close #13476: Unneeded colour variables in TopToolbar.cpp
2020-12-02 12:23:38 +01:00
sub_6E1F34_wall(screenPos, selection.EntryIndex, mapTile, &edge);
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
if (mapTile.IsNull())
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
{
scenery_remove_ghost_tool_placement();
return;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE;
gMapSelectPositionA.x = mapTile.x;
gMapSelectPositionA.y = mapTile.y;
gMapSelectPositionB.x = mapTile.x;
gMapSelectPositionB.y = mapTile.y;
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
gMapSelectType = MAP_SELECT_TYPE_EDGE_0 + edge;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
map_invalidate_selection_rect();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
// If no change in ghost placement
Replace some usages of LocationXY(Z)16 (#10699)
2020-02-18 22:42:38 +01:00
if ((gSceneryGhostType & SCENERY_GHOST_FLAG_2) && mapTile == gSceneryGhostPosition
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
&& edge == gSceneryGhostWallRotation && gSceneryPlaceZ == _unkF64F0A)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
return;
}
scenery_remove_ghost_tool_placement();
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
gSceneryGhostWallRotation = edge;
clang-format UI windows
2018-06-22 23:21:44 +02:00
_unkF64F0A = gSceneryPlaceZ;
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
uint8_t attemptsLeft = 1;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gSceneryPlaceZ != 0 && gSceneryShiftPressed)
{
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
attemptsLeft = 20;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
cost = 0;
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
for (; attemptsLeft != 0; attemptsLeft--)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Close #13476: Unneeded colour variables in TopToolbar.cpp
2020-12-02 12:23:38 +01:00
cost = try_place_ghost_wall(
{ mapTile, gSceneryPlaceZ }, edge, selection.EntryIndex, gWindowSceneryPrimaryColour,
gWindowScenerySecondaryColour, gWindowSceneryTertiaryColour);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
if (cost != MONEY64_UNDEFINED)
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
gSceneryPlaceZ += 8;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
gSceneryPlaceCost = cost;
break;
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
case SCENERY_TYPE_LARGE:
{
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
CoordsXY mapTile = {};
Direction direction;
Close #13476: Unneeded colour variables in TopToolbar.cpp
2020-12-02 12:23:38 +01:00
sub_6E1F34_large_scenery(screenPos, selection.EntryIndex, mapTile, &direction);
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
if (mapTile.IsNull())
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
{
scenery_remove_ghost_tool_placement();
return;
}
Refactor LargeSceneryEntry and remove rct_scenery_entry (#14816)
2021-06-04 13:41:23 +02:00
auto* sceneryEntry = get_large_scenery_entry(selection.EntryIndex);
Use a vector for map selection tiles
2019-03-28 19:29:51 +01:00
gMapSelectionTiles.clear();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor LargeSceneryEntry and remove rct_scenery_entry (#14816)
2021-06-04 13:41:23 +02:00
for (rct_large_scenery_tile* tile = sceneryEntry->tiles;
Use named casts on openrct2-ui/windows (#11136)
2020-04-18 13:32:48 +02:00
tile->x_offset != static_cast<int16_t>(static_cast<uint16_t>(0xFFFF)); tile++)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Use CoordsXY on TopToolbar and TrackDesignPlace rotations
2019-12-04 12:39:33 +01:00
CoordsXY tileLocation = { tile->x_offset, tile->y_offset };
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
auto rotatedTileCoords = tileLocation.Rotate(direction);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Use CoordsXY on TopToolbar and TrackDesignPlace rotations
2019-12-04 12:39:33 +01:00
rotatedTileCoords.x += mapTile.x;
rotatedTileCoords.y += mapTile.y;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Use CoordsXY on TopToolbar and TrackDesignPlace rotations
2019-12-04 12:39:33 +01:00
gMapSelectionTiles.push_back(rotatedTileCoords);
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE_CONSTRUCT;
map_invalidate_map_selection_tiles();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
// If no change in ghost placement
Replace some usages of LocationXY(Z)16 (#10699)
2020-02-18 22:42:38 +01:00
if ((gSceneryGhostType & SCENERY_GHOST_FLAG_3) && mapTile == gSceneryGhostPosition && gSceneryPlaceZ == _unkF64F0A
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
&& gSceneryPlaceObject.SceneryType == SCENERY_TYPE_LARGE
&& gSceneryPlaceObject.EntryIndex == selection.EntryIndex)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
return;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
scenery_remove_ghost_tool_placement();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Clean up scenery handling
2020-03-13 14:44:34 +01:00
gSceneryPlaceObject.SceneryType = SCENERY_TYPE_LARGE;
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
gSceneryPlaceObject.EntryIndex = selection.EntryIndex;
clang-format UI windows
2018-06-22 23:21:44 +02:00
_unkF64F0A = gSceneryPlaceZ;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
uint8_t attemptsLeft = 1;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gSceneryPlaceZ != 0 && gSceneryShiftPressed)
{
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
attemptsLeft = 20;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
cost = 0;
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
for (; attemptsLeft != 0; attemptsLeft--)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
cost = try_place_ghost_large_scenery(
Close #13476: Unneeded colour variables in TopToolbar.cpp
2020-12-02 12:23:38 +01:00
{ mapTile, gSceneryPlaceZ, direction }, selection.EntryIndex, gWindowSceneryPrimaryColour,
gWindowScenerySecondaryColour);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
if (cost != MONEY64_UNDEFINED)
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
gSceneryPlaceZ += COORDS_Z_STEP;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
gSceneryPlaceCost = cost;
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
case SCENERY_TYPE_BANNER:
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
{
CoordsXY mapTile = {};
Direction direction;
int32_t z;
sub_6E1F34_banner(screenPos, selection.EntryIndex, mapTile, &z, &direction);
Make Coords isNull/setNull functions TitleCase (#15382)
2021-09-09 01:48:53 +02:00
if (mapTile.IsNull())
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
{
scenery_remove_ghost_tool_placement();
return;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE;
gMapSelectPositionA.x = mapTile.x;
gMapSelectPositionA.y = mapTile.y;
gMapSelectPositionB.x = mapTile.x;
gMapSelectPositionB.y = mapTile.y;
gMapSelectType = MAP_SELECT_TYPE_FULL;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
map_invalidate_selection_rect();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
// If no change in ghost placement
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
if ((gSceneryGhostType & SCENERY_GHOST_FLAG_4) && mapTile == gSceneryGhostPosition && z == gSceneryGhostPosition.z
&& direction == gSceneryPlaceRotation)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
return;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
scenery_remove_ghost_tool_placement();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
cost = try_place_ghost_banner({ mapTile, z, direction }, selection.EntryIndex);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
gSceneryPlaceCost = cost;
break;
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Started update_scenery
2015-05-28 20:33:09 +02:00
}
implement clear scenery game command, try out removing paths feature
2014-11-04 04:34:12 +01:00
/**
*
* rct2: 0x0066CB25
*/
Prefer const ref to send ScreenCoordsXY over
2020-02-29 03:43:29 +01:00
static void window_top_toolbar_tool_update(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
implement clear scenery game command, try out removing paths feature
2014-11-04 04:34:12 +01:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_CLEAR_SCENERY:
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
top_toolbar_tool_update_scenery_clear(screenCoords);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_LAND:
if (gLandPaintMode)
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
top_toolbar_tool_update_land_paint(screenCoords);
clang-format UI windows
2018-06-22 23:21:44 +02:00
else
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
top_toolbar_tool_update_land(screenCoords);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_WATER:
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
top_toolbar_tool_update_water(screenCoords);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_SCENERY:
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
top_toolbar_tool_update_scenery(screenCoords);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Implement custom tools
2020-05-01 22:32:41 +02:00
#ifdef ENABLE_SCRIPTING
default:
auto& customTool = OpenRCT2::Scripting::ActiveCustomTool;
if (customTool)
{
customTool->OnUpdate(screenCoords);
}
break;
#endif
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement clear scenery game command, try out removing paths feature
2014-11-04 04:34:12 +01:00
}
Window banner complete
2014-10-21 18:59:47 +02:00
/**
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
*
* rct2: 0x0066CB73
Window banner complete
2014-10-21 18:59:47 +02:00
*/
Prefer const ref to send ScreenCoordsXY over
2020-02-29 03:43:29 +01:00
static void window_top_toolbar_tool_down(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_CLEAR_SCENERY:
Implement ClearAction.
2019-01-02 12:59:37 +01:00
if (gMapSelectFlags & MAP_SELECT_FLAG_ENABLE)
{
auto action = GetClearAction();
GameActions::Execute(&action);
Close #13625: Refactor TOOL_IDX to use strong enum
2020-12-23 05:11:15 +01:00
gCurrentToolId = Tool::Crosshair;
Implement ClearAction.
2019-01-02 12:59:37 +01:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_LAND:
if (gMapSelectFlags & MAP_SELECT_FLAG_ENABLE)
{
Use the game action. Fix issues with it
2019-03-10 10:15:22 +01:00
auto surfaceSetStyleAction = SurfaceSetStyleAction(
{ gMapSelectPositionA.x, gMapSelectPositionA.y, gMapSelectPositionB.x, gMapSelectPositionB.y },
gLandToolTerrainSurface, gLandToolTerrainEdge);
GameActions::Execute(&surfaceSetStyleAction);
Close #13625: Refactor TOOL_IDX to use strong enum
2020-12-23 05:11:15 +01:00
gCurrentToolId = Tool::UpDownArrow;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Fix #11072: Land and water tools work out of bounds (#11179) Tool tried to act out of bounds, where it shouldn't do anything
2020-04-18 00:34:32 +02:00
else
{
_landToolBlocked = true;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_WATER:
if (gMapSelectFlags & MAP_SELECT_FLAG_ENABLE)
{
Close #13625: Refactor TOOL_IDX to use strong enum
2020-12-23 05:11:15 +01:00
gCurrentToolId = Tool::UpDownArrow;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Fix #11072: Land and water tools work out of bounds (#11179) Tool tried to act out of bounds, where it shouldn't do anything
2020-04-18 00:34:32 +02:00
else
{
_landToolBlocked = true;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_SCENERY:
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
window_top_toolbar_scenery_tool_down(screenCoords, w, widgetIndex);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Implement custom tools
2020-05-01 22:32:41 +02:00
#ifdef ENABLE_SCRIPTING
default:
auto& customTool = OpenRCT2::Scripting::ActiveCustomTool;
if (customTool)
{
customTool->OnDown(screenCoords);
}
break;
#endif
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
implement clear scenery game command, try out removing paths feature
2014-11-04 04:34:12 +01:00
}
Decompiled window_top_toolbar_land_tool_drag
2015-02-19 17:33:26 +01:00
/**
clang-format UI windows
2018-06-22 23:21:44 +02:00
*
* rct2: 0x006644DD
*/
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
static money64 selection_raise_land(uint8_t flags)
fix and improve raise and lower land / water / clear scenery
2015-06-10 16:41:50 +02:00
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t centreX = (gMapSelectPositionA.x + gMapSelectPositionB.x) / 2;
int32_t centreY = (gMapSelectPositionA.y + gMapSelectPositionB.y) / 2;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
centreX += 16;
centreY += 16;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gLandMountainMode)
{
Implement LandSmoothAction
2019-03-16 23:04:58 +01:00
auto landSmoothAction = LandSmoothAction(
{ centreX, centreY },
{ gMapSelectPositionA.x, gMapSelectPositionA.y, gMapSelectPositionB.x, gMapSelectPositionB.y }, gMapSelectType,
false);
auto res = (flags & GAME_COMMAND_FLAG_APPLY) ? GameActions::Execute(&landSmoothAction)
: GameActions::Query(&landSmoothAction);
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
return res->Error == GameActions::Status::Ok ? res->Cost : MONEY64_UNDEFINED;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Implement land/water lower raise
2019-03-04 17:57:01 +01:00
Remove unnecessary else blocks
2021-09-15 22:22:15 +02:00
auto landRaiseAction = LandRaiseAction(
{ centreX, centreY }, { gMapSelectPositionA.x, gMapSelectPositionA.y, gMapSelectPositionB.x, gMapSelectPositionB.y },
gMapSelectType);
auto res = (flags & GAME_COMMAND_FLAG_APPLY) ? GameActions::Execute(&landRaiseAction)
: GameActions::Query(&landRaiseAction);
return res->Error == GameActions::Status::Ok ? res->Cost : MONEY64_UNDEFINED;
Decompiled window_top_toolbar_land_tool_drag
2015-02-19 17:33:26 +01:00
}
/**
clang-format UI windows
2018-06-22 23:21:44 +02:00
*
* rct2: 0x006645B3
*/
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
static money64 selection_lower_land(uint8_t flags)
fix and improve raise and lower land / water / clear scenery
2015-06-10 16:41:50 +02:00
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t centreX = (gMapSelectPositionA.x + gMapSelectPositionB.x) / 2;
int32_t centreY = (gMapSelectPositionA.y + gMapSelectPositionB.y) / 2;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
centreX += 16;
centreY += 16;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gLandMountainMode)
{
Implement LandSmoothAction
2019-03-16 23:04:58 +01:00
auto landSmoothAction = LandSmoothAction(
{ centreX, centreY },
{ gMapSelectPositionA.x, gMapSelectPositionA.y, gMapSelectPositionB.x, gMapSelectPositionB.y }, gMapSelectType,
true);
auto res = (flags & GAME_COMMAND_FLAG_APPLY) ? GameActions::Execute(&landSmoothAction)
: GameActions::Query(&landSmoothAction);
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
return res->Error == GameActions::Status::Ok ? res->Cost : MONEY64_UNDEFINED;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Implement land/water lower raise
2019-03-04 17:57:01 +01:00
Remove unnecessary else blocks
2021-09-15 22:22:15 +02:00
auto landLowerAction = LandLowerAction(
{ centreX, centreY }, { gMapSelectPositionA.x, gMapSelectPositionA.y, gMapSelectPositionB.x, gMapSelectPositionB.y },
gMapSelectType);
auto res = (flags & GAME_COMMAND_FLAG_APPLY) ? GameActions::Execute(&landLowerAction)
: GameActions::Query(&landLowerAction);
return res->Error == GameActions::Status::Ok ? res->Cost : MONEY64_UNDEFINED;
Decompiled window_top_toolbar_land_tool_drag
2015-02-19 17:33:26 +01:00
}
/**
clang-format UI windows
2018-06-22 23:21:44 +02:00
* part of window_top_toolbar_tool_drag(0x0066CB4E)
* rct2: 0x00664454
*/
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
static void window_top_toolbar_land_tool_drag(const ScreenCoordsXY& screenPos)
Decompiled window_top_toolbar_land_tool_drag
2015-02-19 17:33:26 +01:00
{
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
rct_window* window = window_find_from_point(screenPos);
Check for nullptr explicitly in operct2-ui (#15460)
2021-09-25 08:45:06 +02:00
if (window == nullptr)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
rct_widgetindex widget_index = window_find_widget_from_point(window, screenPos);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (widget_index == -1)
return;
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_widget* widget = &window->widgets[widget_index];
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
if (widget->type != WindowWidgetType::Viewport)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_viewport* viewport = window->viewport;
Check for nullptr explicitly in operct2-ui (#15460)
2021-09-25 08:45:06 +02:00
if (viewport == nullptr)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
Create ZoomLevel struct to add two new zoom levels
2020-02-20 01:18:05 +01:00
int16_t tile_height = -16 / viewport->zoom;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
int32_t y_diff = screenPos.y - gInputDragLast.y;
Land Line Tools (select land edges/row of tiles) (This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.) This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles. The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type. Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2017-09-23 23:41:32 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (y_diff <= tile_height)
{
Use ScreenCoordsXY for Mouse Drag storage (#10380)
2019-12-17 18:38:20 +01:00
gInputDragLast.y += tile_height;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
selection_raise_land(GAME_COMMAND_FLAG_APPLY);
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
gLandToolRaiseCost = MONEY64_UNDEFINED;
gLandToolLowerCost = MONEY64_UNDEFINED;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else if (y_diff >= -tile_height)
{
Use ScreenCoordsXY for Mouse Drag storage (#10380)
2019-12-17 18:38:20 +01:00
gInputDragLast.y -= tile_height;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
selection_lower_land(GAME_COMMAND_FLAG_APPLY);
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
gLandToolRaiseCost = MONEY64_UNDEFINED;
gLandToolLowerCost = MONEY64_UNDEFINED;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Decompiled window_top_toolbar_land_tool_drag
2015-02-19 17:33:26 +01:00
}
Decompiled window_top_toolbar_water_tool_drag
2015-02-18 20:26:16 +01:00
/**
clang-format UI windows
2018-06-22 23:21:44 +02:00
* part of window_top_toolbar_tool_drag(0x0066CB4E)
* rct2: 0x006E6D4B
*/
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
static void window_top_toolbar_water_tool_drag(const ScreenCoordsXY& screenPos)
Decompiled window_top_toolbar_water_tool_drag
2015-02-18 20:26:16 +01:00
{
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
rct_window* window = window_find_from_point(screenPos);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (!window)
return;
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
rct_widgetindex widget_index = window_find_widget_from_point(window, screenPos);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (widget_index == -1)
return;
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_widget* widget = &window->widgets[widget_index];
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) * Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
2020-11-27 04:14:20 +01:00
if (widget->type != WindowWidgetType::Viewport)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
clang-format UI windows
2018-06-22 23:21:44 +02:00
rct_viewport* viewport = window->viewport;
Check for nullptr explicitly in operct2-ui (#15460)
2021-09-25 08:45:06 +02:00
if (viewport == nullptr)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
Create ZoomLevel struct to add two new zoom levels
2020-02-20 01:18:05 +01:00
int16_t dx = -16 / viewport->zoom;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
auto offsetPos = screenPos - ScreenCoordsXY{ 0, gInputDragLast.y };
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
if (offsetPos.y <= dx)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Use ScreenCoordsXY for Mouse Drag storage (#10380)
2019-12-17 18:38:20 +01:00
gInputDragLast.y += dx;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Implement land/water lower raise
2019-03-04 17:57:01 +01:00
auto waterRaiseAction = WaterRaiseAction(
{ gMapSelectPositionA.x, gMapSelectPositionA.y, gMapSelectPositionB.x, gMapSelectPositionB.y });
GameActions::Execute(&waterRaiseAction);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
gWaterToolRaiseCost = MONEY64_UNDEFINED;
gWaterToolLowerCost = MONEY64_UNDEFINED;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
}
dx = -dx;
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
if (offsetPos.y >= dx)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Use ScreenCoordsXY for Mouse Drag storage (#10380)
2019-12-17 18:38:20 +01:00
gInputDragLast.y += dx;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Implement land/water lower raise
2019-03-04 17:57:01 +01:00
auto waterLowerAction = WaterLowerAction(
{ gMapSelectPositionA.x, gMapSelectPositionA.y, gMapSelectPositionB.x, gMapSelectPositionB.y });
GameActions::Execute(&waterLowerAction);
Use money64 for land and water tools Should hopefully also fix CI.
2021-07-28 10:25:36 +02:00
gWaterToolRaiseCost = MONEY64_UNDEFINED;
gWaterToolLowerCost = MONEY64_UNDEFINED;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
}
Decompiled window_top_toolbar_water_tool_drag
2015-02-18 20:26:16 +01:00
}
implement clear scenery game command, try out removing paths feature
2014-11-04 04:34:12 +01:00
/**
*
* rct2: 0x0066CB4E
*/
Prefer const ref to send ScreenCoordsXY over
2020-02-29 03:43:29 +01:00
static void window_top_toolbar_tool_drag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
implement clear scenery game command, try out removing paths feature
2014-11-04 04:34:12 +01:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_CLEAR_SCENERY:
Implement ClearAction.
2019-01-02 12:59:37 +01:00
if (window_find_by_class(WC_ERROR) == nullptr && (gMapSelectFlags & MAP_SELECT_FLAG_ENABLE))
{
auto action = GetClearAction();
GameActions::Execute(&action);
Close #13625: Refactor TOOL_IDX to use strong enum
2020-12-23 05:11:15 +01:00
gCurrentToolId = Tool::Crosshair;
Implement ClearAction.
2019-01-02 12:59:37 +01:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_LAND:
// Custom setting to only change land style instead of raising or lowering land
if (gLandPaintMode)
{
if (gMapSelectFlags & MAP_SELECT_FLAG_ENABLE)
{
Use the game action. Fix issues with it
2019-03-10 10:15:22 +01:00
auto surfaceSetStyleAction = SurfaceSetStyleAction(
{ gMapSelectPositionA.x, gMapSelectPositionA.y, gMapSelectPositionB.x, gMapSelectPositionB.y },
gLandToolTerrainSurface, gLandToolTerrainEdge);
GameActions::Execute(&surfaceSetStyleAction);
Add LoadOrQuiteAction
2019-02-21 10:34:30 +01:00
// The tool is set to 12 here instead of 3 so that the dragging cursor is not the elevation change
// cursor
Close #13625: Refactor TOOL_IDX to use strong enum
2020-12-23 05:11:15 +01:00
gCurrentToolId = Tool::Crosshair;
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
else
{
Fix #11072: Land and water tools work out of bounds (#11179) Tool tried to act out of bounds, where it shouldn't do anything
2020-04-18 00:34:32 +02:00
if (!_landToolBlocked)
{
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
window_top_toolbar_land_tool_drag(screenCoords);
Fix #11072: Land and water tools work out of bounds (#11179) Tool tried to act out of bounds, where it shouldn't do anything
2020-04-18 00:34:32 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
break;
case WIDX_WATER:
Fix #11072: Land and water tools work out of bounds (#11179) Tool tried to act out of bounds, where it shouldn't do anything
2020-04-18 00:34:32 +02:00
if (!_landToolBlocked)
{
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
window_top_toolbar_water_tool_drag(screenCoords);
Fix #11072: Land and water tools work out of bounds (#11179) Tool tried to act out of bounds, where it shouldn't do anything
2020-04-18 00:34:32 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_SCENERY:
if (gWindowSceneryPaintEnabled & 1)
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
window_top_toolbar_scenery_tool_down(screenCoords, w, widgetIndex);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gWindowSceneryEyedropperEnabled)
Use ScreenCoordsXY on windows/TopToolbar.cpp
2020-05-01 17:52:07 +02:00
window_top_toolbar_scenery_tool_down(screenCoords, w, widgetIndex);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Implement custom tools
2020-05-01 22:32:41 +02:00
#ifdef ENABLE_SCRIPTING
default:
auto& customTool = OpenRCT2::Scripting::ActiveCustomTool;
if (customTool)
{
customTool->OnDrag(screenCoords);
}
break;
#endif
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
remove toolbar.c and ignore seperators at the end of the toolbar
2015-02-10 15:41:35 +01:00
}
Decompiled top_toolbar tool events Also fixed bug with land rights tool gridlines
2015-06-26 17:40:37 +02:00
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Decompiled top_toolbar tool events Also fixed bug with land rights tool gridlines
2015-06-26 17:40:37 +02:00
* rct2: 0x0066CC5B
*/
Prefer const ref to send ScreenCoordsXY over
2020-02-29 03:43:29 +01:00
static void window_top_toolbar_tool_up(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
Strip all whitespace
2015-10-20 20:16:30 +02:00
{
Fix #11072: Land and water tools work out of bounds (#11179) Tool tried to act out of bounds, where it shouldn't do anything
2020-04-18 00:34:32 +02:00
_landToolBlocked = false;
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_LAND:
map_invalidate_selection_rect();
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE;
Close #13625: Refactor TOOL_IDX to use strong enum
2020-12-23 05:11:15 +01:00
gCurrentToolId = Tool::DigDown;
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_WATER:
map_invalidate_selection_rect();
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE;
Close #13625: Refactor TOOL_IDX to use strong enum
2020-12-23 05:11:15 +01:00
gCurrentToolId = Tool::WaterDown;
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case WIDX_CLEAR_SCENERY:
map_invalidate_selection_rect();
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE;
Close #13625: Refactor TOOL_IDX to use strong enum
2020-12-23 05:11:15 +01:00
gCurrentToolId = Tool::Crosshair;
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
Implement custom tools
2020-05-01 22:32:41 +02:00
#ifdef ENABLE_SCRIPTING
default:
auto& customTool = OpenRCT2::Scripting::ActiveCustomTool;
if (customTool)
{
customTool->OnUp(screenCoords);
}
break;
#endif
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Decompiled top_toolbar tool events Also fixed bug with land rights tool gridlines
2015-06-26 17:40:37 +02:00
}
/**
Strip all whitespace
2015-10-20 20:16:30 +02:00
*
Decompiled top_toolbar tool events Also fixed bug with land rights tool gridlines
2015-06-26 17:40:37 +02:00
* rct2: 0x0066CA58
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_top_toolbar_tool_abort(rct_window* w, rct_widgetindex widgetIndex)
Decompiled top_toolbar tool events Also fixed bug with land rights tool gridlines
2015-06-26 17:40:37 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_LAND:
case WIDX_WATER:
case WIDX_CLEAR_SCENERY:
hide_gridlines();
break;
Implement custom tools
2020-05-01 22:32:41 +02:00
#ifdef ENABLE_SCRIPTING
default:
auto& customTool = OpenRCT2::Scripting::ActiveCustomTool;
if (customTool)
{
customTool->OnAbort();
customTool = {};
}
break;
#endif
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Decompiled top_toolbar tool events Also fixed bug with land rights tool gridlines
2015-06-26 17:40:37 +02:00
}
Didn't update top_toolbar
2015-05-19 00:16:43 +02:00
Implement custom menu items
2020-02-11 22:26:05 +01:00
static void top_toolbar_init_map_menu(rct_window* w, rct_widget* widget)
{
auto i = 0;
gDropdownItemsFormat[i++] = STR_SHORTCUT_SHOW_MAP;
gDropdownItemsFormat[i++] = STR_EXTRA_VIEWPORT;
Remove gS6Info
2021-04-05 19:01:43 +02:00
if ((gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && gEditorStep == EditorStep::LandscapeEditor)
Implement custom menu items
2020-02-11 22:26:05 +01:00
{
gDropdownItemsFormat[i++] = STR_MAPGEN_WINDOW_TITLE;
}
Rename __ENABLE_SCRIPTING__ to ENABLE_SCRIPTING
2020-04-24 16:58:01 +02:00
#ifdef ENABLE_SCRIPTING
Implement custom menu items
2020-02-11 22:26:05 +01:00
const auto& customMenuItems = OpenRCT2::Scripting::CustomMenuItems;
if (!customMenuItems.empty())
{
gDropdownItemsFormat[i++] = STR_EMPTY;
for (const auto& item : customMenuItems)
{
gDropdownItemsFormat[i] = STR_STRING;
Fix rebase
2020-04-21 00:41:02 +02:00
auto sz = item.Text.c_str();
std::memcpy(&gDropdownItemsArgs[i], &sz, sizeof(const char*));
Implement custom menu items
2020-02-11 22:26:05 +01:00
i++;
}
}
Allow scripting to be compile-disabled
2020-02-23 13:55:48 +01:00
#endif
Implement custom menu items
2020-02-11 22:26:05 +01:00
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowText(
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
{ w->windowPos.x + widget->left, w->windowPos.y + widget->top }, widget->height() + 1, w->colours[1] | 0x80, 0, i);
Implement custom menu items
2020-02-11 22:26:05 +01:00
gDropdownDefaultIndex = DDIDX_SHOW_MAP;
}
static void top_toolbar_map_menu_dropdown(int16_t dropdownIndex)
{
int32_t customStartIndex = 3;
Remove gS6Info
2021-04-05 19:01:43 +02:00
if ((gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && gEditorStep == EditorStep::LandscapeEditor)
Implement custom menu items
2020-02-11 22:26:05 +01:00
{
customStartIndex++;
}
if (dropdownIndex < customStartIndex)
{
switch (dropdownIndex)
{
case 0:
context_open_window(WC_MAP);
break;
case 1:
context_open_window(WC_VIEWPORT);
break;
case 2:
context_open_window(WC_MAPGEN);
break;
}
}
else
{
Rename __ENABLE_SCRIPTING__ to ENABLE_SCRIPTING
2020-04-24 16:58:01 +02:00
#ifdef ENABLE_SCRIPTING
Implement custom menu items
2020-02-11 22:26:05 +01:00
const auto& customMenuItems = OpenRCT2::Scripting::CustomMenuItems;
Fix GCC issues
2020-02-22 19:04:27 +01:00
auto customIndex = static_cast<size_t>(dropdownIndex - customStartIndex);
Implement custom menu items
2020-02-11 22:26:05 +01:00
if (customMenuItems.size() > customIndex)
{
customMenuItems[customIndex].Invoke();
}
Allow scripting to be compile-disabled
2020-02-23 13:55:48 +01:00
#endif
Implement custom menu items
2020-02-11 22:26:05 +01:00
}
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void top_toolbar_init_fastforward_menu(rct_window* w, rct_widget* widget)
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t num_items = 4;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gDropdownItemsFormat[0] = STR_TOGGLE_OPTION;
gDropdownItemsFormat[1] = STR_TOGGLE_OPTION;
gDropdownItemsFormat[2] = STR_TOGGLE_OPTION;
gDropdownItemsFormat[3] = STR_TOGGLE_OPTION;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gConfigGeneral.debugging_tools)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gDropdownItemsFormat[4] = STR_EMPTY;
gDropdownItemsFormat[5] = STR_TOGGLE_OPTION;
gDropdownItemsArgs[5] = STR_SPEED_HYPER;
num_items = 6;
}
gDropdownItemsArgs[0] = STR_SPEED_NORMAL;
gDropdownItemsArgs[1] = STR_SPEED_QUICK;
gDropdownItemsArgs[2] = STR_SPEED_FAST;
gDropdownItemsArgs[3] = STR_SPEED_TURBO;
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowText(
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
{ w->windowPos.x + widget->left, w->windowPos.y + widget->top }, widget->height() + 1, w->colours[0] | 0x80, 0,
num_items);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Set checkmarks
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gGameSpeed <= 4)
{
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetChecked(gGameSpeed - 1, true);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gGameSpeed == 8)
{
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetChecked(5, true);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gConfigGeneral.debugging_tools)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gDropdownDefaultIndex = (gGameSpeed == 8 ? 0 : gGameSpeed);
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gDropdownDefaultIndex = (gGameSpeed >= 4 ? 0 : gGameSpeed);
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gDropdownDefaultIndex == 4)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gDropdownDefaultIndex = 5;
}
Didn't update top_toolbar
2015-05-19 00:16:43 +02:00
}
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void top_toolbar_fastforward_menu_dropdown(int16_t dropdownIndex)
fix #2363: show default item highlight, refactor
2016-01-18 00:37:14 +01:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_window* w = window_get_main();
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w)
{
if (dropdownIndex >= 0 && dropdownIndex <= 5)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gGameSpeed = dropdownIndex + 1;
if (gGameSpeed >= 5)
gGameSpeed = 8;
Refactor window_invalidate to use rct_window::Invalidate
2019-06-15 17:20:16 +02:00
w->Invalidate();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
Didn't update top_toolbar
2015-05-19 00:16:43 +02:00
}
Move top toolbar to UI module
2017-11-11 02:57:45 +01:00
static void top_toolbar_init_rotate_menu(rct_window* w, rct_widget* widget)
fix #2363: show default item highlight, refactor
2016-01-18 00:37:14 +01:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gDropdownItemsFormat[0] = STR_ROTATE_CLOCKWISE;
gDropdownItemsFormat[1] = STR_ROTATE_ANTI_CLOCKWISE;
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowText(
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
{ w->windowPos.x + widget->left, w->windowPos.y + widget->top }, widget->height() + 1, w->colours[1] | 0x80, 0, 2);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gDropdownDefaultIndex = DDIDX_ROTATE_CLOCKWISE;
Add submenu and anti-clockwise rotation
2015-07-09 12:45:47 +02:00
}
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void top_toolbar_rotate_menu_dropdown(int16_t dropdownIndex)
fix #2363: show default item highlight, refactor
2016-01-18 00:37:14 +01:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_window* w = window_get_main();
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w)
{
if (dropdownIndex == 0)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_rotate_camera(w, 1);
Refactor window_invalidate to use rct_window::Invalidate
2019-06-15 17:20:16 +02:00
w->Invalidate();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
else if (dropdownIndex == 1)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_rotate_camera(w, -1);
Refactor window_invalidate to use rct_window::Invalidate
2019-06-15 17:20:16 +02:00
w->Invalidate();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
Add submenu and anti-clockwise rotation
2015-07-09 12:45:47 +02:00
}
Move common actions from debug menu into cheats menu (#8892) This aims to make it less necessary for users to enable debugging tools.
2019-03-17 12:52:32 +01:00
static void top_toolbar_init_cheats_menu(rct_window* w, rct_widget* widget)
fix #2363: show default item highlight, refactor
2016-01-18 00:37:14 +01:00
{
Make menu data declarations local to the functions using them
2020-09-13 22:30:17 +02:00
using namespace Dropdown;
constexpr Item items[] = {
ToggleOption(DDIDX_CHEATS, STR_CHEAT_TITLE),
ToggleOption(DDIDX_TILE_INSPECTOR, STR_DEBUG_DROPDOWN_TILE_INSPECTOR),
ToggleOption(DDIDX_OBJECT_SELECTION, STR_DEBUG_DROPDOWN_OBJECT_SELECTION),
ToggleOption(DDIDX_INVENTIONS_LIST, STR_DEBUG_DROPDOWN_INVENTIONS_LIST),
ToggleOption(DDIDX_SCENARIO_OPTIONS, STR_DEBUG_DROPDOWN_SCENARIO_OPTIONS),
Add Objective Options to Cheats menu
2020-10-11 18:41:23 +02:00
ToggleOption(DDIDX_OBJECTIVE_OPTIONS, STR_CHEATS_MENU_OBJECTIVE_OPTIONS),
Make menu data declarations local to the functions using them
2020-09-13 22:30:17 +02:00
Separator(),
ToggleOption(DDIDX_ENABLE_SANDBOX_MODE, STR_ENABLE_SANDBOX_MODE),
ToggleOption(DDIDX_DISABLE_CLEARANCE_CHECKS, STR_DISABLE_CLEARANCE_CHECKS),
ToggleOption(DDIDX_DISABLE_SUPPORT_LIMITS, STR_DISABLE_SUPPORT_LIMITS),
};
static_assert(ItemIDsMatchIndices(items));
SetItems(items);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowText(
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
{ w->windowPos.x + widget->left, w->windowPos.y + widget->top }, widget->height() + 1, w->colours[0] | 0x80, 0,
TOP_TOOLBAR_CHEATS_COUNT);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Disable items that are not yet available in multiplayer
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (network_get_mode() != NETWORK_MODE_NONE)
{
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetDisabled(DDIDX_OBJECT_SELECTION, true);
Dropdown::SetDisabled(DDIDX_INVENTIONS_LIST, true);
Disallow opening problematic windows in multiplayer
2021-08-19 12:04:49 +02:00
Dropdown::SetDisabled(DDIDX_OBJECTIVE_OPTIONS, true);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Use SCREEN_FLAGS_EDITOR when appropriate.
2019-03-20 20:58:08 +01:00
if (gScreenFlags & SCREEN_FLAGS_EDITOR)
Fix #8927: Make cheats menu partially accessible in scenario editor.
2019-03-20 20:03:28 +01:00
{
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetDisabled(DDIDX_OBJECT_SELECTION, true);
Dropdown::SetDisabled(DDIDX_INVENTIONS_LIST, true);
Dropdown::SetDisabled(DDIDX_SCENARIO_OPTIONS, true);
Dropdown::SetDisabled(DDIDX_OBJECTIVE_OPTIONS, true);
Dropdown::SetDisabled(DDIDX_ENABLE_SANDBOX_MODE, true);
Fix #8927: Make cheats menu partially accessible in scenario editor.
2019-03-20 20:03:28 +01:00
}
Move common actions from debug menu into cheats menu (#8892) This aims to make it less necessary for users to enable debugging tools.
2019-03-17 12:52:32 +01:00
if (gCheatsSandboxMode)
{
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetChecked(DDIDX_ENABLE_SANDBOX_MODE, true);
Move common actions from debug menu into cheats menu (#8892) This aims to make it less necessary for users to enable debugging tools.
2019-03-17 12:52:32 +01:00
}
if (gCheatsDisableClearanceChecks)
{
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetChecked(DDIDX_DISABLE_CLEARANCE_CHECKS, true);
Move common actions from debug menu into cheats menu (#8892) This aims to make it less necessary for users to enable debugging tools.
2019-03-17 12:52:32 +01:00
}
if (gCheatsDisableSupportLimits)
{
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetChecked(DDIDX_DISABLE_SUPPORT_LIMITS, true);
Move common actions from debug menu into cheats menu (#8892) This aims to make it less necessary for users to enable debugging tools.
2019-03-17 12:52:32 +01:00
}
Fix #12308: Cannot use cheats in editor modes (#12661) This allows opening the cheats window while in editor mode. Some tabs and options are disabled because they are not relevant to these modes.
2020-08-13 13:03:56 +02:00
gDropdownDefaultIndex = DDIDX_CHEATS;
Move common actions from debug menu into cheats menu (#8892) This aims to make it less necessary for users to enable debugging tools.
2019-03-17 12:52:32 +01:00
}
static void top_toolbar_cheats_menu_dropdown(int16_t dropdownIndex)
{
switch (dropdownIndex)
{
case DDIDX_CHEATS:
context_open_window(WC_CHEATS);
break;
case DDIDX_TILE_INSPECTOR:
context_open_window(WC_TILE_INSPECTOR);
break;
case DDIDX_OBJECT_SELECTION:
window_close_all();
context_open_window(WC_EDITOR_OBJECT_SELECTION);
break;
case DDIDX_INVENTIONS_LIST:
context_open_window(WC_EDITOR_INVENTION_LIST);
break;
case DDIDX_SCENARIO_OPTIONS:
context_open_window(WC_EDITOR_SCENARIO_OPTIONS);
break;
Add Objective Options to Cheats menu
2020-10-11 18:41:23 +02:00
case DDIDX_OBJECTIVE_OPTIONS:
Fix typo in WC_EDITOR_OBJECTIVE_OPTIONS
2020-10-11 18:42:17 +02:00
context_open_window(WC_EDITOR_OBJECTIVE_OPTIONS);
Add Objective Options to Cheats menu
2020-10-11 18:41:23 +02:00
break;
Move common actions from debug menu into cheats menu (#8892) This aims to make it less necessary for users to enable debugging tools.
2019-03-17 12:52:32 +01:00
case DDIDX_ENABLE_SANDBOX_MODE:
Implement SetCheatAction. (#8990) * Implement SetCheatAction. * Bump up network version
2019-05-04 15:28:38 +02:00
CheatsSet(CheatType::SandboxMode, !gCheatsSandboxMode);
Move common actions from debug menu into cheats menu (#8892) This aims to make it less necessary for users to enable debugging tools.
2019-03-17 12:52:32 +01:00
break;
case DDIDX_DISABLE_CLEARANCE_CHECKS:
Implement SetCheatAction. (#8990) * Implement SetCheatAction. * Bump up network version
2019-05-04 15:28:38 +02:00
CheatsSet(CheatType::DisableClearanceChecks, !gCheatsDisableClearanceChecks);
Move common actions from debug menu into cheats menu (#8892) This aims to make it less necessary for users to enable debugging tools.
2019-03-17 12:52:32 +01:00
break;
case DDIDX_DISABLE_SUPPORT_LIMITS:
Implement SetCheatAction. (#8990) * Implement SetCheatAction. * Bump up network version
2019-05-04 15:28:38 +02:00
CheatsSet(CheatType::DisableSupportLimits, !gCheatsDisableSupportLimits);
Move common actions from debug menu into cheats menu (#8892) This aims to make it less necessary for users to enable debugging tools.
2019-03-17 12:52:32 +01:00
break;
}
}
static void top_toolbar_init_debug_menu(rct_window* w, rct_widget* widget)
{
gDropdownItemsFormat[DDIDX_CONSOLE] = STR_TOGGLE_OPTION;
gDropdownItemsArgs[DDIDX_CONSOLE] = STR_DEBUG_DROPDOWN_CONSOLE;
gDropdownItemsFormat[DDIDX_DEBUG_PAINT] = STR_TOGGLE_OPTION;
gDropdownItemsArgs[DDIDX_DEBUG_PAINT] = STR_DEBUG_DROPDOWN_DEBUG_PAINT;
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowText(
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
{ w->windowPos.x + widget->left, w->windowPos.y + widget->top }, widget->height() + 1, w->colours[0] | 0x80,
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::Flag::StayOpen, TOP_TOOLBAR_DEBUG_COUNT);
Move common actions from debug menu into cheats menu (#8892) This aims to make it less necessary for users to enable debugging tools.
2019-03-17 12:52:32 +01:00
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetChecked(DDIDX_DEBUG_PAINT, window_find_by_class(WC_DEBUG_PAINT) != nullptr);
Add debug toolbar menu, start tile inspector
2015-06-01 03:33:56 +02:00
}
Move top toolbar to UI module
2017-11-11 02:57:45 +01:00
static void top_toolbar_init_network_menu(rct_window* w, rct_widget* widget)
fix #2363: show default item highlight, refactor
2016-01-18 00:37:14 +01:00
{
Add Network window
2019-01-29 19:51:07 +01:00
gDropdownItemsFormat[DDIDX_MULTIPLAYER] = STR_MULTIPLAYER;
Add "Reconnect" option under the multiplayer button
2019-02-05 06:57:09 +01:00
gDropdownItemsFormat[DDIDX_MULTIPLAYER_RECONNECT] = STR_MULTIPLAYER_RECONNECT;
Add Network window
2019-01-29 19:51:07 +01:00
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowText(
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
{ w->windowPos.x + widget->left, w->windowPos.y + widget->top }, widget->height() + 1, w->colours[0] | 0x80, 0,
TOP_TOOLBAR_NETWORK_COUNT);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetDisabled(DDIDX_MULTIPLAYER_RECONNECT, !network_is_desynchronised());
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gDropdownDefaultIndex = DDIDX_MULTIPLAYER;
basic player list
2015-07-16 19:32:43 +02:00
}
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void top_toolbar_debug_menu_dropdown(int16_t dropdownIndex)
fix #2363: show default item highlight, refactor
2016-01-18 00:37:14 +01:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_window* w = window_get_main();
Check for nullptr explicitly in operct2-ui (#15460)
2021-09-25 08:45:06 +02:00
if (w != nullptr)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
switch (dropdownIndex)
Move in game console to UI library
2018-03-11 23:25:34 +01:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
case DDIDX_CONSOLE:
{
auto& console = GetInGameConsole();
console.Open();
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
case DDIDX_DEBUG_PAINT:
if (window_find_by_class(WC_DEBUG_PAINT) == nullptr)
{
context_open_window(WC_DEBUG_PAINT);
}
else
{
window_close_by_class(WC_DEBUG_PAINT);
}
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
Add debug toolbar menu, start tile inspector
2015-06-01 03:33:56 +02:00
}
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void top_toolbar_network_menu_dropdown(int16_t dropdownIndex)
fix #2363: show default item highlight, refactor
2016-01-18 00:37:14 +01:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_window* w = window_get_main();
Check for nullptr explicitly in operct2-ui (#15460)
2021-09-25 08:45:06 +02:00
if (w != nullptr)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
switch (dropdownIndex)
{
case DDIDX_MULTIPLAYER:
context_open_window(WC_MULTIPLAYER);
break;
Add "Reconnect" option under the multiplayer button
2019-02-05 06:57:09 +01:00
case DDIDX_MULTIPLAYER_RECONNECT:
network_reconnect();
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
basic player list
2015-07-16 19:32:43 +02:00
}
remove toolbar.c and ignore seperators at the end of the toolbar
2015-02-10 15:41:35 +01:00
/**
*
* rct2: 0x0066CDE4
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void top_toolbar_init_view_menu(rct_window* w, rct_widget* widget)
{
Make menu data declarations local to the functions using them
2020-09-13 22:30:17 +02:00
using namespace Dropdown;
constexpr Item items[] = {
ToggleOption(DDIDX_UNDERGROUND_INSIDE, STR_UNDERGROUND_VIEW),
Reverse option, add shortcut
2021-05-24 16:54:30 +02:00
ToggleOption(DDIDX_TRANSPARENT_WATER, STR_VIEWPORT_TRANSPARENT_WATER),
Make menu data declarations local to the functions using them
2020-09-13 22:30:17 +02:00
ToggleOption(DDIDX_HIDE_BASE, STR_REMOVE_BASE_LAND),
ToggleOption(DDIDX_HIDE_VERTICAL, STR_REMOVE_VERTICAL_FACES),
Separator(),
ToggleOption(DDIDX_SEETHROUGH_RIDES, STR_SEE_THROUGH_RIDES),
Add option to make water opaque
2021-05-24 16:30:46 +02:00
ToggleOption(DDIDX_SEETHROUGH_SCENERY, STR_SEE_THROUGH_SCENERY),
Make menu data declarations local to the functions using them
2020-09-13 22:30:17 +02:00
ToggleOption(DDIDX_SEETHROUGH_PATHS, STR_SEE_THROUGH_PATHS),
ToggleOption(DDIDX_INVISIBLE_SUPPORTS, STR_INVISIBLE_SUPPORTS),
ToggleOption(DDIDX_INVISIBLE_PEEPS, STR_INVISIBLE_PEOPLE),
Separator(),
ToggleOption(DDIDX_LAND_HEIGHTS, STR_HEIGHT_MARKS_ON_LAND),
ToggleOption(DDIDX_TRACK_HEIGHTS, STR_HEIGHT_MARKS_ON_RIDE_TRACKS),
ToggleOption(DDIDX_PATH_HEIGHTS, STR_HEIGHT_MARKS_ON_PATHS),
Separator(),
ToggleOption(DDIDX_VIEW_CLIPPING, STR_VIEW_CLIPPING_MENU),
ToggleOption(DDIDX_HIGHLIGHT_PATH_ISSUES, STR_HIGHLIGHT_PATH_ISSUES_MENU),
};
Add option to make water opaque
2021-05-24 16:30:46 +02:00
Make menu data declarations local to the functions using them
2020-09-13 22:30:17 +02:00
static_assert(ItemIDsMatchIndices(items));
SetItems(items);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
WindowDropdownShowText(
Introduce widget::width and widget::height helper functions (#12053)
2020-06-25 03:44:00 +02:00
{ w->windowPos.x + widget->left, w->windowPos.y + widget->top }, widget->height() + 1, w->colours[1] | 0x80, 0,
TOP_TOOLBAR_VIEW_MENU_COUNT);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Set checkmarks
rct_viewport* mainViewport = window_get_main()->viewport;
if (mainViewport->flags & VIEWPORT_FLAG_UNDERGROUND_INSIDE)
Add option to make water opaque
2021-05-24 16:30:46 +02:00
Dropdown::SetChecked(DDIDX_UNDERGROUND_INSIDE, true);
Reverse option, add shortcut
2021-05-24 16:54:30 +02:00
if (gConfigGeneral.transparent_water)
Dropdown::SetChecked(DDIDX_TRANSPARENT_WATER, true);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (mainViewport->flags & VIEWPORT_FLAG_HIDE_BASE)
Add option to make water opaque
2021-05-24 16:30:46 +02:00
Dropdown::SetChecked(DDIDX_HIDE_BASE, true);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (mainViewport->flags & VIEWPORT_FLAG_HIDE_VERTICAL)
Add option to make water opaque
2021-05-24 16:30:46 +02:00
Dropdown::SetChecked(DDIDX_HIDE_VERTICAL, true);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (mainViewport->flags & VIEWPORT_FLAG_SEETHROUGH_RIDES)
Add option to make water opaque
2021-05-24 16:30:46 +02:00
Dropdown::SetChecked(DDIDX_SEETHROUGH_RIDES, true);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (mainViewport->flags & VIEWPORT_FLAG_SEETHROUGH_SCENERY)
Add option to make water opaque
2021-05-24 16:30:46 +02:00
Dropdown::SetChecked(DDIDX_SEETHROUGH_SCENERY, true);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (mainViewport->flags & VIEWPORT_FLAG_SEETHROUGH_PATHS)
Add option to make water opaque
2021-05-24 16:30:46 +02:00
Dropdown::SetChecked(DDIDX_SEETHROUGH_PATHS, true);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (mainViewport->flags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS)
Add option to make water opaque
2021-05-24 16:30:46 +02:00
Dropdown::SetChecked(DDIDX_INVISIBLE_SUPPORTS, true);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (mainViewport->flags & VIEWPORT_FLAG_INVISIBLE_PEEPS)
Add option to make water opaque
2021-05-24 16:30:46 +02:00
Dropdown::SetChecked(DDIDX_INVISIBLE_PEEPS, true);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (mainViewport->flags & VIEWPORT_FLAG_LAND_HEIGHTS)
Add option to make water opaque
2021-05-24 16:30:46 +02:00
Dropdown::SetChecked(DDIDX_LAND_HEIGHTS, true);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (mainViewport->flags & VIEWPORT_FLAG_TRACK_HEIGHTS)
Add option to make water opaque
2021-05-24 16:30:46 +02:00
Dropdown::SetChecked(DDIDX_TRACK_HEIGHTS, true);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (mainViewport->flags & VIEWPORT_FLAG_PATH_HEIGHTS)
Add option to make water opaque
2021-05-24 16:30:46 +02:00
Dropdown::SetChecked(DDIDX_PATH_HEIGHTS, true);
Add clip selection This allows the user to select an area of tiles. Anything outside of this area won't be drawn.
2018-05-08 01:25:05 +02:00
if (mainViewport->flags & VIEWPORT_FLAG_CLIP_VIEW)
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetChecked(DDIDX_VIEW_CLIPPING, true);
Implement #4984: Add option to highlight vomit, litter and handymen
2018-01-11 00:26:19 +01:00
if (mainViewport->flags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES)
Refactor Dropdown to TitleCase (#13352) * Refactor Dropdown Namespace * Refactor Dropdown to TitleCase
2020-11-03 09:16:06 +01:00
Dropdown::SetChecked(DDIDX_HIGHLIGHT_PATH_ISSUES, true);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gDropdownDefaultIndex = DDIDX_UNDERGROUND_INSIDE;
Add option to make water opaque
2021-05-24 16:30:46 +02:00
// Opaque water relies on RCT1 sprites.
if (!is_csg_loaded())
{
Reverse option, add shortcut
2021-05-24 16:54:30 +02:00
Dropdown::SetDisabled(DDIDX_TRANSPARENT_WATER, true);
Add option to make water opaque
2021-05-24 16:30:46 +02:00
}
remove toolbar.c and ignore seperators at the end of the toolbar
2015-02-10 15:41:35 +01:00
}
/**
*
* rct2: 0x0066CF8A
*/
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void top_toolbar_view_menu_dropdown(int16_t dropdownIndex)
fix #2363: show default item highlight, refactor
2016-01-18 00:37:14 +01:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_window* w = window_get_main();
Check for nullptr explicitly in operct2-ui (#15460)
2021-09-25 08:45:06 +02:00
if (w != nullptr)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
switch (dropdownIndex)
{
case DDIDX_UNDERGROUND_INSIDE:
w->viewport->flags ^= VIEWPORT_FLAG_UNDERGROUND_INSIDE;
break;
Reverse option, add shortcut
2021-05-24 16:54:30 +02:00
case DDIDX_TRANSPARENT_WATER:
gConfigGeneral.transparent_water ^= 1;
Add option to make water opaque
2021-05-24 16:30:46 +02:00
config_save_default();
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
case DDIDX_HIDE_BASE:
w->viewport->flags ^= VIEWPORT_FLAG_HIDE_BASE;
break;
case DDIDX_HIDE_VERTICAL:
w->viewport->flags ^= VIEWPORT_FLAG_HIDE_VERTICAL;
break;
case DDIDX_SEETHROUGH_RIDES:
w->viewport->flags ^= VIEWPORT_FLAG_SEETHROUGH_RIDES;
break;
Add option to make water opaque
2021-05-24 16:30:46 +02:00
case DDIDX_SEETHROUGH_SCENERY:
clang-format UI windows
2018-06-22 23:21:44 +02:00
w->viewport->flags ^= VIEWPORT_FLAG_SEETHROUGH_SCENERY;
break;
case DDIDX_SEETHROUGH_PATHS:
w->viewport->flags ^= VIEWPORT_FLAG_SEETHROUGH_PATHS;
break;
case DDIDX_INVISIBLE_SUPPORTS:
w->viewport->flags ^= VIEWPORT_FLAG_INVISIBLE_SUPPORTS;
break;
case DDIDX_INVISIBLE_PEEPS:
w->viewport->flags ^= VIEWPORT_FLAG_INVISIBLE_PEEPS;
break;
case DDIDX_LAND_HEIGHTS:
w->viewport->flags ^= VIEWPORT_FLAG_LAND_HEIGHTS;
break;
case DDIDX_TRACK_HEIGHTS:
w->viewport->flags ^= VIEWPORT_FLAG_TRACK_HEIGHTS;
break;
case DDIDX_PATH_HEIGHTS:
w->viewport->flags ^= VIEWPORT_FLAG_PATH_HEIGHTS;
break;
case DDIDX_VIEW_CLIPPING:
if (window_find_by_class(WC_VIEW_CLIPPING) == nullptr)
{
context_open_window(WC_VIEW_CLIPPING);
}
else
{
// If window is already open, toggle the view clipping on/off
w->viewport->flags ^= VIEWPORT_FLAG_CLIP_VIEW;
}
break;
case DDIDX_HIGHLIGHT_PATH_ISSUES:
Implement #4984: Add option to highlight vomit, litter and handymen
2018-01-11 00:26:19 +01:00
w->viewport->flags ^= VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES;
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
default:
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Refactor window_invalidate to use rct_window::Invalidate
2019-06-15 17:20:16 +02:00
w->Invalidate();
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
remove toolbar.c and ignore seperators at the end of the toolbar
2015-02-10 15:41:35 +01:00
}
/**
*
* rct2: 0x0066CCE7
*/
Move top toolbar to UI module
2017-11-11 02:57:45 +01:00
static void toggle_footpath_window()
remove toolbar.c and ignore seperators at the end of the toolbar
2015-02-10 15:41:35 +01:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (window_find_by_class(WC_FOOTPATH) == nullptr)
{
Move additional windows to UI project
2017-08-12 23:06:12 +02:00
context_open_window(WC_FOOTPATH);
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
tool_cancel();
window_close_by_class(WC_FOOTPATH);
}
remove toolbar.c and ignore seperators at the end of the toolbar
2015-02-10 15:41:35 +01:00
}
/**
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x0066CD54
remove toolbar.c and ignore seperators at the end of the toolbar
2015-02-10 15:41:35 +01:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void toggle_land_window(rct_window* topToolbar, rct_widgetindex widgetIndex)
remove toolbar.c and ignore seperators at the end of the toolbar
2015-02-10 15:41:35 +01:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
if ((input_test_flag(INPUT_FLAG_TOOL_ACTIVE)) && gCurrentToolWidget.window_classification == WC_TOP_TOOLBAR
&& gCurrentToolWidget.widget_index == WIDX_LAND)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
tool_cancel();
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #11072: Land and water tools work out of bounds (#11179) Tool tried to act out of bounds, where it shouldn't do anything
2020-04-18 00:34:32 +02:00
_landToolBlocked = false;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
show_gridlines();
Close #13625: Refactor TOOL_IDX to use strong enum
2020-12-23 05:11:15 +01:00
tool_set(topToolbar, widgetIndex, Tool::DigDown);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
input_set_flag(INPUT_FLAG_6, true);
Move additional windows to UI project
2017-08-12 23:06:12 +02:00
context_open_window(WC_LAND);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
remove toolbar.c and ignore seperators at the end of the toolbar
2015-02-10 15:41:35 +01:00
}
/**
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x0066CD0C
remove toolbar.c and ignore seperators at the end of the toolbar
2015-02-10 15:41:35 +01:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void toggle_clear_scenery_window(rct_window* topToolbar, rct_widgetindex widgetIndex)
remove toolbar.c and ignore seperators at the end of the toolbar
2015-02-10 15:41:35 +01:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
if ((input_test_flag(INPUT_FLAG_TOOL_ACTIVE) && gCurrentToolWidget.window_classification == WC_TOP_TOOLBAR
&& gCurrentToolWidget.widget_index == WIDX_CLEAR_SCENERY))
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
tool_cancel();
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
show_gridlines();
Close #13625: Refactor TOOL_IDX to use strong enum
2020-12-23 05:11:15 +01:00
tool_set(topToolbar, widgetIndex, Tool::Crosshair);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
input_set_flag(INPUT_FLAG_6, true);
Move additional windows to UI project
2017-08-12 23:06:12 +02:00
context_open_window(WC_CLEAR_SCENERY);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
remove toolbar.c and ignore seperators at the end of the toolbar
2015-02-10 15:41:35 +01:00
}
/**
*
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x0066CD9C
remove toolbar.c and ignore seperators at the end of the toolbar
2015-02-10 15:41:35 +01:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void toggle_water_window(rct_window* topToolbar, rct_widgetindex widgetIndex)
remove toolbar.c and ignore seperators at the end of the toolbar
2015-02-10 15:41:35 +01:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
if ((input_test_flag(INPUT_FLAG_TOOL_ACTIVE)) && gCurrentToolWidget.window_classification == WC_TOP_TOOLBAR
&& gCurrentToolWidget.widget_index == WIDX_WATER)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
tool_cancel();
clang-format UI windows
2018-06-22 23:21:44 +02:00
}
else
{
Fix #11072: Land and water tools work out of bounds (#11179) Tool tried to act out of bounds, where it shouldn't do anything
2020-04-18 00:34:32 +02:00
_landToolBlocked = false;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
show_gridlines();
Close #13625: Refactor TOOL_IDX to use strong enum
2020-12-23 05:11:15 +01:00
tool_set(topToolbar, widgetIndex, Tool::WaterDown);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
input_set_flag(INPUT_FLAG_6, true);
Move additional windows to UI project
2017-08-12 23:06:12 +02:00
context_open_window(WC_WATER);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Introduce a config-file option for a RCT1-like colour scheme
2015-05-12 16:13:30 +02:00
}
implement finish-map-window part 6
2015-07-02 18:00:39 +02:00
/**
*
* rct2: 0x0066D104
*/
bool land_tool_is_active()
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (!(input_test_flag(INPUT_FLAG_TOOL_ACTIVE)))
return false;
if (gCurrentToolWidget.window_classification != WC_TOP_TOOLBAR)
return false;
if (gCurrentToolWidget.widget_index != WIDX_LAND)
return false;
return true;
implement finish-map-window part 6
2015-07-02 18:00:39 +02:00
}
Fix top toolbar tool switching Moved tool active checks to top toolbar so that it can use constants.
2017-04-30 23:33:19 +02:00
/**
*
* rct2: 0x0066D125
*/
bool clear_scenery_tool_is_active()
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (!(input_test_flag(INPUT_FLAG_TOOL_ACTIVE)))
return false;
if (gCurrentToolWidget.window_classification != WC_TOP_TOOLBAR)
return false;
if (gCurrentToolWidget.widget_index != WIDX_CLEAR_SCENERY)
return false;
return true;
Fix top toolbar tool switching Moved tool active checks to top toolbar so that it can use constants.
2017-04-30 23:33:19 +02:00
}
/**
*
* rct2: 0x0066D125
*/
bool water_tool_is_active()
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (!(input_test_flag(INPUT_FLAG_TOOL_ACTIVE)))
return false;
if (gCurrentToolWidget.window_classification != WC_TOP_TOOLBAR)
return false;
if (gCurrentToolWidget.widget_index != WIDX_WATER)
return false;
return true;
Fix top toolbar tool switching Moved tool active checks to top toolbar so that it can use constants.
2017-04-30 23:33:19 +02:00
}
Implement ClearAction.
2019-01-02 12:59:37 +01:00
static ClearAction GetClearAction()
{
auto range = MapRange(gMapSelectPositionA.x, gMapSelectPositionA.y, gMapSelectPositionB.x, gMapSelectPositionB.y);
ClearableItems itemsToClear = 0;
if (gClearSmallScenery)
itemsToClear |= CLEARABLE_ITEMS::SCENERY_SMALL;
if (gClearLargeScenery)
itemsToClear |= CLEARABLE_ITEMS::SCENERY_LARGE;
if (gClearFootpath)
itemsToClear |= CLEARABLE_ITEMS::SCENERY_FOOTPATH;
return ClearAction(range, itemsToClear);
}