1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 06:44:38 +01:00
Commit Graph

4551 Commits

Author SHA1 Message Date
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
Ted John
3f8890afde Fix remaining errors and a few bugs 2019-07-29 19:18:16 +01:00
Ted John
3f45976009 Fix openrct2ui errors 2019-07-29 19:18:16 +01:00
Ted John
3155c661fa Refactor format peep action 2019-07-29 19:18:16 +01:00
Ted John
6fff2079f9 Refactor ride name to dynamic args and std::string 2019-07-29 19:18:16 +01:00
Ted John
3ee7824df4 Fix #9678: Korean scenario name is not saved (#9679) 2019-07-29 19:17:49 +01:00
Jim Armstrong
a432a8a514 Fix #9487: Access violation in UpdateRideEnterVehicle (#9577)
* Fix #9487: Implement nullptr checks

Implemented nullptr checks for the ride and vehicle variables
in UpdateRideEnterVehicle()
2019-07-29 18:07:21 +01:00
Ted John
0315c9b741 Add lots of guards to track block get next / previous (#9661) 2019-07-29 16:37:51 +01:00
Michał Janiszewski
83e26804e5 Limit scrolling text colour to valid options (#9639) 2019-07-27 14:23:34 +02:00
Ted John
0b4d989a67 Rename get_banner to GetBanner 2019-07-26 17:24:19 +01:00
Ted John
3bff25ab22 Use TileCoordsXY 2019-07-26 17:14:09 +01:00
Ted John
5c07c53faf Refactor get banner 2019-07-25 22:21:19 +01:00
Ted John
85543bd1c8 Separate RCT2 and OpenRCT2 banner struct 2019-07-25 22:21:19 +01:00
Duncan
9b4f8a6b4b Merge pull request #9451 from ZehMatt/refactor/sprite-create-untangle
Refactor create_sprite
2019-07-25 06:50:57 +01:00
Michael Steenbeek
e5ed5568a8 Remove conversion from UTF-8 to widechar and back again (#9637) 2019-07-24 21:56:49 +02:00
Matt
f3638ca858 Address code review 2019-07-24 18:12:25 +02:00
Matt
3395079737 Remove NUM_SPRITE_LISTS macro and replace with SPRITE_LIST_COUNT for consistency 2019-07-24 17:53:54 +02:00
Matt
98a17fe8d9 Refactor create_sprite and remove unnecessary move_sprite_to_list 2019-07-24 17:53:51 +02:00
Michał Janiszewski
837879018f Make socket status atomic (#9636)
* Make socket status atomic

`TcpSocket::ConnectAsync` will call `Connect` and modify `_status` from
a different thread and must ensure it doesn't introduce a data race.

* Update src/openrct2/network/Socket.cpp

Co-Authored-By: ζeh Matt <m.moninger.h@gmail.com>
2019-07-24 15:05:26 +02:00
Ted John
a1d9e52046 Rename ToUtf16 to ToWideChar
This is more correct as wchar_t size can differ, for example Linux typically uses 32 bits for wchar_t where as Windows uses 16 bits.
2019-07-22 23:44:03 +01:00
Ted John
6f61c94dbd Remove old widechar <-> utf-8 conversion function 2019-07-22 23:44:03 +01:00