1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 05:53:02 +01:00
Commit Graph

437 Commits

Author SHA1 Message Date
Gymnasiast
2372ae39bd Make TrackDesignState adhere to new coding style 2024-07-02 16:30:04 +02:00
Aaron van Geffen
15ee05dfb0 Rename kNumOrthogonalDirections constant 2024-07-01 17:29:37 +02:00
Arnold Zhou
1cd8ed4ade Close #22179: Create strong enum for PTD_OPERATION_* 2024-06-24 09:25:11 +02:00
Michael Steenbeek
a82d398afd Abstract flags access in track design scenery 2024-06-19 12:15:17 +02:00
Gymnasiast
113996dfcc Rename scenery element names, add tertiary colour 2024-06-14 21:17:34 +02:00
Gymnasiast
0dc46211fe Update maze element 2024-06-14 21:17:34 +02:00
Gymnasiast
0d0d70bc1d Use lowerCamelCase in entrance element 2024-06-14 21:17:34 +02:00
Gymnasiast
267c2e5ecc Remove unused flags members from TrackDesign 2024-06-14 21:17:34 +02:00
Gymnasiast
cdbedeece6 Desnake TrackDesign fields 2024-06-14 21:17:34 +02:00
Harry Hopkinson
c63efa658f Rename TD6MaxTrackElements to kTD6MaxTrackElements 2024-06-06 20:40:27 +01:00
Harry-Hopkinson
c489d6288a Rename NumColourSchemes to kNumColourSchemes 2024-05-27 07:52:32 +00:00
Gymnasiast
4cdaaa9810 Refactor slope flags 2024-05-10 20:16:07 +02:00
Michał Janiszewski
7b12667ddb Reduce <algorithm> include (#21947) 2024-05-01 13:47:27 +02:00
Karsten Van Fossan
137099a429 Close #18305: Move Translate3DTo2DWithZ() from Map.h into Viewport.h
Translate3DTo2DWithZ move to Viewport.h as suggested by ducanspumpkin and update references. Remove redundant function Translate3Dto2D.
2024-04-21 01:18:11 +02:00
Gymnasiast
c158854a7f Move Park into namespace, add other park-related things to struct 2024-04-04 18:14:27 +02:00
Claudio Tiecher
24688ad5a3 Part of #21421: Refactor TILE_ELEMENT_DIRECTION_MASK 2024-03-25 16:17:32 +01:00
Claudio Tiecher
ffb8b4d44b Part of #21421: Refactor MAXIMUM_MAP_SIZE_TECHNICAL 2024-03-25 16:17:32 +01:00
Claudio Tiecher
13e9ff84c2 Part of #21421: Replace define with constexpr (#21626)
* Part of #21421: Refactor RIDE_INITIAL_RELIABILITY in Ride.h

* Part of #21421: Refactor STATION_DEPART_FLAG and STATION_DEPART_MASK

* Part of #21421: Refactor MAX_STATION_PLATFORM_LENGTH

* Part of #21421: Refactor RIDE_RATING_UNDEFINED

* Part of #21421: Refactor TRACK_BLOCK_END

* Part of #21421: Refactor TRACK_PREVIEW_IMAGE_SIZE

* Part of #21421: Refactor based on feedback

* Part of #21421: Fix signed/unsigned mismatch on Win

* Improved consistency kTrackPreviewImageSize

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>

* Part of #21421: kMaxStationPlatformLength to int8

---------

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2024-03-24 21:49:50 +00:00
Harry Hopkinson
048276b67a Move gLastEntranceStyle to GameState_t 2024-03-09 11:27:05 +01:00
ζeh Matt
2661cf8772 Refactor out all uses of gCurrentRotation, remove gCurrentRotation 2024-03-05 10:23:28 +02:00
ζeh Matt
1a197af715 Make ViewportPaint static, refactor TrackDesign to use ViewportRender 2024-03-05 10:23:23 +02:00
Duncan
4b6ba80a46 Move cheats to struct in GameState_t 2024-03-03 22:44:15 +01:00
Harry Hopkinson
7797db10c8 Replace Macros and Notation in Cheats.h, common.h and Context.h. (#21437) 2024-02-23 19:30:35 -03:00
Peter Froud
40a7fa70fc Fix empty error messages (#21351)
* Add `STR_ERR_CANT_CHANGE_PARK_ENTRANCE_FEE`

* Add `STR_ERR_TRACK_ON_THIS_TILE_NEEDS_WATER`

* Return existing `GameAction::Result`

* Add `STR_ERR_ACTION_INVALID_FOR_THAT_STAFF_TYPE`

I am open to suggestions for a different message!
Originally this was going to be STR_ERR_WRONG_STAFF_TYPE
but I thought that was confusing because the game
action arguments do not specify a staff type. We
want it to mean "the staff ID you specified is the
wrong StaffType for this game action".

* Refactor `StaffSetColour()` to return `Result`

* Remove unnecessary arguments when `Status` is `Ok`

* Refactor `SwapTileElements()` to return `Result`

Also add STR_ERR_CANT_SWAP_TILE_ELEMENT_WITH_ITSELF

* Format code

* Use `STR_ERR_CANT_CHANGE_PARK_ENTRANCE_FEE` in title

* Format code using Github web editor

* Format indentation
2024-02-19 20:58:04 -03:00
Harry-Hopkinson
b755c873e5 Move gMapSize to GameState_t 2024-02-12 21:32:08 +00:00
Matt
fc1b580074 Merge pull request #21244 from pfroud/add-error-strings
Add error strings to reduce how many `GameActions::Result`s have `STR_NONE, STR_NONE`
2024-01-29 18:02:37 +02:00
Hielke Morsink
13351d996e #21193: Move gParkFlags to GameState_t, refactor uses
Also changed a few instances where GetGameState was called inside the same function.
The change in Peep.cpp is needed because of a function conflict. FormatStringID exists both in the global and in the OpenRCT2 namespace.
2024-01-22 16:31:35 +01:00
Peter Froud
4145f851da Run clang-format 2024-01-22 02:29:08 -08:00
Peter Froud
9299a80a58 Add descriptive error strings for null checks 2024-01-22 01:21:14 -08:00
Gymnasiast
5593eca03d Import maze entrances in the same way as regular ones 2024-01-11 22:49:40 +01:00
Gymnasiast
7df3b22e14 Move conversion of station object to TD4/6 import/export 2024-01-03 21:14:04 +01:00
Gymnasiast
cfff3c53f9 Do not use RCT1/2 limits in TrackDesign.h
Some unrelated files seemingly relied on TrackDesign.h to import RCT2.h for them.
2024-01-03 21:12:53 +01:00
Gymnasiast
01fc353cc8 Refactor in-memory track design entrance 2024-01-03 21:12:53 +01:00
James103
1d8dc111f1 Replace 2023 with 2024 in copyright headers (#21139)
Replace all instances of the year 2023 with 2024 in all copyright headers
2024-01-01 12:52:28 +01:00
mrmbernardi
98a52efb7e Fix #5677: Balloons pass through the ground and objects (#20483) 2023-12-26 08:28:19 -03:00
Michael Steenbeek
baf88ef490 Refactor in-memory track design element (#21010) 2023-12-02 14:43:03 -03:00
ζeh Matt
45afc1f67b Properly name setter/getter for edge object index 2023-08-26 21:01:27 +03:00
ζeh Matt
ae3c1037ad Properly name what the getter/setter for surface object index is 2023-08-26 20:50:06 +03:00
mrmbernardi
68d4304bbc Fix #19878: Pre-built rides respect scenery research (#20472) 2023-06-29 21:50:06 +01:00
Aaron van Geffen
d425e0a8bb Remove const qualifier from constexpr statements 2023-06-24 11:45:26 +02:00
kyphii
9ca4e48c79 Fix: #13397: Broken Stations with Simulate Mode 2023-04-22 19:41:26 +02:00
Spacek531
115fc957c0 import block brake from legacy file types 2023-04-11 19:28:26 -07:00
Gymnasiast
16c5c1b752 Use dpi ref in interface folder 2023-04-11 22:57:25 +01:00
Michał Janiszewski
fe4be750c6 Fix #12598: Incorrect assignment in TrackDesign (#19831) 2023-04-05 13:05:48 +00:00
Michael Steenbeek
dd624f9bff Replace remaining usages of money16, money32 (#19469)
* Use money64 for ride prices and shop items

* Use money64 for park entrance fee

* Use money64 for gGuestInitialCash

* Use money64 for upkeep costs

* Use money64 for ride value

* Use money64 for marketing campaign cost

* Use money64 for object prices

* Use money64 for land prices

* Use money64 for guest expenditure

* Replace remaining occurrences of money32 with money64

* Update replays

* Bump network version

---------

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2023-03-02 21:55:42 +00:00
ζeh Matt
b1667d3423 Use a dedicated Ride instance for previews 2023-02-21 23:44:03 +02:00
ζeh Matt
063d97f4f2 Use fixed size storage for Rides, cleanup interface a bit 2023-02-21 23:20:48 +02:00
Duncan
d811c9a9ba Add Object Entry Manager (#19332)
* Add object entry manager

Port over wall and banner

* Port over small scenery to ObjectEntryManager

Clang format files

Actually make things safe

Fix build
2023-02-12 20:43:11 +00:00
Duncan
ead13c44b8 Split off LargeSceneryEntry (#19277) 2023-01-26 18:44:42 +00:00
Duncan
d51b4d3191 Split off SmallSceneryEntry into dedicated file (#19115)
* Split off small scenery entry to new file

* Move flags to new file
2023-01-25 19:25:33 +00:00