mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 14:02:59 +01:00
Code Issues Releases Wiki Activity
25,679 Commits 8 Branches 59 Tags
7797db10c8fe888bc1bec5551dad614b041f5985
Commit Graph

415 Commits

Author SHA1 Message Date
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
Duncan
e09f27df3c Rename snake_case Class names (Remaining Bits) (#19237) 
* Rename snake_case Class names

* Clang format

* Fix build issues
 2023-01-21 19:57:17 +00:00
Duncan
7d08372c80 Remove snake_case from Class names OpenRCT2/Ride*-S* (#19232) 
* Remove snake_case from Class names OpenRCT2/Ride*-S*

* Clang format
 2023-01-20 20:58:55 +00:00
Michael Steenbeek
448c8fafd0 Rename base_height, clearance_height and owner 2023-01-19 20:36:30 +01:00
Duncan
859b071ddc Rename classes with snakes OpenRCT2/A*-F* (#19215) 
* Rename classes with snakes OpenRCT2/A*-F*

* Clang format files
 2023-01-19 08:16:44 +00:00
Hielke Morsink
0762fcb601 Rename snake_case functions in OpenRCT2/util folder 2023-01-18 22:44:13 +01:00
Hielke Morsink
917c091e6b Rename snake_case functions in OpenRCT2/marketing folder 2023-01-17 23:13:39 +00:00
Michael Steenbeek
bb55c6ce66 Remove loadsasnakes (#19192) 
* Rename snake_case methods in scenario folder

* Rename snake_case methods in title folder

* Rename snake_case methods in object folder

* Rename snake_case methods in platform folder

* Rename snake_case methods in windows folder

* Rename tile_inspector.h to TileInspectorGlobals.h

* Rename snake_case methods in ui/windows folder
 2023-01-17 19:46:55 +00:00
Hielke Morsink
6b7dc8fcdb Rename snake_case functions in openrct2/src folder 
Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
 2023-01-17 13:24:51 +01:00
Stephan Spengler
76b918e7ed Change openrct2/ride methods to UpperCamelCase, part 1 2023-01-17 01:32:54 +01:00
Gymnasiast
5309c80e29 Remove snake_case in interface folder 2023-01-16 22:20:41 +01:00
Michael Steenbeek
412bf8f8be Use ride references instead of pointers 2023-01-07 14:02:18 +01:00
Stephan Spengler
2e9d06fabe Rename FootpathPlaceFromTrack to FootpathLayoutPlace (#19028) 2023-01-05 06:39:15 -03:00
James103
73738bbdc8 Replace 2022 with 2023 in copyright headers 
Replace all instances of the year 2022 with 2023 in all copyright headers
 2023-01-01 11:58:01 +01:00
Spacek531
d03f5e594e Refactor track design creation return message 2022-12-14 22:56:43 +01:00
frutiemax
6d804f5323 Add RIDE_TYPE_FLAG_IS_MAZE 2022-12-14 14:21:21 +01:00
Duncan
406b73d904 Remove final snakes from map and world (#18304) 2022-10-12 09:14:45 -03:00
Duncan
7dd8989e70 Next chunk of World/Map.h snakes (#18296) 
* Next chunk of World/Map.h snakes

* Apply clang-format
 2022-10-12 06:35:20 +01:00
Duncan
67bbc8560d Code style: Remove snakes from everything world apart from Map.h (#18273) 
* Remove remaining snakes from world (outside of map)

* Initial few desnaking of Map.h
 2022-10-11 19:39:24 +01:00
duncanspumpkin
2a593b6029 Remove snake cases from Location and LargeScenery 2022-10-05 20:21:56 +01:00
duncanspumpkin
3e8dc1b2ac Remove snakes from the foopaths 2022-10-04 20:08:14 +01:00
73
b9e677945d Replace 20XX with 2022 (#18158) 
* Replace 2020 with 2022

Replace all 2020 headers with 2022

* replace other years with 2022

add missing years
 2022-10-01 08:42:14 +01:00
Michael Steenbeek
7af999e2dd Fix #17980: Path mess and desync when hovering track design 2022-09-23 22:49:16 +02:00