1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 22:34:33 +01:00
Commit Graph

18244 Commits

Author SHA1 Message Date
Michael Steenbeek
26d1186240 Merge pull request #15493 from Broxzier/refactor/minor-cleanups
Minor code cleanups
2021-09-30 15:03:33 +02:00
ζeh Matt
456e54b022 Remove useless comment
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2021-09-30 05:37:23 -07:00
Hielke Morsink
429e34d7f3 Make uses of window_get_main use (const) auto* 2021-09-30 14:36:06 +02:00
ζeh Matt
c492362e45 Fix mistake and cleanup 2021-09-30 15:34:22 +03:00
Duncan
e01c9a3afa Stream changes from NSF (#15446)
* Bring over NSF changes to stream classes

* Add orca stream to project files

* Bring over util changes as well.

* Add const to util and fix util ungzip

* Add const and apply review comments

* Apply review comments
2021-09-30 13:02:54 +01:00
Hielke Morsink
bb5d09982f Properly name argument 2021-09-30 10:40:32 +02:00
Hielke Morsink
94144bcd89 Remove some dead code
Reported by clang
clang-analyzer-deadcode.DeadStores
2021-09-30 10:40:32 +02:00
Michael Steenbeek
bfe7caacd7 Fix #15487: map animations do not work correctly in vanilla RCT2 (#15492)
Co-authored-by: duncanspumpkin <duncanspumpkin@users.noreply.github.com>

Co-authored-by: duncanspumpkin <duncanspumpkin@users.noreply.github.com>
2021-09-30 07:40:58 +01:00
Michał Janiszewski
ce1d3e9c83 Minor fixes (#15491) 2021-09-29 21:06:46 +00:00
Hielke Morsink
ba74393a43 Remove pointless return statement 2021-09-29 22:39:34 +02:00
ζeh Matt
afc0e87f29 Merge pull request #15477 from ZehMatt/nsf/update-xyz
Update entities xyz to int32_t
2021-09-29 13:32:06 -07:00
ζeh Matt
98625e1aaa Fix #14798: Overflow on sound position 2021-09-29 22:47:53 +03:00
Michael Steenbeek
987174e828 Merge pull request #15436 from duncanspumpkin/staff
Small Staff Refactor from NSF
2021-09-29 20:46:24 +02:00
Michael Steenbeek
e5f9282a36 Merge pull request #15470 from Broxzier/bugfix/15213-unicode-freeze
Fix #15213: Freeze when reading a partially cut unicode character
2021-09-29 20:26:01 +02:00
Michael Steenbeek
22af2ecdcc Merge pull request #15486 from ZehMatt/nsf/backport-overflow
Use int32_t for iterating tiles
2021-09-29 20:02:05 +02:00
ζeh Matt
82f0da24b1 Use int32_t for iterating tiles
Co-authored-by: Ted John <ted@brambles.org>
2021-09-29 20:40:57 +03:00
Duncan
8c6f10797b Prevent wasting paint time on unviewable entities 2021-09-29 19:20:43 +02:00
ζeh Matt
c1cde60e7f Bump up network version 2021-09-29 19:49:42 +03:00
ζeh Matt
3a5452f0c9 Update entities xyz to int32_t 2021-09-29 19:49:15 +03:00
Duncan
cce3bb1845 Fix #15136: Exported SV6 hangs/crashes vanilla RCT2 2021-09-29 18:48:50 +02:00
ζeh Matt
9216786efc Refactor GetSpatialIndexOffset (#15479) 2021-09-29 17:19:47 +01:00
frutiemax
2906cb8c89 Fix #14474: Map size can be synced in multiplayer (#15312)
* Fix #14474: Map size can be synced in multiplayer

* Bump up network version

Co-authored-by: ζeh Matt <5415177+ZehMatt@users.noreply.github.com>
2021-09-29 16:46:03 +01:00
ζeh Matt
eb2de0222b Use GetLocation in more places 2021-09-28 03:16:04 +03:00
ζeh Matt
274bc039af Fix out of bounds access 2021-09-28 01:26:22 +03:00
ζeh Matt
04f15b7d45 Merge pull request #15474 from ZehMatt/fix/spatial-overflow
Fix overflow in GetSpatialIndexOffset
2021-09-27 14:54:31 -07:00
ζeh Matt
185cfdea0f Refactor GetSpatialIndexOffset and fix overflow 2021-09-28 00:25:15 +03:00
Duncan
50118ae039 Move function for NSF use 2021-09-27 22:54:41 +02:00
ζeh Matt
4ea8902587 Refactor arg passing to sprite_paint_setup 2021-09-27 22:48:06 +03:00
ζeh Matt
cecf4ac202 Use CoordsXY for sprite_paint_setup
Co-authored-by: Ted John <ted@brambles.org>
2021-09-27 22:47:36 +03:00
Hielke Morsink
c234abfbb8 Fix #15213: Freeze when reading a partially cut unicode character 2021-09-27 15:03:25 +02:00
Hielke Morsink
e88f96a15c Move StaticLayout out of header file 2021-09-27 14:56:37 +02:00
Michael Steenbeek
f7d61c67e6 Fix arbitrary ride type cheat not working 2021-09-26 16:21:34 +02:00
Hielke Morsink
9dd9b27db4 Make WIDGETS_END constexpr 2021-09-26 11:11:42 +02:00
seanmajorpayne
2ba515fb37 Improve #15322: Circus Music Not Playing
Alleviates the issue, though the circus in European Extravaganza still does not work correctly.
2021-09-25 19:21:38 +00:00
Michael Steenbeek
1feac16bed Merge pull request #15414 from frutiemax/develop
#15367: Encode RideType in TrackElement
2021-09-25 12:02:08 +02:00
Hielke Morsink
a8b84989eb Check for nullptr explicitly in operct2-ui (#15460) 2021-09-25 08:45:06 +02:00
Hielke Morsink
53c22c9b4b Check for nullptr explicitly (#15458) 2021-09-24 20:05:50 +02:00
ζeh Matt
e5de2adc4f Merge pull request #15429 from ZehMatt/backport/ticks
Remove scenario ticks and adjust export/import
2021-09-23 12:08:16 -07:00
ζeh Matt
c61f141cdc Bump up network version 2021-09-23 21:49:09 +03:00
ζeh Matt
74e8988dd8 Remove scenario ticks and adjust export/import
Co-authored-by: Ted John <ted@brambles.org>
2021-09-23 21:49:09 +03: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
9060a0d228 Add missing headers to VS project file (#15457) 2021-09-21 23:34:33 +02:00
Duncan
a268350615 Fix #15439: Ride viewport is partially grey
The ride viewport does not work the same as other viewports due to the selection of views that it has. After refactoring the focus system to use a more streamlined approach the ride viewport lost its invalidation on resizing. If the ride window was to use the same viewport update code as say the guest window then the viewport focus still ends up incorrect due to it no longer centring the focus. Therefore the best approach was to lose the focus on resize and force a recalculation of it.

Also renamed Focus2 to Focus as Focus2 was meant to just be fill in whilst removing the original focus structs.
2021-09-21 11:06:04 +02:00
Gymnasiast
8fb8b2a4c1 Do not overwrite ride type when extending station 2021-09-21 10:50:38 +02:00
Gymnasiast
11607f525d const auto& 2021-09-21 10:49:29 +02:00
Gymnasiast
1e17304e76 Show the appropriate ride type in the TI 2021-09-21 10:49:29 +02:00
Gymnasiast
f21b941b46 Introduce ride_type_t 2021-09-21 10:49:29 +02:00
frutiemax
355019f97f #15367: Encode RideType in TrackElement 2021-09-21 10:49:28 +02:00
ζeh Matt
c56810e6a5 Fix #15442: Use after free in object manager 2021-09-21 10:34:58 +02:00
Michał Janiszewski
a37c8539e7 Fix bounds check in Litter::GetName 2021-09-19 22:38:25 +02:00