1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 14:24:33 +01:00
Commit Graph

57 Commits

Author SHA1 Message Date
Duncan
2063aea5ef Remove common format formatter where possible (#13034)
* Remove common format formatter where possible

Eventually should have it limited to tooltips, window titles and widget args

* Remove remaining paint functions using common

* Remove misuse of gCommonFormatArgs
2020-09-30 22:42:04 +01:00
Aaron van Geffen
d27e14f45b Compact, statically initialized syntax for event lists (#12973) 2020-09-28 20:36:15 +02:00
Tulio Leao
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
Aaron van Geffen
40cfadcdc5 Apply formatting suggestions from code review
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-08-18 10:13:48 +02:00
Aaron van Geffen
6b9211c8b8 Refactor Park, Player, Research, Ride* to use MakeTab 2020-08-17 20:59:42 +02:00
pizza2004
d217dfa9b9 Refactor NewsItem into namespace and Pascal Case (#12511) 2020-08-02 23:14:00 -03:00
pizza2004
cee7f8d34c Close #12397: Refactor NEWS_ITEM_* to use strong enum 2020-07-28 12:54:18 -06:00
Duncan
4a235e3bb6 Refactor ResearchItem Type to an enum class (#12346)
* Change type of ResearchItem.type to enum class

This is to prevent any future issues caused by confusion as to what the type is and further improves the codebase.

* Specifiy a size for the type

Also remove the static cast where not required

* Apply review comments
2020-07-22 14:25:05 +01:00
Aaron van Geffen
7b5087f057 Update copyright year to 2020 2020-07-21 15:04:34 +02:00
Aaron van Geffen
b966173550 Fix #12315: Re-introduce titles in Finances and Research windows. (#12317) 2020-07-19 14:31:24 +02:00
Aaron van Geffen
79ae0786c0 Refactor more widgets definitions into new format
* About
* Editor Bottom Toolbar
* Editor Inventions List
* Editor Object Selection
* Error
* Finances
* Footpath
* Game Bottom Toolbar
* Guest List
* Network Status
* News
* News Options
* Player
* Research
* Staff List
* Title Options
* About window.

And fix MakeSpinnerWidgets declaration order.
2020-07-16 20:48:25 +02:00
Aaron van Geffen
681b8d7938 Introduce widget::width and widget::height helper functions (#12053) 2020-06-24 22:44:00 -03:00
TomasZilinek
cd6076b5bc 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 12:48:17 -03:00
TomasZilinek
9efe43fa59 Fix #11562 - gfx_draw_string_left_wrapped overload (#12015)
I created the overload, replaced remaining calls with the new function and removed the old function.
2020-06-21 06:25:31 -03:00
TomasZilinek
c1546059ad Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010)
Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 16:09:45 -03:00
Gymnasiast
f8699d1244 Apply review requests; fix error; remove debug code 2020-06-19 23:35:18 +02:00
Gymnasiast
5029f754ed Fix #7324: Research window shows vehicle name instead of ride name 2020-06-19 22:50:53 +02:00
Michael Steenbeek
620fb5e5c4 Migrate many set_format_arg calls to Formatter (#11744) 2020-05-13 21:29:39 -03:00
Gymnasiast
b942d24bcf Fix WW and WH for some windows 2020-05-09 19:08:00 +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
Tulio Leao
4933785b1c Make window_dropdown_show_text_custom_width() use ScreenCoordsXY 2020-05-01 15:48:20 -03:00
Aaron van Geffen
fc70d6c851 Increase research dropdown heights. 2020-03-16 22:56:04 +01:00
Tulio Leao
724a6d4dcf Make rct_window use ScreenCoordsXY 2020-03-02 20:51:01 -03:00
Gymnasiast
63fddee603 Convert gResearchLast/NextItem to std::optional 2020-01-26 10:07:16 +01:00
Michael Steenbeek
3192bfb7c6 Move research functions to method; remove unused function (#10609) 2020-01-22 22:51:11 +01:00
Matt
cc6321048f Refactor window_invalidate to use rct_window::Invalidate 2019-08-11 17:22:00 +02:00
Aaron van Geffen
2af13904c5 Update copyright notices for 2019. (#8903) 2019-03-17 07:16:15 +00:00
clang-format
b02dfdbc93 Binpack function arguments together
Previously when the arguments of a function wouldn't fit on a single line, clang-format would put each argument on its own line instead. By enabling the binpack parameter setting, it tried to fit as many on one line as possible instead.

Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-23 16:00:22 +02:00
clang-format
95ce592579 Enforce not breaking before assignments and function names
Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-23 16:00:19 +02:00
clang-format
e558660860 clang-format UI windows 2018-07-23 16:00:14 +02:00
Michael Steenbeek
1b08fb4e69 Replace our own integer types with standard ones 2018-06-20 17:30:40 +02:00
Hielke Morsink
0cf256ac9e 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
Michał Janiszewski
a2ef4bd699 Exclude pre-formatted blocks from clang-format (#7520)
[ci skip]
2018-05-16 20:41:29 +02:00
Ted John
5a803d2551 Implement game action for park set research funding 2018-03-20 09:31:39 +01:00
Michał Janiszewski
cd065d4f41 Reduce includes in common header 2018-03-20 00:27:58 +01:00
Gymnasiast
e8b2a3df0d Slight research refactor 2018-01-29 12:52:12 +01:00
Marijn van der Werf
4c956def67 Update UI imports 2018-01-18 22:57:55 +01:00
ZehMatt
84f2917f59 Use const and constexpr whenever possible. 2018-01-11 22:29:08 +01:00
Michael Steenbeek
cd5a1ba888 Compile files in world folder as C++ 2018-01-11 13:25:09 +01:00
Michael Steenbeek
0995ab9910 Fold gResearchNextCategory into gResearchNextItem 2018-01-10 15:31:47 +01:00
Michael Steenbeek
3d9466a2f6 Fix refactor mistake 2018-01-10 12:05:06 +01:00
Michael Steenbeek
55b473d866 Rename gResearchLastItemSubject to gResearchLastItem 2018-01-09 21:35:10 +01:00
Aaron van Geffen
ecc1cfed2a Rename WWT_DROPDOWN_BUTTON to WWT_BUTTON.
The previous name implied an exclusive association with dropdowns.
While used to display the dropdown triangle button, this is not an
exclusive use.
2018-01-08 00:01:32 +01:00
Gymnasiast
2ecbac1550 Fix #6972: Last development field is identical to progress field 2018-01-07 22:28:08 +01:00
Michael Steenbeek
7d5de63484 Refactor rct_research_item, refactor access to rct_research_item
This takes away a lot of the bitshift and bit mask trickery previously used.
2018-01-07 15:33:44 +01:00