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

1285 Commits

Author SHA1 Message Date
lawrence 4c14d38325
Fix #16308: Use void* on Android and Any on other platforms 2022-03-28 20:38:33 +02:00
lawrence 5f417987bc
Fix #16308: Crash when trying to place down a ride on Android 2022-03-28 20:38:08 +02:00
Duncan 36e1a10431
Revert some of #16477 and fix scenery costs (#16877) 
Split up supports and clearance costs

Add notes
 2022-03-25 21:47:19 +00:00
Duncan ba8690d970
Move *10 on removal/price to the object load function (#16846) 
This simplifies the code and ensures that money32/16 is at the same base for all users of these objects
 2022-03-22 21:35:44 +00:00
Ted John fc2ed95641
Merge pull request #16831 from IntelOrca/feature/ternary-scenery-colours 
Implement tertiary colours for small and large scenery objects.
 2022-03-20 19:24:47 +00:00
Ted John 793acf67ae Implement small scenery ternary colours 2022-03-20 18:53:11 +00:00
Michael Steenbeek e78c29ea5c
Fix most occurrences of ‘ternary’ (#16832) 2022-03-20 19:22:05 +01:00
Ted John e9e377ac09 Implement large scenery ternary colours 2022-03-20 18:12:39 +00:00
Charles Machalow e27d5f154b
Add parameters to accept for StaffFireAction (#16816) 
* Add parameters to accept for StaffFireAction

* Bump plugin api version

* Update src/openrct2/actions/StaffFireAction.cpp

Co-authored-by: Ted John <ted@brambles.org>

Co-authored-by: Ted John <ted@brambles.org>
 2022-03-20 08:59:57 -03:00
Ted John f8224150d5 Validate patrol area location 2022-03-12 10:43:41 +00:00
Ted John 38d36acef3 Add patrol area tool window 2022-03-12 10:43:41 +00:00
Ted John 90718ca81c Refactor patrol area class to new file 2022-03-11 18:39:04 +00:00
Bas 078078416b Replace all 'cars_per_flat_ride' 0xFF with 'NoFlatRideCars' 2022-03-04 20:21:15 +01:00
Bas d239529a73 Fix “Disable vehicle limits” cheat giving all new rides 32 trains 2022-03-03 22:26:33 +01:00
Duncan 66b8f283eb
Rename flag and reorg ghost remove flags (#16734) 2022-02-27 22:39:55 +00:00
Silent 795144662a
Fix #11752: Track pieces with fractional cost are too cheap to build (#16477) 
Fixes an inconsistency wuth RCT2 where track prices with a fractional part
did not have their price rounded up when building, but did when refunding.
This created an exploit where refunding such a track piece granted the player
0.50€ more than they spent on the piece.
 2022-02-19 17:47:13 +00: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
Michael Steenbeek 5edc561715
Close #11437: Migrate old platform methods 2022-02-18 21:57:00 +01:00
ζeh Matt 0a67426799
Add MAX_ENTITIES check in PeepPickupAction 2022-02-17 18:40:18 +02:00
ζeh Matt d7f5003943
Introduce EntityId and refactor everything 2022-02-16 18:56:39 +02:00
Ted John 3d2420c86c More code review changes 2022-02-14 23:15:59 +00:00
Ted John 454bfb0a8f Refactor map size to allow for rectangle maps 2022-02-14 23:15:59 +00:00
Gymnasiast 49ccc21d84
Fix #16576: Cannot select vehicle types with entry index >= 256 2022-02-12 20:43:45 +01:00
ζeh Matt c0474d2d27
Merge pull request #16466 from ZehMatt/refactor/identifier-rideid 
Use TIdentifier for RideId
 2022-02-12 11:23:54 -08:00
ζeh Matt f4d105f843
Remove NetworkRideId 2022-02-12 18:11:18 +02: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
Michael Steenbeek f0ee220ec6
Fix messages [ci skip] 
Co-authored-by: pizza2004 <chad@neejean.org>
 2022-02-12 12:28:37 +01:00
Gymnasiast 635a6507eb
Fix #16572: Refactor error made in #15403 2022-02-12 00:43:32 +01: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
ζeh Matt dea22ad951
Refactor RideCreateAction to pass entrance object explicitly 2022-01-29 17:07:31 +02:00
ζeh Matt 383412252c
Only modify gLastEntranceStyle for the callee of the game action 2022-01-29 16:42:27 +02:00
ζeh Matt 993b168bfd
Implement profiler (#16194) 
* Implement profiling API

* Add console commands for the profiler

* Remove accidental line

* Correct csv output

* Add copyright notice

* Add missing override

* Add default virtual destructor

* Explicitly pass template argument

* Use static

* Add plugin API for profiler

* Add more profile calls

* Workaround for GCC hopefully

* Add missing static keyword

* Use uint64 for call count

* Reduce name length see if CI passes

* Improve handling of function names

* Work around (broken) static inline variables

* Fix missing include

* Disable profiler for clang 5 and older

* Update copyright date

* Profile UpdateAllMiscEntities

* Apply review suggestions

Co-authored-by: Ted John <ted@brambles.org>
 2022-01-18 20:21:20 +02:00
GalBr fae4e6323f
Fix #16234: Wrap vehicle colors when there are more than 32 trains (#16323) 
* Wrap vehicle_colours in TrackDesignAction

* Wrap the color presets in set_vehicle_colours_to_random_preset

* Increment network version

* Update changelog.txt

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2022-01-08 19:03:58 -03:00
frutiemax adb692b74e Forward declare Formatter 2021-12-30 12:17:51 -05:00
Gal B 367fcaad3c Refactor MazeGetSegmentBit to use const CoordsXY& 2021-12-22 18:48:37 +02:00
Gal B 343f9bbca0 Refactor maze_set_track to use const CoordsXYZD& 2021-12-22 18:48:37 +02:00
Gymnasiast ef6f2cceee
Create RideConstruction.h 2021-12-18 20:27:13 +01:00
Duncan 3572c3f466
Fix #16201: Rides don't get properly deleted when you remove them (#16236) 
* Fix #16201. Remove all tracks on a tile when demolishing

* Bump network version
 2021-12-14 12:37:35 +00:00
Gymnasiast 9b81bacecd
Move ride_remove_peeps() to method 2021-12-12 12:31:19 +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
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
ζeh Matt a79e2a375a
Move staff_set_name to Staff 2021-12-03 17:40:27 +02:00
Duncan 79b12d2953
Introduce DATLimits.h for RCT2 Dat file object limits (#16034) 2021-12-01 21:55:52 +00:00
ζeh Matt ad5e54460f
Merge pull request #16062 from ZehMatt/refactor/map-iterators 
Refactor tile map iterations
 2021-12-01 06:16:39 -08:00
ζeh Matt 810521bd5b
Remove BANNER_INDEX_NULL 2021-12-01 14:41:59 +02:00
ζeh Matt 3563d89e58
Add TIdentifier specialization to GameAction visitor 2021-12-01 14:41:59 +02:00
Michael Steenbeek fb9d02cab5
Fix #15998: Map action only accepts 998×998 instead of 999×999 2021-11-30 21:27:46 +01:00
ζeh Matt be5d6ac3db
Fix the loops 2021-11-29 14:12:26 +02:00
ζeh Matt 56425b33e4
Refactor iterating over all map tiles in RideDemolishAction 2021-11-29 12:59:36 +02: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 c4ad5fcd15
Adjust includes 2021-11-26 21:01:44 +02: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
Duncan 2b4eaab5dc
Modify TrackPlaceAction to handle ride type parameter (#15980) 
* Modify TrackPlaceAction to handle ride type parameter

* Update network and plugin version

* Update replays
 2021-11-25 12:28:30 +00:00
Peter Schussheim 0495b265c0
Refactor unchecked std::array subscript operator 2021-11-25 10:13:20 +01:00
ζeh Matt 0024252328
Fix includes 2021-11-24 17:19:52 +02: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
ζeh Matt 422c4629e4
Fix BannerSetStyleAction having wrong type in constructor 2021-11-22 19:29:17 +02: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
ζeh Matt d80612dfe4
Update date 2021-11-11 16:25:46 +02:00
ζeh Matt 55af69813a
Ensure registration is never out of bounds with static_assert 2021-11-11 16:23:50 +02:00
ζeh Matt f491c97734
Refactor game action registry initialization and make it constexpr 2021-11-11 16:16:52 +02:00
ζeh Matt c7fa1b44e9
Pass name during registration and minor cleanup 2021-11-11 15:50:01 +02:00
ζeh Matt 96e2641d0d
Remove macro for registration and cleanup 2021-11-10 19:42:23 +02:00
ζeh Matt 91d6338db5
Remove unused overload of SetCallback (#15885) 2021-11-10 14:03:34 +00:00
ζeh Matt d1e5a5d977
Refactor last uses of place_virtual_track 2021-10-29 02:06:59 +03:00
ζeh Matt 322e1203fc
Fix error message for WallPlaceAction 2021-10-28 21:26:07 +03:00
ζeh Matt 45c4ed2679
Fix error messages for when map_is_location_owned is false 2021-10-28 21:20:42 +03: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
ζeh Matt acef8a592a
Apply review suggestion 2021-10-27 19:50:08 +03:00
ζeh Matt 3bb86ebcfa
Refactor explicit constructor usage in LandSmoothAction 2021-10-27 04:32:07 +03:00
ζeh Matt 12a200abfe
Refactor explicit constructor usage in SetCheatAction 2021-10-27 04:32:07 +03:00
ζeh Matt 3b8486ed4a
Refactor explicit constructor usage in WallPlaceAction 2021-10-27 04:32:07 +03:00
ζeh Matt 89cca5cb32
Refactor explicit constructor usage in TrackRemoveAction 2021-10-27 04:32:07 +03:00
ζeh Matt d9222ab063
Refactor explicit constructor usage in RideDemolishAction 2021-10-27 04:32:07 +03:00
ζeh Matt 72b59445ad
Refactor explicit constructor usage in RideSetPriceAction 2021-10-27 04:32:07 +03:00
ζeh Matt 5c964d7fe8
Refactor explicit constructor usage in RideEntranceExitPlaceAction 2021-10-27 04:32:06 +03:00
ζeh Matt d8a255562a
Refactor explicit constructor usage in WaterSetHeightAction 2021-10-27 04:32:06 +03:00
ζeh Matt a4e5a92c54
Refactor explicit constructor usage in WaterRaiseAction 2021-10-27 04:32:06 +03:00
ζeh Matt 84acdba0f0
Refactor explicit constructor usage in WaterLowerAction 2021-10-27 04:32:06 +03:00
ζeh Matt 2702b2641f
Refactor explicit constructor usage in ScenarioSetSettingAction 2021-10-27 04:32:06 +03:00
ζeh Matt 8e80a74daa
Refactor explicit constructor usage in WallSetColourAction 2021-10-27 04:32:06 +03:00
ζeh Matt 2c38d3b180
Refactor explicit constructor usage in RideSetVehicleAction 2021-10-27 04:32:06 +03:00
ζeh Matt adbad84cc5
Refactor explicit constructor usage in SurfaceSetStyleAction 2021-10-27 04:32:05 +03:00
ζeh Matt ab248a67df
Refactor explicit constructor usage in TrackSetBrakeSpeedAction 2021-10-27 04:32:05 +03:00
ζeh Matt 60838f563e
Refactor explicit constructor usage for TileInspector 2021-10-27 04:32:05 +03:00
ζeh Matt fc489452ab
Refactor explicit constructor usage in RideSetSettingAction 2021-10-27 04:32:05 +03:00
ζeh Matt 86a07d7f48
Refactor explicit constructor usage in StaffSetPatrolAreaAction 2021-10-27 04:32:05 +03:00
ζeh Matt 6600f813de
Refactor explicit constructor usage in StaffSetCostumeAction 2021-10-27 04:32:05 +03:00
ζeh Matt 219d49aee1
Refactor explicit constructor usage in StaffSetOrdersAction 2021-10-27 04:32:04 +03:00
ζeh Matt 931b7f628d
Refactor explicit constructor usage in StaffSetNameAction 2021-10-27 04:32:04 +03:00
ζeh Matt d006a1f488
Refactor explicit constructor usage in SmallScenerySetColourAction 2021-10-27 04:32:04 +03:00
ζeh Matt 5a237bd663
Refactor explicit constructor usage in StaffSetColourAction 2021-10-27 04:32:04 +03:00
ζeh Matt cce3609c75
Refactor explicit constructor usage in LandRaiseAction 2021-10-27 04:32:04 +03:00
ζeh Matt d1c79e63f5
Refactor explicit constructor usage in StaffFireAction 2021-10-27 04:32:04 +03:00
ζeh Matt 76114bca2f
Refactor explicit constructor usage in SmallSceneryRemoveAction 2021-10-27 04:32:03 +03:00
ζeh Matt d99c6641e7
Refactor explicit constructor usage in LandSetHeightAction 2021-10-27 04:32:03 +03:00
ζeh Matt 1acbf14985
Refactor explicit constructor usage in SignSetStyleAction 2021-10-27 04:32:03 +03:00
ζeh Matt 18eaada85b
Refactor explicit constructor usage in SetParkEntranceFeeAction 2021-10-27 04:32:03 +03:00
ζeh Matt 8f9ad4743d
Refactor explicit constructor usage in FootpathPlaceAction 2021-10-27 04:32:03 +03:00
ζeh Matt 4fe71f3b45
Refactor explicit constructor usage in LargeSceneryPlaceAction 2021-10-27 04:32:03 +03:00
ζeh Matt effc6f4413
Refactor explicit constructor usage in FootpathRemoveAction 2021-10-27 04:32:03 +03:00
ζeh Matt 1660a5080b
Refactor explicit constructor usage in RideSetColourSchemeAction 2021-10-27 04:32:02 +03:00
ζeh Matt bb149d471c
Refactor explicit constructor usage in RideSetAppearanceAction 2021-10-27 04:32:02 +03:00
ζeh Matt 4a408821fd
Refactor explicit constructor usage in RideEntranceExitPlaceAction 2021-10-27 04:32:02 +03:00
ζeh Matt 33b18309cb
Refactor explicit constructor usage in ParkMarketingAction 2021-10-27 04:32:02 +03:00
ζeh Matt 1014c84620
Refactor explicit constructor usage in RideEntranceExitRemoveAction 2021-10-27 04:32:02 +03:00
ζeh Matt 586147c8dc
Refactor explicit constructor usage in FootpathPlaceFromTrackAction 2021-10-27 04:32:02 +03:00
ζeh Matt 6bfefc1cbd
Refactor explicit constructor usage in PeepPickupAction 2021-10-27 04:32:01 +03:00
ζeh Matt 4429bce005
Refactor explicit constructor usage in ParkSetResearchFundingAction 2021-10-27 04:32:01 +03:00
ζeh Matt ea6d2f6b65
Refactor explicit constructor usage in ParkSetParameterAction 2021-10-27 04:32:01 +03:00
ζeh Matt 9f4f1136ed
Refactor explicit constructor usage in ParkSetDateAction 2021-10-27 04:32:01 +03:00
ζeh Matt c4465464b6
Refactor explicit constructor usage in BannerSetColourAction 2021-10-27 04:32:01 +03:00
ζeh Matt 59a752bb15
Refactor explicit constructor usage in LargeScenerySetColourAction 2021-10-27 04:32:01 +03:00
ζeh Matt 16a30c13a3
Refactor explicit constructor usage in BannerRemoveAction 2021-10-27 04:32:00 +03:00
ζeh Matt cd7d5a0b40
Refactor explicit constructor usage in ParkEntranceRemoveAction 2021-10-27 04:32:00 +03:00
ζeh Matt d44bb21d97
Refactor explicit constructor usage in BannerSetStyleAction 2021-10-27 04:32:00 +03:00
ζeh Matt c4ea5732ea
Refactor explicit constructor usage in LargeSceneryRemoveAction 2021-10-27 04:32:00 +03:00
ζeh Matt f207ad4f64
Refactor explicit constructor usage in FootpathAdditionRemoveAction 2021-10-27 04:32:00 +03:00
ζeh Matt 520053a9ff
Refactor explicit constructor usage in LandLowerAction 2021-10-27 04:32:00 +03:00
ζeh Matt a9d9fd5f4f
Refactor explicit constructor usage in FootpathAdditionPlaceAction 2021-10-27 04:31:59 +03:00
ζeh Matt f8d9b0a2f9
Refactor explicit constructor usage in GuestSetNameAction 2021-10-27 04:31:59 +03:00
ζeh Matt fe3d3bdb3f
Refactor explicit constructor usage in GuestSetFlagsAction 2021-10-27 04:31:59 +03:00
ζeh Matt fcce046a48
Refactor explicit constructor usage in BannerPlaceAction 2021-10-27 04:31:59 +03:00
ζeh Matt cad2f42703
Refactor explicit constructor usage in BalloonPressAction 2021-10-27 04:31:59 +03:00
ζeh Matt 43608c807c
Make construction of GameActions::Result explicit 2021-10-27 04:31:59 +03:00
ζeh Matt 31239e3941
Refactor result passing on ConstructClearResult 2021-10-21 19:26:17 +03:00
ζeh Matt 7a30169c28
Refactor out construction clearance into a new compilation unit 2021-10-20 22:21:54 +03:00
ζeh Matt ea0b8840ac
Merge pull request #15610 from ZehMatt/refactor/stringvariant 
Replace StringVariant with std::variant
 2021-10-20 10:46:42 -07:00
Michael Steenbeek 578d8ce247
Fix #15612: Crash in WallCheckObstruction() 2021-10-20 14:15:35 +00:00
ζeh Matt 5bf3513156
Default initialize ErrorTitle and ErrorMessage with STR_NONE 2021-10-20 16:35:58 +03:00
ζeh Matt 7fc49fca39
Replace StringVariant with std::variant 2021-10-20 16:35:58 +03:00
ζeh Matt 8e06d84a09
Refactor result passing of TrackDesignAction 2021-10-20 16:08:21 +03:00
ζeh Matt e06f9c3ee7
Refactor result passing of TrackPlaceAction 2021-10-20 14:15:24 +02:00
ζeh Matt 2d78a5efc3
Move GameActionResult into its own unit (#15588) 2021-10-19 17:50:24 -03: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
Michał Janiszewski 1b4875e528 Extract math-related functions from common.h to Math.hpp 
Saves wide inclusion of <stdexcept> header, which pulls in <string>
 2021-10-09 21:43:06 +02:00
Michał Janiszewski b8c751e300 Drop some unnecessary includes 2021-10-09 21:30:24 +02:00
Duncan fd18ac7f85
Modify StaffSetPatrolAreaAction to have three modes (#15494) 
* Modify StaffSetPatrolAreaAction to have three modes

* Actually serialise mode

* Apply review comments

* Increment network version

* Apply review comment

* Update replay
 2021-10-07 18:02:24 +01:00