1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 08:14:38 +01:00
Commit Graph

165 Commits

Author SHA1 Message Date
Aaron van Geffen
68a4991971 Move .bankLoan into ParkData struct 2025-08-13 21:24:06 +02:00
Garv Changrani
b47506dd90 Close #24665: Don't return empty strings with quotes for std::string 2025-07-02 13:33:54 +02:00
Matt
d8964c5641 Fix #24509: Use std::sort instead of std::stable_sort (#24664) 2025-06-23 18:46:31 +02:00
Michael Steenbeek
7b322d825a Refactor constants in window .cpp files 2025-06-16 23:10:47 +02:00
Gymnasiast
81e3181ebb Pass ScreenSize to makeWindowShim() 2025-06-10 23:21:15 +02:00
Gymnasiast
bdba89f428 Pass ScreenSize to window creation functions 2025-06-10 23:20:28 +02:00
Aaron van Geffen
ec3f9d1272 Disable scenario options rather than hiding them (#24559) 2025-06-10 20:05:06 +00:00
Gymnasiast
650fa3ae2e Rename WindowWidgetType to WidgetType and change for new code style 2025-06-10 19:55:12 +02:00
Gymnasiast
149468406b Update WindowColour enum for new code style 2025-06-10 19:53:12 +02:00
Gymnasiast
86e265f093 Make widget creation functions lowerCamelCase 2025-06-10 19:51:21 +02:00
Aaron van Geffen
0779b9f0ab Replace window shim and widget macros with constexpr functions (#24566) 2025-06-07 23:02:14 +02:00
Harry Hopkinson
cd63cd34d1 Close #24400: Sort rides with preservation order alphabetically 2025-05-23 12:48:06 +00:00
Matt
6335c31336 Rename DrawPixelInfo to RenderTarget (#24339)
* Begin backend separation, rename type DrawingPixelInfo to RenderTarget

* Rename dpi variables to rt
2025-05-04 22:06:46 +00:00
Aaron van Geffen
3f87e2b67a Centralise ResizeFrame in WindowBase and call when setting widgets or resizing 2025-04-11 20:37:54 +02:00
Aaron van Geffen
bbcc0e2413 Rework manually drawn labels into label widgets
* Introduce label widgets for land tab

* Introduce label widgets for guest tab

* Introduce label widgets for rides tab

* Introduce label widgets for financial tab
2025-03-28 16:04:02 +01:00
Aaron van Geffen
9b5596d18b Store tab sizes in ScreenSize structs 2025-03-28 16:01:31 +01:00
Aaron van Geffen
c881d2e17e Internally rename 'park' tab into 'land' tab for consistency 2025-03-28 15:55:20 +01:00
Aaron van Geffen
b0b050d42f Add extra editor step for entering scenario details 2025-03-20 16:37:47 +01:00
Aaron van Geffen
50f58d4c4f Change: allow going back in editor when converting a save 2025-03-20 16:34:09 +01:00
Aaron van Geffen
42126cd35d Move 'RCT1 interest' checkbox into the same place as regular interest spinner 2025-03-13 19:18:37 +01:00
Aaron van Geffen
e2d4a25c8a Move 'hard park rating' option to objective tab 2025-03-13 19:15:31 +01:00
Aaron van Geffen
d4478e7814 Fix widget recovery after "no money" toggle 2025-03-13 17:50:34 +01:00
Aaron van Geffen
eca3b4bddd Rework financial options tab with groupboxes 2025-03-13 17:36:41 +01:00
Aaron van Geffen
c2c598e4c2 Add new window titles and tooltips 2025-03-13 16:25:25 +01:00
Aaron van Geffen
d593a50bf7 Split off Scenario Details from Objective tab 2025-03-13 15:56:10 +01:00
Aaron van Geffen
0d141224ba Change dimensions for park tab; use terraform icon 2025-03-13 15:27:05 +01:00
Aaron van Geffen
3a0240f6c4 Move earning model / park entrance price widgets to financial tab 2025-03-13 15:23:07 +01:00
Aaron van Geffen
094a5950b9 Move hard park rating option to finances tab 2025-03-13 14:12:07 +01:00
Aaron van Geffen
49727c62b9 Move difficult guest generation option to guests tab 2025-03-13 14:09:19 +01:00
Aaron van Geffen
11d72d4968 Tweak and use constants more 2025-03-13 14:04:31 +01:00
Aaron van Geffen
807a2fa7c9 Merge objective options into scenario options 2025-03-13 13:57:03 +01:00
Gymnasiast
4badffcdb6 Change GameState_t members to lowerCamelCase 2025-03-20 23:05:57 +01:00
Aaron van Geffen
92212369d4 Skip setting page/widgets if we're already on the page (#23975) 2025-03-12 19:50:19 +01:00
Aaron van Geffen
1dd1564904 Clarify 'guests prefer more/less intense rides' settings (#23937)
* Turn guests' intensity preferences into a dropdown

* Update changelog.txt
2025-03-11 20:10:44 +00:00
Aaron van Geffen
d59580bd80 Remove climate setting from scenario options window 2025-02-01 18:35:36 +01:00
Michael Steenbeek
06c1fed4f7 Refactor gScreenFlags to LegacyScene enum 2025-03-05 20:45:04 +00:00
Aaron van Geffen
7a823bf928 Use WindowSetResize to set min/max dimensions in most places (#23929)
* Refactor WindowSetResize to use ScreenSize structs

* Let WindowSetResize return whether or not window was resized

* Use WindowSetResize to set min/max dimensions in most places
2025-03-05 15:58:59 +00:00
73
b9b2c96c97 Rename sprites.h to SpriteIds.h (#23804) 2025-02-13 15:51:46 +00:00
Aaron van Geffen
cf448753c1 Move WindowInvalidate and WidgetInvalidate families into WindowManager (#23692)
* Move WindowInvalidate and WidgetInvalidate families into WindowManager

* Use InvalidateWidget shorthand in more places

* Cut back on UiContext includes

* Cut back on Window.h includes

* Remove outdated parameter comments
2025-01-25 13:46:08 +01:00
Michael Steenbeek
b0c99fcb6c Refactor more constants to kConstant notation 2025-01-22 16:16:55 +00:00
Aaron van Geffen
a8773dd805 Move WindowClose family into WindowManager (#23646)
* Replace WindowClose() calls with Close method calls where possible

* Move WindowClose family into WindowManager

* Remove UpdateSceneryGroupIndexes hack
2025-01-19 18:49:18 +01:00
Michael Steenbeek
be9f27e4f9 Mass rename constants (#23656) 2025-01-19 15:59:45 +00:00
Aaron van Geffen
5fbe8d0ae1 Centralise external window signatures in Windows.h (#23653) 2025-01-19 15:50:54 +01:00
Aaron van Geffen
bed4d5bdca Move WindowCreate and WindowFocusOrCreate into WindowManager (#23643)
* Move WindowBringToFront into WindowManager

* Move WindowCreate and WindowFocusOrCreate into WindowManager

* Cut back on Context/UiContext includes
2025-01-19 06:58:28 -03:00
Matt
b9f6b6f754 Refactor widgets state (#23621)
* Refactor windows to not share widget state

* First half of refactoring all the windows

* Refactor the remaining windows, compiles but has issues

* Fix drawing only every second widget

* Remove the need of an terminating widget

* Address WidgetIndex signedness issues; use kWidgetIndexNull more

* Address constexpr issue with Widget content union

* Fix tabs in scenery window

* Fix tabs in object selection window

* Adjust custom widget index for CustomTool events

* Use STR_NONE for default tooltip initialisation

* Adjustment for mingw compiler

* Fix bottom toolbar using the widget declaration not instance

* Remove pointless code in Guest window, handled by SetPage

* Prevent out of bounds crash

* Move scroll widgets initialization to SetPage in Cheats window

* Remove special logic in Options window

* Remove special logic in Park window

* Remove special logic for Player window

* Remove special logic for Research window

* Remove special logic for Ride window

* Remove special logic for Staff window

* Remove special logic for Finances window

* Remove special logic for MapGen window

* Remove special logic for editor objective options window

* Remove special logic for editor scenario options window

* Fix widgets not being set since page is initialized to 0

* Remove more redundant code

* Fix remaining access to widget declarations

* Remove unused variable

* Fix editor object selection tabs on successive windows

---------

Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2025-01-18 13:45:17 +01:00
Aaron van Geffen
fa06a49302 Update copyright year to 2025 (#23514) 2024-12-31 20:30:04 +01:00
Aaron van Geffen
b971d1596e Indent window widget definitions (#22700)
* Indent definitions in About, AssetPacks windows

* Indent definitions in Banner, Changelog, CustomCurrency windows

* Indent DebugPaint, DemolishRidePrompt windows

* Indent EditorBottomToolbar, EditorInventionsList

* Indent EditorObjectiveOptions, EditorScenarioOptions

* Indent Finances

* Indent Footpath

* Indent GameBottomToolbar

* Indent Guest window

* Indent GuestList, InstallTrack windows

* Indent Land, LandRights windows

* Indent LoadSave, Main, MapGen, MapTooltip windows

* Indent MazeConstruction

* Indent Multiplayer

* Indent NetworkStatus

* Indent NewCampaign

* Indent NewRide window

* Indent News window

* Indent NewsOptions window

* Indent ObjectLoadError window

* Indent Options window

* Indent Park window

* Indent PatrolArea window

* Indent Player window

* Indent RefurbishRidePrompt window

* Indent Research window

* Indent Ride window

* Indent RideConstruction

* Indent RideList

* Indent SavePrompt

* Indent ScenarioSelect widgets

* Indent scenario window

* Indent scenery scatter window defs

* Indent server list window

* Indent server start window§

* Indent ShortcutKeys window

* Indent Sign window

* Indent Staff window

* Indent StaffFirePrompt window

* Indent StaffList window defs

* Indent Themes window defs

* Indent TileInspector window defs

* Indent TitleExit, TitleMenu, TitleOptions, Tooltip windows

* Indent TrackDesignManage window defs

* Indent TrackDesignPlace defs

* Indent TrackList def

* Indent Transparency window defs

* Indent ViewClipping window defs

* Indent Viewport window defs

* Indent Water window defs
2024-09-04 21:11:26 +02:00
Aaron van Geffen
ef4cad5ee3 Move UI exclusive string ids to UiStringIds.h 2024-05-10 23:24:46 +02:00
Michał Janiszewski
7b12667ddb Reduce <algorithm> include (#21947) 2024-05-01 13:47:27 +02:00
Gymnasiast
c158854a7f Move Park into namespace, add other park-related things to struct 2024-04-04 18:14:27 +02:00