1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-31 10:45:16 +01:00
Commit Graph

368 Commits

Author SHA1 Message Date
frutiemax
adb692b74e Forward declare Formatter 2021-12-30 12:17:51 -05:00
Gymnasiast
ef6f2cceee Create RideConstruction.h 2021-12-18 20:27:13 +01:00
Ted John
2f20dc029e Fix drawing of disabled zoom buttons 2021-12-12 11:48:49 +01:00
Michael Steenbeek
27cbb6c6ae Merge pull request #16190 from Gymnasiast/refactor/normalised-tile-element-type-3
Part of #15485: normalise all OpenRCT2 tile element types
2021-12-12 09:53:09 +01:00
Michael Steenbeek
b83f7c3859 Merge pull request #16150 from IntelOrca/refactor/imageid-ui
Refactor footpath, scenery, terrain and mapgen windows to use ImageId
2021-12-11 23:21:19 +01:00
ζeh Matt
cec30e093d Merge pull request #15991 from ZehMatt/refactor/bannerid
Use TIdentifier for BannerIndex
2021-12-11 08:08:27 -08:00
Gymnasiast
aa34f0f760 Drop the N postfix 2021-12-11 00:39:39 +01:00
Michael Steenbeek
4caeb797f8 Merge pull request #16127 from Gymnasiast/feature/rct1-image-fallback
Create fallback system for csg1 images
2021-12-10 23:25:04 +01:00
Michael Steenbeek
2d1af0ec42 Replace many GetType() calls with GetTypeN() 2021-12-10 22:43:17 +01:00
Gymnasiast
fcd704ed47 Create fallback system for csg1 images 2021-12-08 16:18:33 +01:00
Ted John
d427098e39 Refactor terrain and path to use ImageId 2021-12-07 20:46:15 +00:00
ζeh Matt
63a2e9d716 Refactor uses of old BannerIndex 2021-12-01 14:41:59 +02:00
Hielke Morsink
53d9bfa8b4 Update implicit zoom conversions 2021-12-01 00:08:35 +01:00
Duncan
eba42a9584 Introduce Limits headers. (#15329)
* Move RCT12 limits to seperate file and namespace

* Remove prefix from constants

* Add rct1 limits file

* Rename constants to remove prefix

* Add RCT2 limits file

* Remove RCT2 prefix from constants

* Move constant to correct header

* Fix rebase mistakes

* Drop prefix
2021-11-27 16:20:05 +00:00
ζeh Matt
9f23449ffb Move Staff/Guest/Peep to entity 2021-11-26 18:26:19 +02:00
ζeh Matt
56e78d5733 Merge pull request #15985 from ZehMatt/refactor/entities2
Refactor Sprite to Entity
2021-11-25 12:53:50 -08:00
ζeh Matt
03fb9b390f Rename Sprite to EntityRegistry 2021-11-24 17:04:12 +02:00
ζeh Matt
7c726e2a0c Fix includes 2021-11-24 16:48:33 +02: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
a8d2d5fd44 Staff patrol area 2 from NSF (#15600)
* Port over changes from NSF for staff

* Fix import and export

* Fix crash on export

* Fix import issue

* Fix patrol import issue

* Remove staff id field

* Increment network version

* Actually remove all instances of staff id

* Update replays
2021-10-27 21:19:10 +01:00
Hielke Morsink
9dd20ec619 Improve array formatting
For most of these cases, adding a trailing comma to the array block makes clang-format put each item on a new line, and clang-format exception blocks could be reduced where clang-format does not handle them properly.
2021-10-17 18:21:45 +02:00
Bepso
c44d1151c2 Close #13766 : Refactor Clear Scenery to class (#15481)
* Add CleanScenery class
2021-10-06 16:46:01 +01:00
Hielke Morsink
5b9b52c028 Use (const) references to scrolls where possible 2021-10-01 15:21:01 +02:00
Hielke Morsink
6de1868ad8 Use (const) references to widgets where possible
Note: The change from `w->widgets[WIDX_ENTRY_PRICE]` to `entryPriceWidget` is intended.
2021-10-01 15:21:00 +02:00
Hielke Morsink
94144bcd89 Remove some dead code
Reported by clang
clang-analyzer-deadcode.DeadStores
2021-09-30 10:40:32 +02:00
Duncan
a268350615 Fix #15439: Ride viewport is partially grey
The ride viewport does not work the same as other viewports due to the selection of views that it has. After refactoring the focus system to use a more streamlined approach the ride viewport lost its invalidation on resizing. If the ride window was to use the same viewport update code as say the guest window then the viewport focus still ends up incorrect due to it no longer centring the focus. Therefore the best approach was to lose the focus on resize and force a recalculation of it.

Also renamed Focus2 to Focus as Focus2 was meant to just be fill in whilst removing the original focus structs.
2021-09-21 11:06:04 +02:00
Duncan
fa57b6aea0 Remove focus union and replace with typed focus (#15426)
* Remove focus union and replace with typed focus

This if for the NSF to allow for CoordsXYZ

* Remove legacy structures

* Rework viewport_create to deduplicate logic

* Simplify yet further

* Apply review comments

* Remove intermediate
2021-09-18 20:34:38 +01:00
Duncan
c05068e8d1 Replace sprite_left,t,r,b with SpriteRect (#15408)
* Replace sprite_left,t,r,b with SpriteRect

This is required for the NSF. I had to add a silly constructor to rct_sprite for now. Will eventually be removed one day...

* Fix compilation and memory leak

* Add some UB to prevent some other UB

* Make review change
2021-09-18 19:07:35 +01:00
Hielke Morsink
4b4b3333d6 Remove unnecessary else blocks 2021-09-16 18:31:12 +02:00
Michael Steenbeek
624a32e93b Make Coords isNull/setNull functions TitleCase (#15382) 2021-09-08 20:48:53 -03:00
Hielke Morsink
15d3a4a9da Update more include guards (#15254) 2021-08-21 12:55:28 +02:00
Ted John
5f853df1fd Remove gS6Info 2021-08-02 20:38:02 +02:00
Gymnasiast
93515f4414 Use money64 for land and water tools
Should hopefully also fix CI.
2021-08-01 15:14:43 +02:00
Gymnasiast
676ef7205e Change all calls to DrawTextBasic to use Formatter 2021-08-01 15:14:43 +02:00
Ted John
70d9c1438e Change most things and formatting to money64 2021-08-01 15:14:42 +02:00
Duncan
e9eb1b8304 Banner Refactor from NSF (#14788)
* Banner refactor

* Fix mistake in fix_duplicated_banners

* Reduce limit back

* Fix export

* Free banner on delete

* Increment network version

* Fix potential banner pointer crashes

Co-authored-by: Ted John <ted@brambles.org>
2021-07-27 10:25:58 +01:00
ZehMatt
c15f17c49a Fix potential null dereference 2021-07-22 22:14:12 +03:00
Daniel Karandikar
b017ea4159 Fix [#12262]: Windows can appear off screen in some cases (#14881)
Fix: [#12262] Windows can appear off screen with small screens or high scaling.
2021-07-03 09:38:39 -03:00
ζeh Matt
751c419594 Minor cleanups (#14954)
* Fix uninitialized variables in InputManager

* Use constexpr for const values

* Add break statements instead of implicit fallthrough

* Default initialize variables in Cheats window

* Default initialize variables in News window

* Default initialize window event pointers
2021-06-26 01:43:05 -03:00
Jamie Quigley
4f6d0a00fd Refactor RIDE_STATUS to use strong enum (#14840)
* Refactor RIDE_STATUS to use strong enum

* Change platform-specific code to match RIDE_STATUS refactor

* Re-added check for valid RideStatus value

* Fixed errors in "g2" build target

* Use EnumValue instead of static_cast<uint8_t>

* Revert rct{1,2}.h to use uint8_t.

* Fix formatting

* Reverted from constexpr variable to additional enum variant

* Fix formatting
2021-06-10 07:09:58 +01: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
Duncan
39fcc5d078 Split up Sprite header (#14764)
* Remove fields from rct_sprite union

* more header fun

* Fix guest include
2021-05-29 06:01:32 +01:00
Silent
94da3cf422 Fix #13445: Make FileScanner::ScanDirectory return a unique_ptr
Also fixes a resource leak in TitleSequence::GetSaves.
2021-05-20 19:22:36 +02:00
ZeeMajora
0123a3d141 Close #14655: make Changelog window brown in RCT1 theme 2021-05-15 16:53:44 +02:00
Michael Steenbeek
f06bf3681d Fix #14638: Make 'About OpenRCT2' themeable; more RCT1 window colours 2021-05-13 18:28:09 +02:00
duncanspumpkin
c345396765 Move duck method into class 2021-05-13 16:09:26 +02:00