mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 20:43:04 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into new-save-format

Browse Source
This commit is contained in:
Gymnasiast
2021-07-19 19:04:19 +02:00
parent d8eb762a19 4760642fd5
commit b2ffbb3639
123 changed files with 1741 additions and 1543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/tests/Pathfinding.cpp
View File

@@ -68,7 +68,7 @@ protected:
{
// Our start position is in tile coordinates, but we need to give the peep spawn
// position in actual world coords (32 units per tile X/Y, 8 per Z level).
// Add 16 so the peep spawns in the center of the tile.
// Add 16 so the peep spawns in the centre of the tile.
auto* peep = Guest::Generate(pos->ToCoordsXYZ().ToTileCentre());
// Peeps that are outside of the park use specialized pathfinding which we don't want to

2
test/tests/testdata/ratings/bpb.sv6.txt vendored
View File

@@ -7,7 +7,7 @@ RIDE_TYPE_BOBSLEIGH_COASTER: (559, 548, 440)
RIDE_TYPE_CORKSCREW_ROLLER_COASTER: (504, 533, 204)
RIDE_TYPE_CAR_RIDE: (418, 58, 3)
RIDE_TYPE_WOODEN_WILD_MOUSE: (324, 381, 220)
RIDE_TYPE_LOG_FLUME: (416, 139, 105)
RIDE_TYPE_LOG_FLUME: (208, 69, 52)
RIDE_TYPE_3D_CINEMA: (350, 240, 140)
RIDE_TYPE_HAUNTED_HOUSE: (341, 153, 10)
RIDE_TYPE_MONORAIL: (439, 25, 5)