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

780 Commits

Author SHA1 Message Date
Ted John 0aa6ceb2aa Refactor similar loop in s4 and s6 import 2022-03-11 18:39:04 +00:00
Ted John 90718ca81c Refactor patrol area class to new file 2022-03-11 18:39:04 +00:00
Ted John 566bc4d311 Allow patrol areas to be single tiles 
Change the patrol areas to be stored as a sorted list of points grouped in fixed cells for each staff entity. The complexity will be a mixed O(1) and O(log n) search.
 2022-03-11 18:39:04 +00:00
Gymnasiast 49b414a40e
Replace calls to path_get_filename() 2022-02-26 17:20:07 +01:00
spacek531 05b80acfa1
Rename VAR_C4 (#16217) 2022-02-22 20:14:42 -03:00
ζeh Matt 66b402ccf6
Fix accidentally inverted condition (#16704) 2022-02-22 22:08:25 +01:00
spacek531 82378c09c3
Rename VAR_CE and its unions (#16215) 2022-02-20 23:20:06 -03:00
Hielke Morsink ad0a2a8f96
Remove entrance/exit location functions 2022-02-18 23:28:17 +02:00
Hielke Morsink f06645d2f7
Make stations a private std::array and use getters for access 2022-02-18 23:21:35 +02:00
Hielke Morsink f47c1b9f96
Close #16468: Use TIdentifier for StationIndex 2022-02-18 23:11:07 +02:00
ζeh Matt d7f5003943
Introduce EntityId and refactor everything 2022-02-16 18:56:39 +02:00
Ted John 454bfb0a8f Refactor map size to allow for rectangle maps 2022-02-14 23:15:59 +00:00
ζeh Matt 06e430157f
Use RideId::GetNull and RideId::IsNull over constant 2022-02-12 18:11:18 +02:00
ζeh Matt 4554d6d883
Fix all uses of RideId 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
Michael Steenbeek 8b7f60d10d
Fix: Incorrect “Same price throughout park” for RCT1 import 2022-01-29 15:46:24 +01:00
Gymnasiast 919c73d030
C++-ify most path handling 2022-01-08 16:58:57 +01:00
Michael Steenbeek 6d19c983e8
Normalise RCT12TileElementType 2021-12-18 19:43:30 +01:00
Duncan 8e1fd54c5a
Rename type and add static assert from review (#16247) 2021-12-15 05:56:43 +00:00
spacek531 35d4410fb5
Remove VAR_CF union and fix mini golf mistake (#16216) 
Mistake in mini golf implementation meant that the brake_speed (var_cf) was being set from the seat rotation instead of the booster brake speed. Mini golfs do not use seat rotations or booster brakes but for consistency reasons this has been fixed anyway.
 2021-12-14 07:25:36 +00:00
ζeh Matt 16635b9192
Implement custom BitSet and replace std::bitset 2021-12-12 23:47:17 +02:00
Duncan 3deaa1af2e
Fix #16197: Park award time and type accidentally swapped 2021-12-12 11:20:17 +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
ζeh Matt cec30e093d
Merge pull request #15991 from ZehMatt/refactor/bannerid 
Use TIdentifier for BannerIndex
 2021-12-11 08:08:27 -08:00
Duncan 6dc1efde82
Make awards a vector (#16134) 
* Make awards a vector

* Fix compiler and use one less branch
 2021-12-11 14:45:50 +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
Gymnasiast 50c0080da8
Update calls to ClearAs() 2021-12-10 22:58:27 +01:00
Michael Steenbeek 2d1af0ec42
Replace many GetType() calls with GetTypeN() 2021-12-10 22:43:17 +01:00
Michael Steenbeek ea099c0d2d
Merge pull request #16129 from Gymnasiast/refactor/normalised-tile-element-type 
Part of #15485: Use normalised tile element type enum for setting type
 2021-12-07 11:50:54 +01:00
Duncan c01049a500
Only add RCT1 land objects to imported SV6 if they are used 2021-12-05 17:08:33 +01:00
Gymnasiast 91635a5047
Replace SetType and old strong enum with normalised 2021-12-05 13:54:01 +01:00
ζeh Matt 810521bd5b
Remove BANNER_INDEX_NULL 2021-12-01 14:41:59 +02: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 cc22b584fd
Introduce RCT2 namespace (#16037) 
* Introduce RCT2 namespace

* Drop RCT2:: prefix where possible

* Drop RCT2 from structure names

* Reduce header includes
 2021-11-28 16:51:38 +00: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
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 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
Ted John 065cf80ae6 Fix multiple surface tiles created when importing SV4 2021-11-21 23:51:42 +00:00
Gymnasiast bbfa1b67e4
Fix determining map size for S4 2021-11-21 22:43:23 +01:00
duncanspumpkin d31f658368
Prevent import of tiles outsized of map boundaries 2021-11-21 22:43:23 +01:00
Ted John 0e57643a68
Refactor TilePointerIndex 2021-11-21 22:43:23 +01:00
Ted John c4b4595708
Fix importing maps containing 255 height elements 2021-11-21 22:43:23 +01:00
duncanspumpkin f8091a462e
Fix scenery group set research status import 
There were a lot of small issues that compounded into making this bug occur
 2021-11-21 22:43:22 +01:00
IntelOrca 34128dc262
Add new .park save format 
Co-authored-by: Gymnasiast <Gymnasiast@users.noreply.github.com>
Co-authored-by: duncanspumpkin <duncanspumpkin@users.noreply.github.com>
Co-authored-by: ZehMatt <Zehmatt@users.noreply.github.com>
Co-authored-by: Broxzier <Broxzier@users.noreply.github.com>
 2021-11-21 22:43:22 +01:00
Duncan 5d2a56525f
Refactor min max cars per train from nsf (#15911) 2021-11-14 20:58:44 +00:00