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

319 Commits

Author SHA1 Message Date
Duncan e904ef406f
Fix #19503. Hide 3+ queue junction railings behind a flag (#19644) 
* Fix #19503. Hide 3+ queue junction railings behind a flag

This is to prevent existing parks from changing their behaviour

* Clang format

* Bump version numbers. Update changelog

* Update text
 2023-03-23 08:16:32 +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
Duncan b56748bc82
ObjectEntry Cleanup. FootpathItem, SceneryGroup, Water, LargeScenery (#19385) 
* Move footpathitem entry into new getter

* Move scenery group entry into new getter

* Move water entry into new getter

* Move large scenery entry into new getter

* Remove unused header includes

* Fix compile issue

* Include missing header from vcxproj
 2023-02-15 21:35:16 +00:00
Michael Steenbeek ba39d7be5d
Merge pull request #19241 from Gymnasiast/refactor/more-fields 
Desnake TileElement fields, pad_ and byte_
 2023-01-21 22:38:07 +01: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
Gymnasiast fa7dd95321
Rename remaining snake in (RCT12)TileElement fields 2023-01-21 16:37:11 +01: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
Gymnasiast 3cc2d94b1b
Rename sub_ and loc_ functions 2023-01-17 19:05:14 +01: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
Hielke Morsink 6dafbbfb65
Rename global window functions to TitleCase (#19167) 2023-01-16 20:13:42 +00: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
Hielke Morsink 3bb8ea3668
Better annotate some magic numbers in for loops 2022-10-17 16:08:55 +00: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
Rik Smeets 8e33cf580f Code style: Remove snakes from virtual floor 2022-10-08 20:50:59 +02:00
Duncan 5dba30778d
Code style: Remove more snakes from the park, maphelper, scenery. (#18222) 2022-10-08 06:56:17 -03: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
Rik Smeets efa7a23773
Fix #18140 & #18143: Invalid read in Staff 
The tile element should be determined the same way as is done when checking if the footpath is blocked by a vehicle.

Also added some extra safety checks and made the code a bit more efficient / reusable. For example: when the staff member is not a mechanic, the tile element doesn't have to determined.
 2022-09-30 18:00:59 +00:00
Rik Smeets 67856292a4
Fix #17889: Peeps don't stop at level railway crossings if approached from downhill 
If peeps approached a railway crossing from downhill, they would not stop for a passing train. This was because the exact destination z is determined too late. To always get the correct path, get the first footpath at the previous z index, or one step above.

Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
 2022-09-28 16:44:05 +00:00
Michael Steenbeek 5661da1c68
Unwrap game action compat wrappers 2022-08-11 00:00:58 +02:00
Artem Yanenko 019ed54a48
Fix #17377: Park entrance can be placed without path in Scenario Editor 2022-07-02 14:02:27 +00:00
Michael Steenbeek 29517adc1c
Add missing include to Footpath.cpp 2022-05-01 18:21:53 +02:00
Michael Steenbeek 5e82e9048b
Add missing includes 2022-04-07 21:42:08 +02:00
Hielke Morsink 2137cea3bb
Reduce use of UnderlyingType 2022-02-18 23:21:38 +02:00
Hielke Morsink f47c1b9f96
Close #16468: Use TIdentifier for StationIndex 2022-02-18 23:11:07 +02:00
ζeh Matt 06e430157f
Use RideId::GetNull and RideId::IsNull over constant 2022-02-12 18:11:18 +02:00
ζeh Matt a2470c0573
Rename ride_id_t to RideId 2022-02-12 18:11:18 +02:00
Duncan 5157b57a15
OpenRCT2 Limits (#16088) 
* Move over max rides to limits file

* Move max stations to limits file

* Move over max inversions, golf holes, helices, custhistsize

* Move over max trains per ride

* Bring over Max cars per train and max circuits per ride

* Port over NumColourSchemes and max vehicle colours

* Fix compilation

* Move over max awards

* Move over max peep spawns and park entrances

* Fix rebase issues

* Remove future work

* Switch style

* Update copyright
 2022-02-01 20:59:48 +00:00
Gymnasiast aa34f0f760
Drop the N postfix 2021-12-11 00:39:39 +01:00
Gymnasiast fc3ce3294c
Move over switches to normalised tile element types 2021-12-11 00:30:59 +01:00
Michael Steenbeek 2d1af0ec42
Replace many GetType() calls with GetTypeN() 2021-12-10 22:43:17 +01:00
Duncan 275d565e52
Start splitting up ride.h (#16011) 
* Start splitting up ride.h

* Use cstdint instead of common.h
 2021-11-26 15:03:14 +00:00
ζeh Matt 56e78d5733
Merge pull request #15985 from ZehMatt/refactor/entities2 
Refactor Sprite to Entity
 2021-11-25 12:53:50 -08:00
Peter Schussheim 0495b265c0
Refactor unchecked std::array subscript operator 2021-11-25 10:13:20 +01: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
ζeh Matt c6242fd310
More renaming 2021-11-24 15:50:18 +02:00
ζeh Matt 83b911b193
#15634: Refactor passing GameActions::Result by copy (#15951) 
* Refactor to result GameActions::Result as copy instead of unique_ptr

* Remove alias GameActions::Result::Ptr

* Remove MakeResult wrapper

* Remove type forwarder in TileInspector
 2021-11-24 07:35:08 +00: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
ζeh Matt 719a5a9d8e
Merge pull request #15369 from ZehMatt/refactor/tile-coords 
Refactor overload map_get_first_element_at
 2021-09-21 14:36:03 -07:00
Hielke Morsink 4b4b3333d6
Remove unnecessary else blocks 2021-09-16 18:31:12 +02:00
Gymnasiast 228c1ac7f5
Fix formatting 2021-09-12 17:52:01 +02:00
IntelOrca 4f319d6ed4
Prepare footpath handling for surfaces and railings 2021-09-12 17:52:01 +02:00