mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
17,158 Commits 8 Branches 40 Tags 362 MiB
Commit Graph

4677 Commits

Author SHA1 Message Date
Duncan 3da62e4697
Refactor of Peep Update Action (#9793) 
* Change the parameters of UpdateAction

* Use std::optional to make things a bit safer

* Use the core optional header to keep xcode happy
 2019-08-15 18:32:19 +01:00
kennycastro007 9708e3a043 Fixed issue #8376 (#9866) 
#8376: Added static function show_error in S6Importer.cpp
 2019-08-15 16:02:03 +02:00
Ted John 495a756e66
Merge pull request #9872 from IntelOrca/object-download-source 
Show the object download source when downloading object files
 2019-08-14 16:20:45 +01:00
Ted John 401ec9e19f Update backtrace token 2019-08-13 18:35:37 +01:00
Ted John 8f917a2590 Show the object download source when downloading object files 2019-08-13 18:32:32 +01:00
Ted John 42e1f35874 Fix #9864: Diagonal track cannot be built 2019-08-12 23:09:17 +01:00
Matt cc6321048f
Refactor window_invalidate to use rct_window::Invalidate 2019-08-11 17:22:00 +02:00
Matt 2053ecb688
Refactor window_scroll_to_viewport to use rct_window::ScrollToViewport 2019-08-11 17:22:00 +02:00
Matt b046d45c01
Refactor window_set_location to use rct_window::SetLocation 2019-08-11 17:21:56 +02:00
Duncan c677a9681a
Merge pull request #9840 from duncanspumpkin/fountian_refactor 
Refactor fountain to use CoordsXY(Z)
 2019-08-11 12:47:01 +01:00
duncanspumpkin d7a725f1d5 Refactor fountain to use CoordsXY(Z) 2019-08-11 07:21:07 +01:00
Ted John 68dc4d0fb8 Bump network version to deprecate recent bugged versions 2019-08-10 15:24:59 +01:00
Ted John d730a76809 Fix #9844: Guests can't enter park 2019-08-10 15:22:03 +01:00
Ted John 132a1916d6
Fix #9832: Access violation in ride_measurement_update (#9842) 
We can not store a ride pointer in ride measurement as rides are now stored in a vector which means their addresses can change when rides are constructed / removed.
 2019-08-10 15:14:22 +01:00
Ted John 60db202ea7 Return nullptr in get_sprite if out of range 2019-08-10 12:18:51 +01:00
duncanspumpkin 996cbdec02 Correctly input num_holes, inversions 2019-08-09 20:43:03 +01:00
duncanspumpkin d145f93c0b Clang format 2019-08-09 20:43:03 +01:00
duncanspumpkin 2e24dc1f00 Fix large scenery mirror rotation 2019-08-09 20:43:03 +01:00
duncanspumpkin af31404472 Use std::string and cleanup unused functions 
Use CoordsXY for save pop scenery functions

Use CoordsXY for push save scenery functions

Further refactoring to use coordsxy and standard functions
 2019-08-09 20:43:03 +01:00
duncanspumpkin e9b59064e0 Fix code and clang format. Delete dead code. 
Use correct TD4 checksum for vanilla TD4's.

Simplified the code for version detection since checksum numbers do not match up to a version

Fix TD4 imports.

Oh yeah TD4 doesn't have scenery or entrances

Move track related structs to correct files
 2019-08-09 20:43:02 +01:00
duncanspumpkin 54d6722bf2 Link everything together 2019-08-09 20:40:35 +01:00
duncanspumpkin 16022a8b57 Remove dead code 2019-08-09 20:39:54 +01:00
duncanspumpkin 02d552e048 Create td4 importer 2019-08-09 20:39:54 +01:00
duncanspumpkin af92dcba3e Creating t6 exporter 2019-08-09 20:39:54 +01:00
duncanspumpkin e3c63b762e Create new TrackDesign format 2019-08-09 20:39:53 +01:00
Ted John f87b97cda4 Fix formatting 2019-08-09 19:03:59 +01:00
Ted John 6dcedf7f57 Fix #9813: Crashes on loaded save game 
Because ride bool array was not passed by reference, game though all rides had no track and reset their type on export.
 2019-08-09 18:39:47 +01:00
Ted John 9954f0b725
Add nullptr checks for more instances of get_ride (#9819) 2019-08-09 14:20:59 +01:00
Ted John 93789b9034
Add nullptr checks for get_ride in libopenrct2ui (#9795) 2019-08-09 08:06:25 +01:00
Ted John ab7b17fc4e
Add nullptr checks for get_ride in libopenrct2 (#9788) 2019-08-08 22:58:56 +01:00
ζeh Matt df4e412826 Fix #9762: Update network logic also from title screen (#9773) 2019-08-08 16:49:30 +01:00
Ted John 7fd4fd0c2a
Fix #9179: Crash when modifying a ride occasionally (#9756) 
Add lots of nullptr and tile element checks in the ride_modify call chain.
 2019-08-08 12:59:06 +01:00
Ted John 08677a3322 Fix #9761: invalid read in ride_measurement_update 2019-08-08 12:55:14 +01:00
Ted John 53f228fc33 Fix #9769: NRE in sub_6A4101 2019-08-08 12:45:17 +01:00
Ted John 379047cf43 Fix #9765: NRE in news_item_get_subject_location 2019-08-08 12:39:10 +01:00
Ted John 2cfad1fc66 Fix #9764: NRE in ride_entrance_exit_paint 2019-08-08 12:37:53 +01:00
Ted John 601780722f Fix #9760: NRE in ride_ratings_begin_proximity_loop 2019-08-08 12:36:12 +01:00
Duncan 659b4d8f9f
Clean up some litter in the codebase (#9753) 
13CA740 and 141F568 have been doing mostly nothing since the game action refacotr. Before that they didn't do much as I've never found any instance where the code was hit.
 2019-08-08 06:05:58 +01:00
Duncan 75210ef3e2
Merge pull request #9742 from duncanspumpkin/fix_9729 
Fix 9729
 2019-08-08 06:02:08 +01:00
ζeh Matt 12854d8743
Merge pull request #9731 from ZehMatt/fix-9666 
Fix #9666: pause server if no clients are connected
 2019-08-08 01:31:43 +02:00
Ted John cbb1bf9289 Fix #9752: window_close from ride construction window causes a crash 
Re-obtain iterator after calling window close event as close event may open / close other windows.
 2019-08-07 23:20:50 +01:00
Ted John b17e9b1b18 Fix #9755: Crash when importing ride measurement for null ride 2019-08-07 23:11:11 +01:00
Ted John 746d784b0e Fix placing track designs when ride 0 is not allocated 2019-08-07 21:25:28 +01:00
Ted John cd4eb86a7c
Merge pull request #9725 from IntelOrca/refactor/ride-manager 
Refactor ride list
 2019-08-07 21:03:17 +01:00
duncanspumpkin ad06491d21 Abstract the common score generator 2019-08-07 20:35:20 +01:00
Ted John 16a2046032 Fix #9745: CJK characters are broken in ride names 2019-08-07 12:34:05 +01:00
duncanspumpkin 2557e373db Increment network version 2019-08-06 21:29:08 +01:00
duncanspumpkin 8ba5b43636 Fix #9729. Change peep pathfinding to take entrance height into account 
When choosing which entrance to head to peeps would not take into account the height difference between the locations. This caused peeps to choose badly especially when useing lift transport rides.
 2019-08-06 21:28:34 +01:00
ζeh Matt dac99b5a13
Merge pull request #9738 from ZehMatt/fix-9727 
Fix #9727: Crash when multiple windows are closed during close events
 2019-08-06 19:44:23 +02:00
Matt 4f6dbd6496
Fix #9727: Crash when multiple windows are closed during close events 2019-08-06 17:08:10 +02:00
Matt 180e50b0ad
Fix #9730: Ghost footpath not getting removed 2019-08-06 16:29:09 +02:00
Matt 8670385505
Bump up network version 2019-08-06 00:49:37 +02:00
Matt 01de097ef0
Fix #9666: pause server if no clients are connected 2019-08-06 00:49:37 +02:00
duncanspumpkin e3d79e7600 Increment network version 2019-08-05 20:20:24 +01:00
0cufox0 b4e0df2e5f Fix review issues and formatting 2019-08-05 20:19:57 +01:00
0cufox0 8e33619b63 Refactor LargeSceneryRemoveAction 2019-08-05 20:18:01 +01:00
0cufox0 a2189135c5 Refactor MazeSetTrackAction 2019-08-05 20:18:01 +01:00
0cufox0 058b749607 Refactor PlaceParkEntranceAction 2019-08-05 20:18:01 +01:00
0cufox0 2311501de1 Refactor RideSetColourSchemeAction 2019-08-05 20:18:01 +01:00
0cufox0 5cd8541a1c Refactor smalSceneryRemoveAction 2019-08-05 20:17:57 +01:00
0cufox0 0320f195e3 refactor wallRemoveAction 2019-08-05 19:52:47 +01:00
ζeh Matt 7730b35d82
Merge pull request #9571 from ZehMatt/replay-cleanup 
Replay cleanup
 2019-08-05 18:31:03 +02:00
Ted John cbc74a3c51 Fix GetOrAllocateRide 2019-08-04 20:44:11 +01:00
Ted John f49447bed5 Fix compile errors 2019-08-04 17:47:16 +01:00
Ted John a57a4f2059 Fix #9724: Park/Ride entrance/exit sign's colour is weird 2019-08-04 17:04:12 +01:00
Ted John 8022211112 Refactor guest ride consideration 2019-08-04 16:44:17 +01:00
Ted John a863c7ae50 Remove rest of FOR_ALL_RIDES instances 2019-08-04 16:44:17 +01:00
Ted John e23638548a Reduce use of MAX_RIDES and RIDE_TYPE_NULL 2019-08-04 16:44:17 +01:00
Ted John 414b53b56d Remove ride classifications 2019-08-04 16:43:50 +01:00
Ted John a3fe00f0a3 Refactor ride list to a manager with iterator 2019-08-04 16:43:50 +01:00
Michael Steenbeek 073e4b0ccc
Fix #7690: Problem with guests freezing on certain tiles of path (#9723) 2019-08-04 17:19:40 +02:00
Ted John c3234b1442 Refactor map animations and dynamically create on park load (#9705) 2019-08-03 22:18:33 +02:00
Ted John 1a6e5b5548 Fix #9680: invalid-read in ride_entry_get_supported_track_pieces (#9681) 2019-08-03 19:55:24 +02:00
Ted John b7121553b4 Fix #9715: large scenery banners have incorrect colour and scrolling (#9716) 2019-08-02 21:18:42 +02:00
Ted John fcc41b4647 Fix #9701: GetRideEntry nullptr can cause stack overflow (#9702) 
GetName calls GetRideEntry so we can't log the name of the ride. I don't think the log is necessary as we now assume rides can have a null ride entry and all callers should check for this.
 2019-08-01 23:42:39 +02:00
Ted John e4ba170c87 Fix #9699: Crash when error message is shown for custom named ride 
Increase size of error string format argument buffer so that the ride name arguments fit.
 2019-08-01 17:22:28 +01:00
Michael Steenbeek 9236f5f10b
Merge pull request #9697 from jgottula/refactor/9676 
Refactor #9676: Ride Ratings Refactoring
 2019-08-01 11:03:05 +02:00
Michael Steenbeek c1fa86a843
Merge pull request #9623 from IntelOrca/refactor/remove-user-strings 
Remove user string pool
 2019-08-01 11:00:21 +02:00
Justin Gottula a28c5f947d Refactor #9676: Replace local var BP offset names with meaningful ones 2019-07-31 15:23:42 -07:00
Justin Gottula a9469b27cc Refactor #9676: Replace local var register names with meaningful ones 2019-07-31 15:23:38 -07:00
Justin Gottula f9c1b65356 Refactor #9676: Apply appropriate style casing to existing variables 2019-07-31 15:14:27 -07:00
Justin Gottula 594a220da2 Refactor #9676: Use std::clamp in place of std::min/std::max pair 2019-07-31 14:50:17 -07:00
Justin Gottula ae87f5037a Refactor #9676: Use compound assignment operators for trivial cases 2019-07-31 14:42:04 -07:00
Ted John b3531624a1 Fix saving of banner frame colour 2019-07-30 18:27:50 +01:00
Ted John 1f9f48e054 Fix flickering banners 2019-07-29 21:41:21 +01:00
Ted John af5daaec70 Fix importing and exporting of banner strings containing colour 2019-07-29 21:20:22 +01:00
Ted John 7287b8cf1a Fix formatting 2019-07-29 20:40:25 +01:00
Ted John 85e63cbe3b Do not include name in peep checksum 2019-07-29 20:21:02 +01:00
Ted John f539fdd79c Convert user strings to RCT2 encoding when exporting to S6 2019-07-29 20:01:49 +01:00
Ted John 7ce2f38c92 Fix formatting 2019-07-29 20:01:49 +01:00
Ted John 5af3bbf971 Fix compile errors 2019-07-29 20:01:49 +01:00
Ted John d28799ef18 Remove user strings 2019-07-29 20:01:37 +01:00
Duncan 77f1905271
Fix #8136. Fix incorrect calculation of excessive lateral G penalty. (#9667) 
* Fix #8136. Fix incorrect calculation of excessive lateral G penalty.

This penalty had been modified for OpenRCT2 moving it from before certain other penalties were applied to after. The move accidently removed the ride type multiplier which caused a very large penalty to be applied. In addition the excitement penalty applied to the whole calculation instead of just the gforce bonus. This caused an excessive penalty to the excitement.

* Add changelog entry. Fix default initilisation.

* Increment network version
 2019-07-29 19:35:04 +01:00
Ted John 767b3c8328 Build up the user string list and export in one go 2019-07-29 19:18:16 +01:00
Ted John 40d49b93d3 Do not use user strings for peep names 2019-07-29 19:18:16 +01:00
Ted John 61d64ab8c5 Do not use user strings for banners 2019-07-29 19:18:16 +01:00
Ted John 300ce9727e Protect against nullptr 2019-07-29 19:18:16 +01:00
Ted John eb4c9acb08 Fix compile errors and ride entry null edge case 2019-07-29 19:18:16 +01:00
Ted John 1d4c1958dd Do not allow duplicate ride names 2019-07-29 19:18:16 +01:00
Ted John f8b08b334e Fix a few more bugs 2019-07-29 19:18:16 +01:00