Commit Graph

2199 Commits

Author SHA1 Message Date
Duncan 0f92c3b017
Switch vcxproj files to remove wildcards (#11843)
Unfortunately MS has removed the wild card feature from vcxproj files. This will mean all file deletions and creations will need to modify these files to be included in the VS builds.
2020-06-02 13:37:58 +02:00
Ted John 0ca42f453c
Add plugin API for setting button isPressed (#11851) 2020-06-01 23:05:24 -03:00
Tulio Leao e18abc7e3d Rename NoOf... to AmountOf... on Peep 2020-05-31 09:13:56 -03:00
Tulio Leao a987a9ee5e Rename Peep::paid_to_enter to PaidToEnter 2020-05-30 20:35:06 -03:00
Tulio Leao 07f36a93de Rename Peep::staff_lawns_mown to StaffLawnsMown 2020-05-30 20:35:05 -03:00
Tulio Leao 133ff992b6 Rename Peep::staff_rides_fixed to StaffRidesFixed 2020-05-30 20:35:05 -03:00
Tulio Leao 3f091d33e2 Rename Peep::paid_on_rides to PaidOnRides 2020-05-30 20:35:05 -03:00
Tulio Leao 719607f876 Rename Peep::staff_gardens_watered to StaffGardensWatered 2020-05-30 20:35:05 -03:00
Tulio Leao 6b56a353f9 Rename Peep::staff_rides_inspected to StaffRidesInspected 2020-05-30 20:35:05 -03:00
Tulio Leao 414cff9b91 Rename Peep::paid_on_food to PaidOnFood 2020-05-30 20:35:05 -03:00
Tulio Leao 5bd3e88972 Rename Peep::staff_litter_swept to StaffLitterSwept 2020-05-30 20:35:05 -03:00
Tulio Leao c2f7efa328 Rename Peep::paid_on_souvenirs to PaidOnSouvenirs 2020-05-30 20:35:05 -03:00
Tulio Leao 7d581e6978 Rename Peep::staff_bins_emptied to StaffBinsEmptied 2020-05-30 20:35:04 -03:00
Tulio Leao a729ac1589 Rename Peep::no_of_food to NoOfFood 2020-05-30 20:35:04 -03:00
Tulio Leao bc7ea40c4b Rename Peep::no_of_drinks to NoOfDrinks 2020-05-30 20:35:04 -03:00
Tulio Leao 625f7859a4 Rename Peep::no_of_souvenirs to NoOfSouvenirs 2020-05-30 20:35:04 -03:00
Tulio Leao fd71b1b009 Rename Peep::voucher_type to VoucherType 2020-05-30 20:35:04 -03:00
Tulio Leao bf228abf55 Rename Peep::voucher_arguments to VoucherArguments 2020-05-30 20:35:03 -03:00
Tulio Leao 99bbfc9034
Merge pull request #11715 from hdpoliveira/newsitem_queue_split
Create NewsItemQueue class
2020-05-30 18:53:38 -03:00
Michiel 03b2456bc7
Fixed clearance checks hotkey (#11833) 2020-05-30 23:42:42 +02:00
hdpoliveira efa92a28fa Merge NEWS_ITEM_HISTORY_START variable 2020-05-30 13:56:12 -03:00
hdpoliveira ecdd35e334 Use MAX_RECENT_NEWS_ITEMS where feasible 2020-05-30 13:56:12 -03:00
hdpoliveira 230162534b Create constants for sizes of NewsItem queues 2020-05-30 13:56:10 -03:00
Michael Steenbeek 6d13f7ba68 Apply suggestions from code review
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2020-05-30 17:10:08 +02:00
Michiel ac8dce44fd Apply suggestions from code review
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2020-05-30 17:10:08 +02:00
Michiel Bos 3fdab8e7d9 Added icon to Cheats button to indicate clearance checks are disabled 2020-05-30 17:10:08 +02:00
Michiel Bos 31e4029a22 Moved 'Open cheat menu' and 'Toggle clearance checks' to new category 2020-05-30 17:10:08 +02:00
Michiel Bos 67ffc5642b Fixed the include order in KeyboardShortcut.cpp to match with clang. 2020-05-30 17:10:08 +02:00
Michiel Bos 670b879235 Added a shortcut key for disabling/enabling clearance checks. 2020-05-30 17:10:08 +02:00
Tulio Leao 7b8257c692
Fix #11816: Text overflowing boundary box (#11830) 2020-05-30 17:07:58 +02:00
Michael Steenbeek 2bd92527fd
Merge pull request #11818 from IntelOrca/refactor/palettes
Create new PaletteMap type to replace byte pointers
2020-05-29 23:09:32 +02:00
Michael Steenbeek c3921d9d4c
Merge pull request #11712 from IntelOrca/plugin/ride-fields
[Plugin] Add more ride fields to API
2020-05-29 21:10:51 +02:00
Ted John d3f7ec4844 Create new PaletteMap type to replace byte pointers 2020-05-28 20:00:23 +01:00
Duncan 97e985521e
Merge pull request #11819 from IntelOrca/refactor/game-palette
Refactor rct_palette to GamePalette
2020-05-28 11:41:04 +01:00
Gymnasiast 9a9ab47856
Remove Twitch from the rest of the code 2020-05-28 09:28:32 +02:00
Gymnasiast aaece7a435
Remove Twitch from Options window 2020-05-28 09:28:32 +02:00
Ted John 46bb30f8a1 Refactor rct_palette to GamePalette 2020-05-27 20:52:51 +01:00
Ted John f6fbd272ec Add built_date to ScRide and add GetAge() 2020-05-23 15:28:03 +01:00
Michael Steenbeek 7e7b15812d
Merge pull request #11747 from IntelOrca/plugin/small-additions
[Plugin] Add language and split peep into guest and staff
2020-05-20 10:24:24 +02:00
Sohil Adwani d2565af867
Part of #11562: gfx_draw_string_left_wrapped() overload (#11784) 2020-05-19 21:57:11 -03:00
TomasZilinek 7da9c7b234
Fix #11566 - draw_string_right_underline() overload (#11780)
created the overload, changed all calls from the old function to the new one and deleted the old function
2020-05-19 16:02:39 -03:00
TomasZilinek a687a13185
Fix #11563 - gfx_draw_string_right_clipped() overload (#11782)
created the overload, changed all calls from the old function to the new one and deleted the old function
2020-05-19 13:54:07 -03:00
Sohil Adwani 310ff84b23
Part of #11562: gfx_draw_string_left_wrapped() overload
* gfx_draw_string_left_wrapped overload added


Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-05-18 22:52:49 -03:00
TusharSariya 2cf95adc4b
Fix #11565: gfx_draw_string_left_clipped to use ScreenCoordsXY (#11765)
* Issue #11565, created overload for gfx_draw_string_left_clipped

Co-authored-by: Tushar <tushar.97@hotmail.com>
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-05-17 19:30:58 -03:00
TomasZilinek 7582ed849a
Fix #11568 - create draw_string_left_underline() overload (#11770)
* Fix #11568 - create draw_string_left_underline() overload

created the overload, changed all calls from the old function to the new (just 1 call) and deleted the old function
2020-05-17 16:18:15 -03:00
TomasZilinek 277080de74
Fix #11570 - create gfx_draw_string_centered() overload (#11760)
* Fix #11570 - create gfx_draw_string_centered() overload

I created the overload, updated all calls from the old function to the new and deleted the old one
2020-05-17 15:29:56 -03:00
Ted John da0ef7d3a4
Fix #11753: Listview with header does not display last item in the list (#11754) 2020-05-15 22:05:00 -03:00
Tulio Leao b7b5a26a57
Rename ServerList member variables to prevent shadowing 2020-05-15 12:06:41 +02:00
Ted John 7c0da8a32d Add peep flags and destination 2020-05-14 18:34:25 +01:00
Tulio Leao 128c1993c1 Rename Peep::balloon_colour to BalloonColour 2020-05-13 23:16:43 -03:00
Tulio Leao 6c57f33dc9 Rename Peep::umbrella_colour to UmbrellaColour 2020-05-13 23:14:45 -03:00
Tulio Leao 222f8df6cb Rename Peep::hat_colour to HatColour 2020-05-13 23:11:28 -03:00
Tulio Leao 3b632fcf95 Rename Peep::favourite_ride to FavouriteRide 2020-05-13 23:06:40 -03:00
Michael Steenbeek 620fb5e5c4
Migrate many set_format_arg calls to Formatter (#11744) 2020-05-13 21:29:39 -03:00
Michael Steenbeek f0bd05cf6d
Part of #11158: Remove more C-style casts (#11743) 2020-05-13 21:22:50 -03:00
Ted John 0d0349fc09
Allow plugins to update dropdown items (#11735) 2020-05-12 21:10:07 -03:00
Michael Steenbeek 1b242d825c
Fix Text Input window colours (#11736)
Text Input uses one colour, specifically the body colour of the calling window. This was previously handles by a modified window shim, but https://github.com/OpenRCT2/OpenRCT2/pull/11653 changed this and this window now uses the standard window shim. This is why it now needs to change the colour assignment.
2020-05-13 00:31:24 +02:00
Ted John b3c4dd4844 Fix invalidation of list view widget 2020-05-12 21:03:21 +01:00
Ted John 86fa2f3714 Fix #11730: invalid write in CustomListView::SortItems 2020-05-12 20:57:26 +01:00
Ted John c4502df947 Fix #11731: invalid read in ScWindow::x_get 2020-05-12 18:53:37 +01:00
stalefishies 9c26c9776b
Fix plugin dropdown widget items not appearing (#11729)
Commit e182791 (mistakenly?) removed the code to populate the custom
dropdown widget's items from the list of strings passed in from the
plugin. This replaces that code.
2020-05-12 08:21:43 -03:00
Michael Steenbeek 451af76fb6
Remove nonfunctional "guest is lost" notification (#11722) 2020-05-11 21:31:02 +02:00
Gymnasiast 15b5d97795
Refactor shop items 2020-05-11 19:16:23 +02:00
Michael Steenbeek d7637cd70f
Replace many C-style casts (#11720) 2020-05-11 14:32:56 +02:00
Michael Steenbeek a261b4ce33
Remove commented out code (#11721) 2020-05-11 13:54:15 +02:00
stalefishies 8aaf8d0156
Fix error on windows due to upkeep narrowing (#11711)
Running msbuild openrct2.proj /t:build /p:platform=x64 gave warning
C4309, which is to do with narrowing on a type conversion. This replaces
static_cast<money16>(0xFFFF) with MONEY16_UNDEFINED (which is
static_cast<money16>(static_cast<uint16_t>(0xFFFF)) ).
2020-05-10 19:58:01 -03:00
Ted John e182791a6b
Merge pull request #11685 from IntelOrca/plugin/listview-widget
[Plugin] Implement the list view widget
2020-05-10 22:36:44 +01:00
Tulio Leao ed84c2dab0
Fix #11705: Drawing tooltips out of box (#11707) 2020-05-10 15:22:47 -03:00
Ted John ec06a9ca4b
Add plugin API for showing an error message (#11706) 2020-05-10 14:06:31 -03:00
Tom Lankhorst 2d0e7bdfd8
openrct2-ui Audio clean-up and style/usage fixes (#10115)
* openrct2-ui Audio clean-up and style/usage fixes



Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-05-10 10:05:26 -03:00
TomasZilinek 9fde6a74c3
Close #11561: Use ScreenCoordsXY in gfx_draw_string()
* Fix #11572 create gfx_draw_string() overload

created the overload and changed all calls of the old function to the new (using const ScreenCoordsXY&)

...
2020-05-10 09:49:15 -03:00
Michael Steenbeek d5f2168b22
Merge pull request #11653 from Gymnasiast/refactor/window-skeleton
Introduce WINDOW_SHIM define
2020-05-10 11:34:21 +02:00
frutiemax c447cde63c
Close #11561: Use ScreenCoordsXY in gfx_draw_string_centred_wrapped()
* Add gfx_draw_string_centred_wrapped overload using ScreenCoordsXY

* Update calls to gfx_draw_string_centred_wrapped

* Remove old signature of gfx_draw_string_centred_wrapped

* Meaningful coordinate variable names and constructor calls
2020-05-10 01:00:26 -03:00
Gymnasiast b942d24bcf
Fix WW and WH for some windows 2020-05-09 19:08:00 +02:00
Ted John cc759e0bce Improve selected highlight on list view 2020-05-09 17:24:16 +01:00
Ted John f492827c8a Implement horizontal scrollbars and fix resizing 2020-05-09 17:24:16 +01:00
Ted John 41950d75f0 Implement scrollbars field on list view 2020-05-09 17:24:16 +01:00
Ted John c4f6dbe1ca Allow items and columns get / set 2020-05-09 17:24:15 +01:00
Ted John 12fb6411b1 Fix 32-bit errors 2020-05-09 17:24:15 +01:00
Ted John 0941620991 Add a few more properties 2020-05-09 17:24:15 +01:00
Ted John e63fcd010f Add name get / set to widget 2020-05-09 17:24:15 +01:00
Ted John 4701dd3b9b Add get / set highlighted cell / selected cell 2020-05-09 17:24:15 +01:00
Ted John 5e427413a6 Refactor list view so we can access it from ScWidget 2020-05-09 17:24:15 +01:00
Ted John faf59598e5 Start working on exposing ListViewWidget 2020-05-09 17:24:15 +01:00
Ted John 45a1184b0e Implement selection 2020-05-09 17:24:15 +01:00
Ted John 928bba9795 Implement sorting 2020-05-09 17:24:15 +01:00
Ted John 096de3ccc8 Implement list view 2020-05-09 17:24:15 +01:00
Gymnasiast 6fd83fd006
Make WW and WH static 2020-05-09 18:07:16 +02:00
Gymnasiast f8aeb70398
Apply review requests 2020-05-09 18:07:16 +02:00
Gymnasiast 00461aedf3
Fix formatting and errors 2020-05-09 18:07:16 +02:00
Gymnasiast 43556d2dec
Remove ifdefs for LEFT_CLOSEBOX - for now 2020-05-09 18:07:16 +02:00
Gymnasiast 9e4c664944
Replace defines with constexpr 2020-05-09 18:07:16 +02:00
Gymnasiast 96fe3d3b3c
Make WINDOW_SKELETON take a title, height and width 2020-05-09 18:07:16 +02:00
tassaron2 559ede5d14
Add compile option to move close box to the left 2020-05-09 18:07:16 +02:00
Ted John 1e2cf9f77b Fix first widget being pressed on tabless plugin windows 2020-05-09 16:07:04 +01:00
Ted John 6db16ffcad
Implement showTextInput plugin API (#11678) 2020-05-09 14:18:50 +01:00
Michael Steenbeek 3d3dbde642
Merge pull request #11668 from IntelOrca/plugin/peep-stats
[Plugin] Add more stats to Peep interface
2020-05-09 13:53:36 +02:00
Ted John 7b8ffdb865 Refactor peep.intensity into new strict struct 2020-05-09 12:37:51 +01:00
Tulio Leao 373776f3db
Address review comments on #11598 2020-05-09 12:35:36 +02:00
Michael Steenbeek 8660bbe9d7
Fix #1013: negative length in Ride window (#11651) 2020-05-06 11:32:10 +02:00
Michael Steenbeek d10f9ebf2a
Use named flags in calls to sub_6C683D() (#11650) 2020-05-05 23:11:38 -03:00
Michael Steenbeek 362ea7bbc0
Fix #11455: Object Selection window cuts off scenery names (#11639) 2020-05-05 18:19:30 +02:00
Michael Steenbeek 5832b43228
Fix illegal access in window_scenery_tab_entries (#11643) 2020-05-05 18:19:01 +02:00
Michael Steenbeek 80933dc0cc
Fix #11002: Rides list shows both red and green light activated (#11622) 2020-05-04 19:38:48 -03:00
Tulio Leao 1872152df9 Make window_ride_construction_update_state() use CoordsXYZ* 2020-05-02 11:07:18 -03:00
Tulio Leao 02a5c10a58 Make place_provisional_track_piece() use CoordsXYZ 2020-05-02 11:07:18 -03:00
Tulio Leao 7c82daec25 Use CoordsXYZD in window_ride_construction_mouseup_demolish_next_piece() 2020-05-02 11:07:18 -03:00
Tulio Leao 28b3ac1693 Make track_block_get_previous() use CoordsXYE 2020-05-02 11:07:18 -03:00
Tulio Leao d58f3ec0b6 Make track_block_get_previous_from_zero() use CoordsXYZ 2020-05-02 11:07:17 -03:00
Tulio Leao 6203a5a20d Make track_block_get_next_from_zero() use CoordsXYZ 2020-05-02 11:07:15 -03:00
Ted John e5b05747d3 Apply code review refactors 2020-05-02 11:38:33 +01:00
Ted John be0e4a2869 Implement custom tools 2020-05-02 11:08:43 +01:00
Ted John 0ca52e58fd Implement tile selection API 2020-05-02 11:08:43 +01:00
Duncan 32eb7071a1
Fix #11550: Use std::nullopt instead of empty brace (#11595)
This is technically a gcc bug from the looks of it but since std::nullopt is slightly easier to read I've gone through the codebase and used that over empty braces. In addition noticed a mistake on the scripting viewport get widgetIndex function where it would return an incorrect widgetIndex.
2020-05-02 10:09:12 +02:00
hdpoliveira acc6b9f878 Part of #9473: Create Vehicle::SetMapToolbar
Converted from vehicle_set_map_toolbar
2020-05-01 19:49:02 -03:00
Tulio Leao b5749ac8f6
Merge pull request #11578 from tupaschoal/more-coordz-1
Keep scouring openrct2-ui to reduce individual {x, y} usage
2020-05-01 18:57:38 -03:00
Tulio Leao 76ff67d4c8 Use CoordsXY in windows/RideConstruction.cpp 2020-05-01 18:06:30 -03:00
Tulio Leao 4589560a15 Make sub_6C683D() use CoordsXYZ on parameter and return 2020-05-01 18:06:26 -03:00
Gymnasiast cc65564521
Use (RCT12)ObjectEntryIndex in more places 2020-05-01 22:06:13 +02:00
Tulio Leao c5180a00b8 Merge individual x,y variables into ScreenCoordsXY object 2020-05-01 16:03:21 -03:00
Tulio Leao d0704baab2 Make window_dropdown_show_text() use ScreenCoordsXY 2020-05-01 15:58:36 -03:00
Tulio Leao 4933785b1c Make window_dropdown_show_text_custom_width() use ScreenCoordsXY 2020-05-01 15:48:20 -03:00
Michael Steenbeek 158adfba82
Merge pull request #11560 from tupaschoal/more-coordz
Scours through openrct2-ui to use more coords structs
2020-05-01 19:01:37 +02:00
Tulio Leao 9960e4b563
Merge pull request #11552 from IntelOrca/plugin/window-tabs
[Plugin] Implement custom window tabs
2020-05-01 13:49:31 -03:00
Ted John b36e4794e8
Update src/openrct2-ui/scripting/CustomWindow.cpp
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-05-01 17:19:19 +01:00
Tulio Leao 9299228f07 Use ScreenCoordsXY on windows/Ride.cpp 2020-05-01 12:58:10 -03:00
Tulio Leao 0c51528425 Use ScreenCoordsXY on windows/TopToolbar.cpp 2020-05-01 12:52:07 -03:00
Tulio Leao 1f2cf2674a Use ScreenCoordsXY on windows/TrackList.cpp 2020-05-01 12:28:26 -03:00
Tulio Leao 28b2010838 Use ScreenCoordsXY on interface/Window.cpp 2020-05-01 12:26:01 -03:00
Tulio Leao 1da24fed40 Use CoordsXY on windows/Sign.cpp 2020-05-01 12:19:20 -03:00
Ted John 00f78cc8fa Use ScreenCoordsXY for tab image offset 2020-05-01 13:53:28 +01:00
Michael Steenbeek fc860e8b6e
Merge pull request #11521 from Gymnasiast/refactor/oein3
Make ResearchItem use ObjectEntryIndex
2020-05-01 13:28:21 +02:00
hdpoliveira d69cc1c877 Part of #9473: Create Vehicle::TrainHead and Vehicle::TrainTail
Converted from vehicle_get_head and vehicle_get_tail
2020-04-30 20:53:17 -03:00
Ted John 65303a9f00 Fix spinner decrement buttons 2020-05-01 00:41:20 +01:00
Ted John 4ddc119886 Fix compile errors 2020-05-01 00:10:25 +01:00
Ted John 98249c777d Implement string tooltips for plugins 2020-05-01 00:06:58 +01:00
Ted John 4501173c0d Implement custom window tabs 2020-04-30 23:42:28 +01:00
Ted John 8798811561
Fix #11526: Plugin: Crash when using sprite type in park.postMessage (#11533) 2020-04-30 19:51:47 +02:00
Gymnasiast 6cdee9db93
Fix #7006: Use RTDs for determining ride category 2020-04-30 12:59:18 +02:00
Gymnasiast 73671bbeeb
Make ResearchItem use ObjectEntryIndex 2020-04-30 12:59:18 +02:00
Duncan 96222ebace
Merge pull request #11509 from duncanspumpkin/entity_cleanup
Entity cleanup
2020-04-28 10:44:28 +01:00
duncanspumpkin fed148648c Use IsPeep in more places 2020-04-28 07:57:47 +01:00
Gymnasiast a1cbaf9a46
Use OBJECT_ENTRY_INDEX_NULL in more places 2020-04-28 08:38:37 +02:00
Michael Steenbeek 2e50cd44ba
Refactor ride_list_item to RideSelection (#11505) 2020-04-27 16:26:35 +02:00
Michael Steenbeek bcabc1d807
Merge pull request #11457 from Gymnasiast/refactor/rtd-forever
More RTD + cleanup
2020-04-27 15:11:54 +02:00
Ted John ca98ffc697 Implement onClose event for custom windows 2020-04-26 16:01:03 +01:00
Ted John 2c4cf49fb1 Add more const 2020-04-26 14:35:08 +01:00
Ted John c67962577a Rename __ENABLE_SCRIPTING__ to ENABLE_SCRIPTING 2020-04-26 14:35:08 +01:00
Ted John 4162ad0eb6 Remove unused getWindow parameter 2020-04-26 14:35:08 +01:00
Ted John 3fe49ca2a3 Apply suggestions from code review
Co-Authored-By: Michał Janiszewski <janisozaur@users.noreply.github.com>
Co-Authored-By: Aaron van Geffen <aaron@aaronweb.net>
Co-Authored-By: Tulio Leao <tupaschoal@gmail.com>
2020-04-26 14:35:08 +01:00
Ted John c1ab8b0b31 Apply suggestions from code review
Co-Authored-By: Breno Rodrigues Guimarães <brenorg@gmail.com>
2020-04-26 14:35:07 +01:00
Ted John 4c45e0ceb0 Remove use of .value() 2020-04-26 14:35:07 +01:00
Ted John 2f525e0539 Apply more code review comments 2020-04-26 14:35:07 +01:00
Ted John d480fb8daa Apply suggestions from code review
Co-Authored-By: Tulio Leao <tupaschoal@gmail.com>
Co-Authored-By: Michael Steenbeek <m.o.steenbeek@gmail.com>
2020-04-26 14:35:07 +01:00
Ted John 7f9ff121b1 Fix rebase 2020-04-26 14:35:07 +01:00
Ted John e1c08defc8 Remove use of std::variant 2020-04-26 14:35:07 +01:00
Ted John f12f439309 Fix errors after rebase 2020-04-26 14:35:06 +01:00
Ted John b7b1920a79 Fix build 2020-04-26 14:35:06 +01:00
Ted John 119b24a6ff Show selected index on custom dropdowns 2020-04-26 14:35:06 +01:00
Ted John 098e6839e2 Fix build after rebase 2020-04-26 14:35:06 +01:00
Ted John 83fe0cf5c5 Implement strings for GameAction errors 2020-04-26 14:35:05 +01:00
Ted John 2ad37db817 Implement registering game actions 2020-04-26 14:35:05 +01:00
Ted John 4d5e7f19ca Implement surface style API and improve plugin calling 2020-04-26 14:35:04 +01:00
Ted John cf9478eb76 Fix build 2020-04-26 14:35:04 +01:00
Ted John 7628289eb3 Implement reverse of string processing 2020-04-26 14:35:04 +01:00
Ted John 4d221341da Improve string handling and allow window update 2020-04-26 14:35:04 +01:00
Ted John 09c8c6d508 Implement window colours API 2020-04-26 14:35:04 +01:00
Ted John 5c1fabec56 Implement API for spinners 2020-04-26 14:35:04 +01:00
Ted John 9dd9e600b5 Implement API for image buttons 2020-04-26 14:35:04 +01:00
Ted John c73bb63f0e Implement window classification and number 2020-04-26 14:35:04 +01:00
Ted John e6341f0a42 Get scripting compiling on clang 2020-04-26 14:35:03 +01:00
Ted John bac91cd563 Allow scripting to be compile-disabled 2020-04-26 14:35:03 +01:00
Ted John a5c8ff920f Add game mutable protection 2020-04-26 14:35:03 +01:00
Ted John dc64d3541d Transfer server-client scripts over network 2020-04-26 14:35:03 +01:00
Ted John 639faa2085 Fix GCC issues 2020-04-26 14:35:03 +01:00
Ted John 0c1ed7b509 Implement APIs for bringToFront, findWidget etc. 2020-04-26 14:35:02 +01:00
Ted John e0f66fe3cd Implement viewport widgets 2020-04-26 14:35:02 +01:00
Ted John da98ef63d3 Implement checkboxes and disabling widgets 2020-04-26 14:35:02 +01:00
Ted John a9a67a7a7e Implement group boxes 2020-04-26 14:35:02 +01:00
Ted John b1cf6fcf63 Implement Widget API 2020-04-26 14:35:02 +01:00
Ted John 7274e45c93 Implement main viewport API 2020-04-26 14:35:02 +01:00
Ted John d3af46ad9f Implement label widget 2020-04-26 14:35:02 +01:00
Ted John 4b95a3a9d0 Implement custom menu items 2020-04-26 14:35:01 +01:00
Ted John 4109b2c55a Fix build errors 2020-04-26 14:35:01 +01:00
Ted John 5bd58118b5 Get the plugin branch building again 2020-04-26 14:35:00 +01:00
Hielke Morsink e8bdb95f13 format new files
Since many of the changes were made before the clang-format changes went live, the new source files used a different format still. This PR applies the new style to all the new source files.
2020-04-26 14:35:00 +01:00
Hielke Morsink c37d7d859e Use C++ types 2020-04-26 14:35:00 +01:00
Hielke Morsink c064614280 Use new copyright/license notice 2020-04-26 14:35:00 +01:00
Hielke Morsink 5befd39063 Construct ScWindow properly 2020-04-26 14:35:00 +01:00
Ted John 7047dec1d9 Get custom drop downs working
Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2020-04-26 14:34:59 +01:00
Ted John 918022da3e Get custom buttons working 2020-04-26 14:34:59 +01:00
Ted John 291143c3cd Add opening of a custom window 2020-04-26 14:34:59 +01:00
Ted John b47bcabaf1 Move ui scripting API to libopenrct2ui 2020-04-26 14:34:59 +01:00
Gymnasiast e67ebed697
Remove some Americanisms 2020-04-26 11:07:19 +02:00
Gymnasiast 100236c2d2
Move available ride modes to RTD; ride mode cleanup 2020-04-26 11:07:19 +02:00
Gymnasiast 2e3a4d41ce
Clean up some ride construction variables 2020-04-26 11:07:19 +02:00
Gymnasiast 8d0854804e
Replace missed check for coasters with vertical towers 2020-04-26 11:05:11 +02:00
Breno Guimaraes 2019fa4655 Replay set_format_arg calls in favor of using Formatter 2020-04-25 19:35:49 -03:00
Breno Rodrigues Guimarães a0619d04cf
Replace usage of set_format_arg by Formatter::Common() (#11412) 2020-04-25 18:44:14 -03:00
Michael Steenbeek 0ecc64f781
Fix #11407: Setting an RCT1 path needs better error messages (#11418) 2020-04-25 15:36:44 +02:00
Kevin Strehl 5456899afc
Close #10572: Add cheat to allow building at invalid heights 2020-04-25 01:07:36 +02:00
Tom Lankhorst da0c586fad
Mark getters in audio layer as [[nodiscard]] 2020-04-24 18:38:11 +02:00
WantDiscussion 37e9270c00
Close #6024: Closing object selection now advances to next step
In the scenario editor and track designer X button in object selector
will now close the object selector window and advance to the next stage
instead of closing the scenario editor and track editor entirely and
returning to the main menu.

Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
2020-04-24 17:19:06 +02:00
Michael Steenbeek 44f62a97c2
Move PhotoItem to RTD (#11415) 2020-04-24 04:47:40 +02:00
Michał Janiszewski c4b6897635 Address possible nullptr dereferences 2020-04-21 13:31:01 +02:00
Michał Janiszewski 5f97637d5e Only suggest final when using non-LTO builds
In LTO builds GCC issues the suggestion-warning from linking stage,
when pragmas are already gone and do nothing.
2020-04-21 13:31:01 +02:00
Michał Janiszewski 64e9e8aeb9 Add missing override specifier 2020-04-21 13:31:01 +02:00
Breno Rodrigues Guimarães 374b744477
Use Formatter to handle argument formatting for tooltips (#11379) 2020-04-21 12:38:59 +02:00
Breno Rodrigues Guimarães 2479256bc1
Adjust Formatter function names according to coding style (#11378) 2020-04-20 18:55:15 -03:00
Michael Steenbeek e1e58423fc
Replace RideTypeHasRideGroups with flag (#11375) 2020-04-20 21:50:35 +02:00
Breno Rodrigues Guimarães d4a2a98e20
Replacing set_format_arg_on macro in favor of a more C++zy solution (#11350) 2020-04-20 07:10:33 +02:00
Olivier Wervers 3830347294
Switch tile inspector copy paste button placement (#11358) 2020-04-19 22:41:45 +02:00
Tulio Leao 4d679b7e3e
Fix #11361: rct_object_filters leak in EditorObjectSelection.cpp (#11364) 2020-04-19 16:28:01 -03:00
Gymnasiast 19646a29a5
Remove duplicated code with function call 2020-04-19 21:13:20 +02:00
Gymnasiast 7d50a2d186
Move alternate ride type to RTD 2020-04-19 18:44:38 +02:00
Gymnasiast 25f363625c
Rename field in RideData5 to something more descriptive 2020-04-19 18:20:20 +02:00
Gymnasiast 99d270388b
Move ride start piece to RTD 2020-04-19 18:05:57 +02:00
Duncan a2efc49bcd
Merge pull request #11357 from Gymnasiast/fix/1148
Fix #1148: Research funding dropdown not shown in finances window
2020-04-19 16:06:49 +01:00
Michael Steenbeek deb56c2a72
Move LiftData to RTDs (#11347) 2020-04-19 14:41:26 +02:00
Gymnasiast 860924dfb0
Fix #1148: Research funding dropdown not shown in finances window 2020-04-19 14:29:56 +02:00
Michał Janiszewski 5bfc41f49e
openrct2-ui cast fixes (#11348) 2020-04-19 14:08:22 +02:00
Michael Steenbeek d3a5446114
Create ride type flag for suspended rides (#11355) 2020-04-19 13:53:51 +02:00
Michael Steenbeek 8127437de1
Reduce direct ride type checking; move available piece lookup to RTD (#11353) 2020-04-19 13:32:43 +02:00
Tulio Leao 523e6ca4a0
Fix #11340: Sound bar only working when maxed out (#11341)
The changesets replacing c-style casts with named casts mistakenly added some parentheses in the wrong place, changing the evauluation order.
2020-04-18 20:21:30 +02:00
Michael Steenbeek 3bf316ee8c
Merge pull request #11336 from Gymnasiast/refactor/available-breakdowns-to-rtd
Move available breakdowns, category and independent listing flag to RTD
2020-04-18 18:31:39 +02:00
Tulio Leao e2be89648e
Fix #6119: Advertising campaign for ride window not updated properly (#11335) 2020-04-18 16:15:04 +02:00
Gymnasiast 5d3bf2be20
Move category to RTD; move RideTypeIsIndependent to a flag 2020-04-18 15:22:41 +02:00
Gymnasiast c41fb64535
Move available breakdowns to RTD 2020-04-18 15:22:41 +02:00
Michael Steenbeek 35bbf6a166
Fix refactor mistake that prevents compilation (#11334) 2020-04-18 14:56:38 +02:00
Tulio Leao 2b68610473
Fix #11331: Create constant for failure on ScenarioCompletedCompanyValue (#11332) 2020-04-18 13:46:18 +02:00
Tulio Leao 935cfe90fc
Use named casts on openrct2-ui/windows (#11136) 2020-04-18 13:32:48 +02:00
Olivier Wervers bb72fd6021
Fix #9029: Set animation frame on doors using the tile inspector (#11206) 2020-04-18 07:43:46 -03:00
Tulio Leao b948d65c33
Use named casts on openrct2-ui root folder (#11137) 2020-04-18 12:15:07 +02:00
Michael Steenbeek b4a763c751
Move naming convention to RTD (#11319) 2020-04-18 12:12:07 +02:00
Olivier Wervers 506b06bd73
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-17 19:34:32 -03:00
Aaron van Geffen fe24a84dc4 Make use of extra horizontal space when shortcut window is resized. 2020-04-17 18:35:06 +02:00
Aaron van Geffen 2e55b621f0 Reorder keyboard shortcuts per Umdlye's suggestions. 2020-04-17 18:35:06 +02:00
Aaron van Geffen 77776cd6c8 Allow adding separators between listed shortcuts. 2020-04-17 18:35:06 +02:00
Aaron van Geffen d1a314b0f7 Decouple shortcut window order from internal order. 2020-04-17 18:35:06 +02:00
Gymnasiast edd31d9f16
Move flags to RideTypeDescriptors 2020-04-17 17:03:33 +02:00
Duncan 4a81219521
Merge pull request #11291 from brenoguim/fix_banner_string_coloring
Fix coloring of Banners on tooltip
2020-04-16 22:27:27 +01:00
Aaron van Geffen a81488d704
Fix #11272: Make casualty and stalled vehicle notifications optional 2020-04-16 14:41:39 +02:00
Aaron van Geffen 2d0f62e903
Open about window when clicking the title screen logo 2020-04-16 13:18:09 +02:00
Breno Guimaraes 347c402984 Fix #11286: Fix coloring of banners on tooltip
This patch moves the function that adds coloring to the buffer text into the Buffer struct with a flag.
It also changes both Banner printing and Banner tooltip to use the colored version
2020-04-16 08:06:07 -03:00
Michael Steenbeek d91173060a Guard against null banners (#11078) 2020-04-06 22:32:27 +02:00
Michał Janiszewski 85d6fa8c8b Revert "Guard against null banners (#11078)"
This is being reverted now that we have replay records uploaded as part
of the backtrace.io information to try figuring out the root cause.

This reverts commit 47b6139546.
2020-04-03 09:56:51 +02:00
jeysbach e9611ffaff
Fix #11063: Exchange hack for call to update_scroll (#11178) 2020-03-31 16:03:14 +02:00
Aaron van Geffen 503fbefbeb Harmonise date and time gaps / anchors.
Introduces the DATE_TIME_GAP constant.
2020-03-30 22:44:08 +02:00
Aaron van Geffen 56216fd026 Add an additional check for locales that do not use leading zeros for dates. 2020-03-30 22:42:58 +02:00
Aaron van Geffen 484956e006 Fix #10928: File browser's date column is too narrow. 2020-03-30 22:42:58 +02:00
Aaron van Geffen 28d14517e1
Introduce a constant for scrollbar width and height (#11152) 2020-03-30 22:41:49 +02:00
Duncan 87b90f2304
Fix #11109. Incorrect drawing of staff list after refactor. (#11134)
Looks like I just completely forgot to implement the required changes to the drawing code. Drawing code now uses the new StaffList.
2020-03-29 22:00:28 +01:00
Duncan f64ea65d03
Rename SPRITE_LIST_TRAIN_HEAD to reduce car head confusion (#11105)
A single car on a coaster can comprise of multiple vehicles. One of those vehicles will be the car head vehicle. The train can comprise of multiple cars. Therefore not all vehicle->IsHead 's will be in SPRITE_LIST_TRAIN_HEAD. This rename makes that slightly more clear
2020-03-29 09:23:24 +01:00
Michael Steenbeek b5bcd0c2aa
Merge pull request #11122 from tupaschoal/reduce-c-casts
Reduce c-style cast
2020-03-28 22:47:14 +01:00
Michael Steenbeek 09cd6a82ee
Merge pull request #11123 from tupaschoal/reduce-c-casts-2
Reduce c-style cast on openrct2-ui/(input/interface/title)
2020-03-28 22:40:33 +01:00
Tulio Leao abfd41c35f Use named casts in openrct2-ui/drawing 2020-03-28 17:18:21 -03:00
Tulio Leao 57886ad0c7 Use named casts in openrct2-ui/audio/ 2020-03-28 17:18:15 -03:00
Tulio Leao fe6ff2ac94 Use named casts in openrct2-ui/audio/AudioChannel.cpp 2020-03-28 17:18:07 -03:00
Tulio Leao bb052a784a Use named casts in openrct2-ui/audio/AudioMixer 2020-03-28 17:17:57 -03:00
Tulio Leao b0e12ebc8f Use named casts on openrct2-ui/title 2020-03-28 17:04:33 -03:00
Tulio Leao b579771364 Use named casts on openrct2-ui/interface 2020-03-28 17:04:33 -03:00
Tulio Leao 8823658972 Use named casts on openrct2-ui/input 2020-03-28 17:04:29 -03:00
Aaron van Geffen a028bcbb64
Fix #11111: Finance graph hover values are glitchy with software renderer 2020-03-28 20:42:45 +01:00
Tulio Leao 2bb3a34274 Convert C-style pointer casts to named casts 2020-03-28 16:41:23 -03:00
Duncan 8920c36170
Fix #11107. Guestlist refresh issues after refactor (#11108)
Another little oversite on the guestlist preventing full functionality of the guestlist. Also fixed the map flashing
2020-03-28 16:21:01 +00:00
Duncan e7d0043756
Rework StaffList to use a vector (#11059)
* Rework StaffList to use a vector

This is a part of a reworking that removes the need for the peep list to be sorted by name/number order. Ultimately simplifying the sprite create code

* Remove unused variable setting
2020-03-28 12:12:53 +00:00
Peter Ryszkiewicz fa1ddbd9e3
Show hovered values on finance charts (#10925) 2020-03-28 11:03:10 +01:00
Duncan a33fbfa234
Fix guest list when in filtered mode. (#11102)
Mistake during refactor didn't consider that find_groups resets global vars.
2020-03-28 11:02:26 +01:00
Michael Steenbeek 47b6139546
Guard against null banners (#11078) 2020-03-27 13:04:45 +01:00
Michał Janiszewski 56e6ec2c23
Fix #11068: segfault when trying to clear empty list (#11069)
The report in #11068 was using track designs manager with "Boat hire"
ride, for which there were no designs and selecting "Clear" button on
the list accessed empty vector in `_filteredTrackIds`.
2020-03-26 23:49:10 +01:00
Michael Steenbeek cfb405f0ed
Use StationIndex in many more places (#10992) 2020-03-26 21:38:26 +01:00
Michael Steenbeek 81c6bb26e9
Prepare guest counters for more than 32767 guests (#10989) 2020-03-26 20:02:15 +01:00
Daan de Heij 9035ba2827
Simple implementation of copy input to clipboard (Ctrl+C) (#11013)
This is a simple implementation of copying all current input text to the clipboard using ctrl+c. A simple dialog acknowledges that text is copied. This commit includes a new string ID for the text in this dialog.
2020-03-26 17:53:34 +01:00
Duncan 40160892a9
Rework GuestList to use a vector. (#11014)
* Rework GuestList to use a vector.

This is part of a chain of refactors that will be used to rework peep order in the sprite list

* Apply comments. Remove setting var_492 as no longer required
2020-03-26 07:23:30 +00:00
Michael Steenbeek 3f473ec3f0
Fix #6123: Cannot build some track designs with 4 stations (#11031) 2020-03-25 14:20:29 +01:00
Aaron van Geffen 302fe1cb2b
Merge pull request #10926 from IntelOrca/zoom-refactor
Zoom refactor
2020-03-24 23:28:32 +01:00
Daan de Heij 3dc0110fe1
Fix #10993: Guest Count Intent Not Listened To (#11008)
* Fix #10993: Guest Count Intent Not Listened To

Because of a missing intent case, the guest count did not redraw whenever a guest leaves.

* Update changelog.

Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2020-03-24 18:35:00 +00:00
Tulio Leao 3e2533ac50
Fix #11001: Rides list does not use natural sorting (#11007) 2020-03-23 22:33:57 +01:00
Ted John 1af2720518 Create stub magnify versions of software blitters 2020-03-23 15:54:04 +00:00
Ted John d34dec9c27 Create ZoomLevel struct to add two new zoom levels 2020-03-23 15:54:03 +00:00
Michael Steenbeek 32e589efbe
Make _appropriateImageDropdownItemsPerRow a constexpr (#10990) 2020-03-21 15:22:18 +01:00
Gymnasiast ceec430ae1
Raise max size of dropdowns to 512 items 2020-03-20 21:48:27 +01:00
Gymnasiast 416dc22f35
Guard access to appriopriate image items per row 2020-03-20 21:48:27 +01:00
Michael Steenbeek c519512cfe
Create ObjectEntryIndex (#10980) 2020-03-20 19:28:39 +01:00
Ted John c89cecb2b5
Refactor the ride type to entry map (#10967)
Use C++ vectors and allow larger ride entry indices (> 256)
2020-03-20 18:07:31 +01:00
WantDiscussion 828eef7411
Introduced optional light effects for vehicles at night. (#10970) 2020-03-20 11:47:31 +01:00
Michael Steenbeek d86dce17e8
Prepare object indices for uint16_t (part 2) (#10966) 2020-03-18 21:27:53 +01:00
Michael Steenbeek ae6e53153b
Merge pull request #10922 from Gymnasiast/cleanup-scenery
Cleanup scenery
2020-03-18 18:44:27 +01:00
Gymnasiast 459a0318cf
Implement review requests 2020-03-18 16:22:08 +01:00
Aaron van Geffen 2f05033f14 Position dropdown and spinner label texts vertically, too. 2020-03-17 00:35:25 +01:00
Aaron van Geffen 340f6522dd Increase the height of various price/loan/duration spinner widgets. 2020-03-16 23:46:33 +01:00
Aaron van Geffen f3765646c5 Increase height for button heights in text input window.
Also fixes the formatting for the widgets array.
2020-03-16 23:46:17 +01:00
Aaron van Geffen 8c0186d9a4 Make file window button captions fit in more languages.
The window is made 10px wider to accommodate button captions in languages like Japanese.
2020-03-16 22:56:04 +01:00
Aaron van Geffen fc70d6c851 Increase research dropdown heights. 2020-03-16 22:56:04 +01:00
Michael Steenbeek fd91c41a76
Name remaining ride type flags (#10947) 2020-03-16 22:52:06 +01:00
Michael Steenbeek 9fda7762e5
Fix #10942: Cut-away view is broken (#10945) 2020-03-16 21:47:38 +01:00
Gymnasiast 567e70bfb6
Pass ScenerySelection as const & 2020-03-15 13:28:20 +01:00
Gymnasiast 5ba5daca42
Make ScenerySelection implementation a bit cleaner 2020-03-15 13:19:26 +01:00
Gymnasiast 70e287b076
Clean up scenery handling 2020-03-15 12:15:12 +01:00
Michael Steenbeek 18ebe73dfa
Replace object_entry_get_type() with method (#10937) 2020-03-15 12:07:04 +01:00