mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 12:03:07 +01:00
Code Issues Releases Wiki Activity
21,901 Commits 8 Branches 59 Tags
82f0da24b1743d34ce4d98d86708a4e40ce2e8b7
Commit Graph

17018 Commits

Author SHA1 Message Date
ζ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
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
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
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
Hielke Morsink
d3f7660a46 Use min/max water height defines in mapgen 2021-09-19 17:18:23 +02:00
Duncan
938792e6be Use CoordsXYZ for ride view (#15434) 
* Use CoordsXYZ for ride view

Part of the NSF but also took the time to refactor slightly to use the more appropriate types. Annoyingly there isn't a operator/ for CoordsXYZ otherwise this could have been further simplified.

* Fix missed minx/maxx occurrence

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2021-09-19 07:19:32 +01:00
Duncan
81051f2d21 Add crypt files from NSF 2021-09-18 20:31:23 +00:00
Duncan
fa57b6aea0 Remove focus union and replace with typed focus (#15426) 
* Remove focus union and replace with typed focus

This if for the NSF to allow for CoordsXYZ

* Remove legacy structures

* Rework viewport_create to deduplicate logic

* Simplify yet further

* Apply review comments

* Remove intermediate
 2021-09-18 20:34:38 +01:00
Duncan
c05068e8d1 Replace sprite_left,t,r,b with SpriteRect (#15408) 
* Replace sprite_left,t,r,b with SpriteRect

This is required for the NSF. I had to add a silly constructor to rct_sprite for now. Will eventually be removed one day...

* Fix compilation and memory leak

* Add some UB to prevent some other UB

* Make review change
 2021-09-18 19:07:35 +01:00
ζeh Matt
2529568bfc Use std::string_view where appropriate in network code 
Co-authored-by: Ted John <ted@brambles.org>
 2021-09-18 00:14:28 +03:00
Hielke Morsink
77141f57b0 Merge pull request #15416 from Broxzier/refactor/unnecessary-else 
Remove unnecessary else blocks
 2021-09-17 14:56:30 +02:00
ζeh Matt
de85a1788b Merge pull request #15412 from ZehMatt/refactor/ga-results 
Allow game actions to store custom data instead of using inheritance
 2021-09-16 14:35:03 -07:00
Hielke Morsink
fc8e0cf9d7 A couple more nullopt returns (#15422) 2021-09-16 23:05:50 +02:00
Hielke Morsink
4b4b3333d6 Remove unnecessary else blocks 2021-09-16 18:31:12 +02:00
ζeh Matt
427bb7b330 Fix sv6 export not adding all objects (#15419) 2021-09-16 14:28:02 +01:00
Gymnasiast
51a7c2ad44 Fix log_warning spam for OBJECT_ENTRY_INDEX_NULL 2021-09-15 22:42:32 +02:00
Gymnasiast
ecaf361743 Revert porting errors 2021-09-15 18:27:15 +02:00
Gymnasiast
adce8c998e Return early in RepositoryItemToObject() 2021-09-15 17:58:42 +02:00
Gymnasiast
6a7084aa4d Fix formatting and TODO note 2021-09-15 17:54:39 +02:00
Ted John
8cdece0252 Fix incorrect objects in S6 import 2021-09-15 11:28:40 +02:00
Gymnasiast
bdab3219cb Modify object loading for JSON-only objects 2021-09-15 11:28:39 +02:00
Michael Steenbeek
37821ce25e Merge pull request #15336 from Gymnasiast/refactor/more-paths 
Prepare footpath handling for surfaces and railings (from NSF)
 2021-09-15 10:58:01 +02:00
Michał Janiszewski
1a35cdafb3 Add limits include to Object.h (#15415) 
PPA builds seem to complain about this
 2021-09-15 08:25:55 +02:00
ζeh Matt
42254d774d Allow game actions to store custom data instead of using inheritance 2021-09-14 20:25:37 +03:00
Hielke Morsink
28681eebc0 Merge pull request #15407 from ZehMatt/refactor/optional-use 
Make use of std::optional strict
 2021-09-14 17:45:18 +02:00