57a57b0c02
Refactor Theme to use new JSON library
2020-09-16 20:18:54 +01:00
d0d5cc5179
Remove unused declarations
2020-09-16 20:23:34 +03:00
af591c834b
Part of #12097 : Use ScreenRect on gfx_fill_rect_inset (1) ( #12938 )
...
* Part of #12097 : Use ScreenRect on gfx_fill_rect_inset (1)
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-09-16 00:02:22 -03:00
3acbb92074
Merge pull request #12922 from Gymnasiast/LetItSnow2
2020-09-15 18:11:45 +02:00
c1729c8a87
Merge pull request #12858 from ju-pinheiro/network-strong-enums
...
NETWORK_PERMISSION and NETWORK_AUTH replaced by strong enums
2020-09-15 08:07:19 -03:00
c9de4f49fe
Add snow as a weather type
...
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2020-09-14 21:58:00 +02:00
31d20cefb2
Rename rain to weather where appropriate
...
Co-authored-by: Brett Penzer <brettpenzer123@live.co.uk>
2020-09-14 21:57:54 +02:00
2857f9d276
Part of #12097 : Use ScreenRect on gfx_fill_rect_inset in Widget.cpp ( #12906 )
...
* Part of #12097 : Use ScreenRect on gfx_fill_rect_inset in Widget.cpp
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-09-14 08:44:50 -03:00
4f31ddaca4
Make menu data declarations local to the functions using them
2020-09-13 16:30:17 -04:00
a51d8e4deb
Convert cheats menu to use new constexpr menu specification
2020-09-13 16:16:05 -04:00
ce99928b81
Convert view menu to use new constexpr menu specification
2020-09-13 16:15:53 -04:00
4a9974fda6
Introduce mechanism for configuring dropdown menu with static data
...
For menus with static content, provide a mechanism for building the menu items as a constexpr array, allowing developers to specify menus more concisely and to put the data into the .rodata section where it can be quickly copied through.
2020-09-13 16:15:28 -04:00
d21da12f9f
Fix 11414: ‘Possible misuse of comma operator’ warnings ( #12919 )
...
Fix the ‘possible misuse of comma operator’ warnings reported by XCode - the two original ones reported in #11414 , plus one more in Util.cpp.
2020-09-13 17:43:59 +01:00
cf5b48a9dd
Rename Rain.{cpp,h} to Weather.{cpp,h} ( #12914 )
2020-09-12 19:32:26 -03:00
a9cd89d02e
Fix #12912 : Plugin: selectedCell of CustomListView ( #12913 )
2020-09-12 19:24:23 -03:00
917fb77f0e
Revert regressed warning on window_install_track_paint
2020-09-10 21:19:53 -03:00
c2f42cd908
Fix #12901 : Guest thoughts show up as guest actions or names
2020-09-10 21:18:42 -03:00
2f3d455b3a
Merge pull request #12899 from Gymnasiast/refactor/c-style-casts
...
Remove most remaining C-style casts
2020-09-10 20:49:15 -03:00
c0e551056f
Fix #12900 : Garbled/distorted date lines in file browser ( #12902 )
...
* Fix #12900 : Garbled/distorted date lines in file browser
2020-09-10 20:47:39 -03:00
20a8bbc322
Close #12420 : Refactor NETWORK_PERMISSION to use strong enum
...
First approach, instead of a bigger refactor to avoid the need of "static_cast".
2020-09-10 19:32:27 -03:00
c83ddefe47
Convert remaining C-style casts to C++-style ones
2020-09-10 21:36:20 +02:00
4afbbed9bd
Fix #12881 : Guests' favourite rides not listed in the guest window
2020-09-10 19:11:17 +02:00
d140dd72c6
Remove const void* overload from DrawTextEllipsised()
2020-09-10 18:13:13 +02:00
b788a099b5
Replace gfx_draw_string_clipped() calls with DrawTextEllipsised
2020-09-10 18:13:13 +02:00
11ebe78328
Refactor window offset std::arrays into regular arrays ( #12799 )
2020-09-09 22:51:51 +02:00
6e22eade67
Create Objective struct and use it for global objective
2020-09-09 15:38:03 +02:00
fe71ce437d
Close #12434 : Refactor ENTERTAINER_COSTUME to use strong enum ( #12865 )
2020-09-08 16:29:18 -03:00
22f29bf192
Close #12414 : Refactor GUEST_LIST_FILTER_TYPE to use strong enum ( #12830 )
2020-09-02 12:50:16 -03:00
5f3fe62f83
Close #12432 : Refactor STAFF_MODE to use strong enum ( #12752 )
...
* Refactor STAFF_MODE to use strong enum
Closes #12432
* Change type of gStaffModes to StaffMode
2020-09-02 12:48:40 -03:00
ae81ed63cc
Remove unused constant TAB_HEIGHT in Cheats.cpp ( #12838 )
2020-09-01 22:58:06 +02:00
55722a7ad4
Remove commented-out code ( #12834 )
2020-09-01 15:33:52 -03:00
e9803fc4b5
Fix #12820 : Title menu buttons not invalidating properly ( #12821 )
...
This introduces constants for the title menu buttons to ensure this does not happen again.
2020-08-30 23:30:02 +02:00
5825dedd81
Rename TitleScenarioSelect to ScenarioSelect ( #12822 )
...
The scenario select window is not only available through the title screen.
2020-08-30 20:22:20 +02:00
731a93dc39
Create WindowColour enum for widget definition calls ( #12722 )
...
* Make MakeWidget* functions take enum colour
* Make windows A-D use WindowColour enum
* Make windows E-G use WindowColour enum
* Make windows I-M use WindowColour enum
* Make windows N-P use WindowColour enum
* Make windows R-S use WindowColour enum
* Make windows T use WindowColour enum
* Make windows V-W use WindowColour enum
2020-08-28 23:31:31 -03:00
b53c4b3625
Downgrade Mac build requirements of OpenRCT2 to macOS 10.13 ( #12749 )
...
Keep targeting macOS 10.14 for libopenrct2 target. Replace deployment target with macOS 10.13 for other targets, including the OpenRCT2 bundle.
Explicitly type std::arrays, since Xcode refuses to use C++17 array deduction.
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2020-08-28 22:27:25 +02:00
65e3d20156
Refactor drawing
2020-08-28 01:30:15 +01:00
609cde2304
Fix drawing of money text when zoomed in
2020-08-28 01:29:59 +01:00
7f0510e444
Fix sub pixel clip issues with OpenGL
2020-08-28 01:29:59 +01:00
411f242cfd
Close #12431 Refactor VirtualFloorStyles to use strong enum ( #12790 )
2020-08-27 21:06:39 -03:00
db8efe20d0
Merge pull request #12785 from Gymnasiast/refactor/text-drawing
...
Start removal of gfx_draw_string_*()
2020-08-26 22:51:39 +02:00
60a35f7abb
Merge pull request #12783 from Gymnasiast/refactor/ride-status-formatter
...
Use Formatter in windows/Ride.cpp
2020-08-26 22:51:09 +02:00
549a771120
Use Formatter&
2020-08-26 17:13:19 +02:00
ec6f1b5fcd
Fix #12784 : Scenery tab images missing
2020-08-26 17:06:19 +02:00
972e6e80ab
Allow passing Formatter to DrawTextBasic() and DrawTextEllipsised()
2020-08-26 15:08:42 +02:00
ceace1a3ad
Remove draw_string_left_underline()
2020-08-26 14:47:47 +02:00
f1caddc9fe
Remove draw_string_right_underline()
2020-08-26 14:46:37 +02:00
879ce64a86
Use Formatter in windows/Ride.cpp
2020-08-26 13:59:18 +02:00
56c623e549
Merge pull request #12671 from AaronVanGeffen/refactor/tabs
...
MakeTab wrapper for standard tab widgets
2020-08-26 12:13:36 +02:00
efdb7e1a2d
Change gDateMonthsElapsed type to int32_t
2020-08-25 19:06:38 -03:00
4caf571c22
Followup on #12475 post-mortem comments ( #12745 )
...
* Remove using namespace OpenRCT2 from header
* Fix using wronf undefined enum for shortcut key map
2020-08-21 16:07:38 +01:00
5330f7fb86
closes #12445 Refactor CLIMATE to use strong enum ( #12551 )
2020-08-21 09:43:57 +01:00
4cc550a364
Close #12460 : Refactor KeyboardShortcut to use strong enum ( #12475 )
...
* Close #12460 : Refactor KeyboardShortcut to use strong enum
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-08-20 23:54:43 -03:00
9cdae2d1e2
Fix #12401 : Refactor SCALE_QUALITY to use strong enum ( #12673 )
2020-08-20 23:32:56 -03:00
4c2ce0f892
Remove duplicate TRACK_ELEMENT_LOCATION_IS_UNDERGROUND flag ( #12714 )
...
Renamed all instances to ELEMENT_IS_UNDERGROUND
Co-authored-by: Simon Jarrett <simonjjarrett@gmail.com>
2020-08-18 09:26:03 -03:00
40cfadcdc5
Apply formatting suggestions from code review
...
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-08-18 10:13:48 +02:00
cc2bb33892
changed enum STAFF_TYPE to strong enum StaffType, moved it to Peep.h
2020-08-17 22:59:02 -04:00
54a33cbde8
renamed StaffType to AssignedStaffType
2020-08-17 20:16:09 -04:00
3b97cd9b14
Refactor Staff*, Themes, and TitleEditor to use MakeTab
2020-08-17 20:59:42 +02:00
6b9211c8b8
Refactor Park, Player, Research, Ride* to use MakeTab
2020-08-17 20:59:42 +02:00
3631d75b98
Use MakeTab in Mapgen, Multiplayer, Network, NewRide, NewsOptions
2020-08-17 20:59:23 +02:00
be626d0b7c
Refactor Editor*, Finances, Guest* to use MakeTab
2020-08-17 20:59:17 +02:00
6602b51b8b
Use MakeTab in EditorInventionsList, EditorObjectSelection, Scenery
2020-08-17 20:59:17 +02:00
4a55acd71e
Introduce MakeTab wrapper function
...
The MakeTab function is only applied in two places, for the moment:
the Cheats and Options windows.
2020-08-17 20:59:13 +02:00
72be84caf8
Remove unused fourth tab from Staff window ( #12713 )
2020-08-17 20:21:46 +02:00
55ba164dee
Fix crash when switching ride types with construct window open ( #12694 )
2020-08-16 18:48:21 +01:00
647730fcfa
Fix #12691 : Tooltip at ride's graph tab is not using a proper string
2020-08-15 23:17:38 +02:00
f95da1c99a
Fix alignment for widget definitions
2020-08-14 10:18:17 +02:00
6dd67296a4
Merge "new version" window back to changelog
2020-08-14 10:18:17 +02:00
6ae5645686
Show update information on main screen & in floppy menu
2020-08-14 10:18:17 +02:00
55835456a0
Pester users to update to latest release
2020-08-14 10:18:17 +02:00
eda8e31055
Refactor widget defs in EditorObjectiveOptions window ( #12672 )
2020-08-13 23:07:19 -03:00
a8f8f06e2d
Fix #12402 : Refactor MEASUREMENT_FORMAT to use strong enum ( #12642 )
...
* Fix #12402 : Refactor MEASUREMENT_FORMAT to use strong enum
* Remove redundant default branches
Co-authored-by: Matt Thomson <matt-thomson@users.noreply.github.com>
2020-08-13 21:51:28 +01:00
5e09ecc904
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
33d9fc2b75
Fix #10549 : 'Build the best ride you can' objective missing ride name
...
This is implemented in a way that is compatible with RCT2 (as long as the ride type was not split).
2020-08-13 00:23:08 +02:00
68ce06e833
Refactor objective handling in Scenario Editor
...
This moves some knowledge out of the window and into the main code and also cleans up the window a bit.
This also allows setting the "x guests by the end of year y" goal for no money scenarios, which was not the case previously.
2020-08-12 22:10:47 +02:00
2d56c8d2de
Merge pull request #12636 from Gymnasiast/refactor/to-member-function
...
Use a 16-bit integer for track type in more places
2020-08-11 17:53:20 +02:00
2e4edf6f5d
Merge pull request #12638 from quale/fix-debug-window
...
Fix Z coordinate and spillover in guest debug tab
2020-08-11 07:53:19 -03:00
4117965a4a
Fix Z coordinate in guest debug tab
2020-08-11 03:37:34 +02:00
dcdc782361
Increase minimum window size so pathfind history doesn’t spill out
2020-08-11 03:35:24 +02:00
89f04c4fb3
Fix names of two track type functions
2020-08-10 23:48:18 +02:00
be0123decb
Fix #12611 : Bad check for pay-per-ride ability
2020-08-10 18:56:06 +02:00
6f8ae294ae
Fix launchpad builds ( #12575 )
...
```
/<<PKGBUILDDIR>>/src/openrct2-ui/interface/ViewportInteraction.cpp: In function ‘InteractionInfo viewport_interaction_get_item_left(const ScreenCoordsXY&)’:
/<<PKGBUILDDIR>>/src/openrct2-ui/interface/ViewportInteraction.cpp:85:29: error: potential null pointer dereference [-Werror=null-dereference]
85 | switch (sprite->sprite_identifier)
| ~~~~~~~~^~~~~~~~~~~~~~~~~
```
2020-08-09 07:27:26 +01:00
7cd6e72edd
Refactor TEMPERATURE_FORMAT to use strong enum ( #12610 )
...
* Refactor TEMPERATURE_FORMAT to use strong enum
* Rename TEMPERATURE_FORMAT to TemperatureFormat
* Rename TemperatureFormat to TempueratureUnit
2020-08-09 07:26:46 +01:00
4de58e1fd4
Close #12440 : Refactor VEHICLE_STATUS to use strong enum ( #12606 )
...
* Close #12440 : Refactor VEHICLE_STATUS to use strong enum
* Fix code formatting for VEHICLE_STATUS refactoring
* Refactor VehicleStatus enum to be inside Vehicle
This commit moves VehicleStatus inside Vehicle,
renamed as Status.
2020-08-09 06:24:25 +01:00
c4ae579a84
Feature #11817 : Show authors field in object selection ( #12591 )
...
* Feature #11817 : Show authors field in object selection
- authors field in JSON shows as last line in bottom right on object selection
- authors field added to Object class
- ObjectFileIndex version bump as authors is serialised
* fix sign comparison warning
* Start object selection corner text higher to avoid overlap
* Use references to reduce unneccessary copies
* make GetAuthors const
* Clip drawing of authors string so it doesn't cross widgets
At max length the leftmost aligns exactly with description left
* Add a changelog message
* make SetAuthors use an rvalue reference
* remove unnecessary nullptr check
2020-08-09 06:23:28 +01:00
933570fd62
Close #12442 : Refactor SCENARIO_SOURCE to use strong enum ( #12608 )
2020-08-08 09:38:43 -03:00
be9dca6945
Close #12416 : Refactor CURRENCY_AFFIX to use strong enum ( #12589 )
...
* Close #12416 : Refactor CURRENCY_AFFIX to use strong enum
* Add static assert to check config enum type
Co-authored-by: Matt Thomson <matt-thomson@users.noreply.github.com>
2020-08-05 20:26:18 -03:00
0dc43d66e4
Remove the use of INTERFACE macro and macro its self
2020-08-05 16:30:44 +02:00
83355e35cc
Move IStream, MemoryStream, FileStream into OpenRCT2 namespace
2020-08-05 16:29:36 +02:00
30376085cf
Include missing headers
2020-08-05 16:29:29 +02:00
150100d89f
Fix #12416 : Refactor CURRENCY_AFFIX to use strong enum
2020-08-04 21:35:59 +01:00
156be224f9
Close #12399 : Refactor MIXER_GROUP to strong enum ( #12531 )
2020-08-03 20:51:12 -03:00
0809069e74
Fix #12577 : Mistake made in refactor #12538 ( #12579 )
...
Loop called the peep window open only when nullptr. Added extra checks for nullptr on window open
2020-08-03 20:09:24 -03:00
d217dfa9b9
Refactor NewsItem into namespace and Pascal Case ( #12511 )
2020-08-02 23:14:00 -03:00
aa11773da3
Fix #12566 , #12565 , #12562 , #12560 , #12558 : Nullptr deref ( #12567 )
...
Mistake made in refactor meant that a nullptr deref took place when the screen coords were outside of the normal play area
2020-08-02 20:13:09 +01:00
733bc5a981
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 08:32:59 +01:00
0f78d452a4
Part of #12497 : Remove extra SPRITE_INDEX_NULL check ( #12538 )
...
* refactor: deleted double check of SPRITE_INDEX_NULL in Staff* ride_get_mechanic(Ride* ride)
* refactor: deleted double check of SPRITE_INDEX_NULL in Ride.cpp file
* refactor: deleted double check of SPRITE_INDEX_NULL in windows/Ride.cpp in function static rct_string_id window_ride_get_status_vehicle
* refactor: deleted double check of SPRITE_INDEX_NULL in ride/Ride.cpp
* refactor: deleted double check in FormatStatusTo
2020-08-02 08:28:11 +01:00
e039a51826
Fix #12552 : Grey rectangles appear under windows and menus ( #12554 )
...
* Fix #12552 : Grey rectangles appear under windows and menus
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-08-02 00:47:28 -03:00
ddd21fa87a
Part of #12098 : Use ScreenRect on gfx_filter_rect ( #12134 )
2020-08-01 14:40:01 -03:00
88bad7729c
Merge pull request #12491 from janisozaur/openurl
...
Add OpenURL method, with implementation for Linux and Windows
2020-08-01 15:42:31 +02:00
Simon Jarrett