mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
23,647 Commits 7 Branches 39 Tags 352 MiB
Commit Graph

132 Commits

Author SHA1 Message Date
Gymnasiast d3fd31c611
Rename rct_string_id to StringId 2022-07-31 22:30:13 +02:00
Hielke Morsink a258008bef
Refactor window functions to take references 4 2022-07-31 17:23:16 +02:00
Hielke Morsink 523bb8136e
Refactor window functions to take references 3 2022-07-31 17:23:16 +02:00
Duncan a4700e152e
Fix #16950. Prevent accessing private members (#16976) 
* Fix #16950. Prevent accessing private members

* Move further private variable and rename

* Allow persistency of selection

* Move code to open event
 2022-04-14 20:36:04 +01:00
Ian-Polito 5f60dc4081
Take the nice additional changes from #16095 2022-04-09 17:50:17 +02:00
Hielke Morsink c995abc25e
Fix: Crash on opening scenery window after removing tabs 
The crash occurred because gWindowSceneryTabSelections did not get cleared when the window is not open, yet this is a global variable that needs clearing. The function that handles this (WindowSceneryResetSelectedSceneryItems) gets called with the `INTENT_ACTION_REFRESH_SCENERY` intent.
 2022-04-09 17:42:17 +02:00
Hielke Morsink 90ab449f78
Fix #16050: Scenery window positioning 
This supersedes #16095

The position and size arguments of WindowCreate are now optional - not a window doesn't have to know the size beforehand.
This removes the WF_NO_SCROLLING flag from the call to WindowCreate, but that seems to have no use for the scenery window anyway.

Co-authored-by: Ian-Polito <ipolito@mailfence.com>
 2022-04-09 00:49:44 +02:00
Ryan 42dc53cfd5 Remove unused call to Init 2022-04-04 12:53:50 -04:00
Ryan a8eb6f21a2 Fix scenery window colors defaulting to black 2022-04-04 01:02:48 -04:00
Duncan 472f7f55c5
Remove hard cap of 0x80 scenery items in a group (#16853) 
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2022-03-22 21:38:54 -03:00
Duncan ba8690d970
Move *10 on removal/price to the object load function (#16846) 
This simplifies the code and ensures that money32/16 is at the same base for all users of these objects
 2022-03-22 21:35:44 +00:00
Ted John fc2ed95641
Merge pull request #16831 from IntelOrca/feature/ternary-scenery-colours 
Implement tertiary colours for small and large scenery objects.
 2022-03-20 19:24:47 +00:00
Ted John 793acf67ae Implement small scenery ternary colours 2022-03-20 18:53:11 +00:00
Michael Steenbeek e78c29ea5c
Fix most occurrences of ‘ternary’ (#16832) 2022-03-20 19:22:05 +01:00
Ted John e9e377ac09 Implement large scenery ternary colours 2022-03-20 18:12:39 +00:00
Duncan d219a99b56
Convert scenery window to class (#16729) 
* Convert scenery window to class

Close #13799

* Move static's into class

* Simplify eyedropper setting code
 2022-03-04 07:17:20 +00:00
Duncan d606c9730a
Cleanup Scenery Window for second scroll area (#16557) 
* Refactor scenery window to check scroll index

* Move into seperate function calls

* Pass offset to tab draw (so it can be used by scrolls)
 2022-02-27 12:26:26 -03:00
Ted John da89a4e413
Remove rct_window::enabled_widgets (#16643) 
`enabled_widgets` was used to enable input for widgets. However I do not recall anywhere this being used to specifically disable a widget which doesn't use the dedicated `disabled_widgets` flag. I don't think there is any purpose in keeping this, so I have removed all uses of it.
 2022-02-13 23:06:19 +00:00
Duncan cdd3c28b2e
Use intents to control scenery window (#16562) 
* Use intents to control scenery window
 2022-02-03 21:10:21 +00:00
Johan Mattsson c00cc90b1f
Fix bounds checks and a nullptr check 2022-02-03 21:42:12 +01:00
Hielke Morsink 1d5c0361b5
Consistently shift 8-byte constants by widget indices 2022-01-10 23:26:31 +01:00
frutiemax adb692b74e Forward declare Formatter 2021-12-30 12:17:51 -05:00
Ted John 5fcc0f4499 Refactor scenery window to use ImageId 2021-12-07 20:17:22 +00:00
Duncan 90d2be3ddd
Clang tidy Part 3: Ui Project Enum Names (#15986) 
* Enum constant case

* Apply enum names clang tidy

* Rename scoped enum missed by clang-tidy
 2021-11-26 14:25:34 +00:00
Duncan fccd298d2f
Clang tidy Part 2: Ui Project Class Names (#15976) 
* Apply clang-tidy on class names in the ui project

* Rename classes to more appropriate names

* Adjust name again
 2021-11-24 16:16:52 +00:00
Duncan bb2c7dbaca
Clang tidy Part 1: Ui Project Function Names (#15956) 
* Add NOLINT around STL using classes and vendor functions

* Apply clang-tidy to ui project function names

* Undo scripting clang-format

* Upper case OpenRCT2 and RCT2
 2021-11-23 13:18:07 +00:00
Duncan 961d51eae4
Fix hovering on scenery window showing incorrect hover for 1 tick 
The scenery window will periodically reset the hover selection so that when you move the cursor out of the window it correctly switches to the actual selection. This leads to the price and description resetting for a singular tick which looks a bit odd and unexpected. To fix this instead when it tries to reset it first checks to see if the cursor is still over the hover selection and if it is does not reset the selection.
 2021-10-10 12:17:52 +02:00
duncanspumpkin d7053784f2 Fix unresearched scenery groups showing 2021-10-06 17:11:08 +01:00
duncanspumpkin 9e227c1e2f Add const where possible 2021-10-06 16:44:07 +01:00
duncanspumpkin fea69cc86c Backport scenery window from NSF 
Co-authored-by: IntelOrca <IntelOrca@users.noreply.github.com>
Co-authored-by: Gymnasiast <Gymnasiast@users.noreply.github.com>
 2021-10-06 16:44:05 +01:00
Hielke Morsink 1d62a902e7
Make scenery_small_entry_has_flag a member function (#15509) 2021-10-01 16:50:05 -03:00
Hielke Morsink 9dd9b27db4
Make WIDGETS_END constexpr 2021-09-26 11:11:42 +02:00
Hielke Morsink e54dc7e466
Use consistent left-shift notation for widgets (#14956) 2021-06-26 14:23:15 +02:00
Duncan c34079acee
Refactor LargeSceneryEntry and remove rct_scenery_entry (#14816) 2021-06-04 12:41:23 +01:00
Duncan 12c5484f44
Refactor SmallSceneryEntry (#14815) 2021-06-03 22:14:41 -03:00
Duncan 8f59fe91cb
BannerSceneryEntry Refactor (#14810) 
* Refactor BannerSceneryEntry to enforce type

* Remove old comment

* Fix incorrect renameing
 2021-06-03 21:43:30 +01:00
Duncan 6f81248084
Rework and refactor PathBitEntry (#14809) 2021-06-03 21:23:00 +01:00
Duncan 425f968a67
Rearrange WallSceneryEntry to enforce types (#14808) 
* Rearrange WallSceneryEntry to enforce types

* Clang format

Correct inverted nullptr check
 2021-06-03 13:26:00 +01:00
Gymnasiast 7fd049c22e
Remove last remnants of gCurrentFontSpriteBase 2021-02-28 00:26:53 +01:00
Gymnasiast 4d9c278ebc
Unify calls to DrawTextBasic 2021-02-28 00:23:00 +01:00
Tulio Leao 00483df2f2 Close #13625: Refactor TOOL_IDX to use strong enum 2020-12-23 20:07:54 -03:00
Łukasz Pękalski 4adf745237
Close #12403: Refactor FILTER_PALETTE_ID to use strong enum (#13273) 2020-12-05 15:13:59 -03:00
ffrogman 7ed1804e61
Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum (#13453) 
* Fix #12410: Refactor WINDOW_WIDGET_TYPES to use strong enum
 2020-11-27 00:14:20 -03:00
pizza2004 2015acd4c0
Refactor UI/Interface Window to Title Case (#13367) 2020-11-04 04:52:23 +00:00
pizza2004 a5607da09d
Refactor Widget to TitleCase (#13355) 2020-11-03 18:29:22 -03:00
pizza2004 68bd035f12
Refactor Dropdown to TitleCase (#13352) 
* Refactor Dropdown Namespace

* Refactor Dropdown to TitleCase
 2020-11-03 08:16:06 +00:00
Duncan f28907a87d
Rework tooltip to be more logical (#13137) 2020-10-10 10:49:56 -03:00
Matt 091145037e
Move the audio code into OpenRCT2 namespace 2020-10-07 00:34:42 +03:00
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