1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 03:53:07 +01:00
Commit Graph

9566 Commits

Author SHA1 Message Date
zaxcav
8741a40674 Remove hacks for pathfinding to the ride exit.
When sending a mechanic to a ride exit/entrance, the original pathfinding was setting the goal to the path next to the exit/entrance with goal.z set to the exit/entrance height. This is wrong when the path slopes up to the exit/entrance. Consequently the original pathfinding included a hack to allow the mechanic to enter the exit/entrance from the goal tile.

The changes in PR #4527 (commit f3cf23f) will ignore the relevant tile when the height is wrong, preventing the original hack from working. To fix this the height of paths sloping up was adjusted in the heuristic search ... which inadvertently broke pathfinding for other goals on such a sloped path (such as the start of a ride queue that slopes up).

To fix, set the goal to the ride exit/entrance itself, make the heuristic search aware of ride exits (code existed but was commented out; entrances are already there for rides without queues) and remove both the original hack and the (incorrect) heigh adjustment made in PR #4527.

Fixes issues #4626, #4629.
2016-10-17 09:31:28 +02:00
zaxcav
7718300881 Correct mistakes in merging conflicts. 2016-10-12 16:17:36 +02:00
zaxcav
113c41b976 Moved declaration of rideIndex to before first use. 2016-10-12 15:57:55 +02:00
zaxcav
e2b830f7b9 Pathfinding checks all map elements on each tile.
Use of zero clearance will no longer block the path finding when paths and other map elements are placed in the same tile at the same height.

Pathfinding recognises map elements for shops, so peeps can find shops again.

Pathfinding recognises the park entrance, so peeps can leave the park again.
2016-10-12 15:10:34 +02:00
Marijn van der Werf
ea801efd93 Decompile metal_b_supports_paint_setup 2016-10-12 08:19:30 +01:00
Marijn van der Werf
4e9738e6a3 Decompile path_b_supports_paint_setup 2016-10-12 08:19:20 +01:00
Michał Janiszewski
a80461da80 Fix #4553: crash due to accessing invalid sprite
Assertion gets hit when trying to get invalid sprite from
remove_peep_from_queue
2016-10-12 08:18:41 +01:00
OpenRCT2 git bot
2e35073ee7 Merge Localisation/master into OpenRCT2/develop. 2016-10-12 04:00:23 +00:00
Marijn van der Werf
6cb9297968 Decompile wooden_b_supports_paint_setup 2016-10-11 21:42:39 +01:00
Marijn van der Werf
db39bbc66e Fix path_a_supports_paint_setup 2016-10-11 21:42:12 +01:00
Ted John
3085dfd73c Merge pull request #4592 from marijnvdwerf/clean/address-comment
Add address comments to paint functions
2016-10-11 17:34:14 +01:00
Marijn van der Werf
068a5d9258 Add address comments for lay down and flying rc 2016-10-11 15:01:44 +02:00
Michał Janiszewski
b007aa98af Fix #4593: game crashes on startup (#4594) 2016-10-11 13:54:23 +02:00
Marijn van der Werf
9896755b74 Add address comments
# Conflicts:
#	src/ride/coaster/flying_roller_coaster.c
#	src/ride/coaster/lay_down_roller_coaster.c
2016-10-11 02:13:18 +02:00
Marijn van der Werf
6a902f4f92 Ignore unused variable warnings 2016-10-11 02:11:38 +02:00
Marijn van der Werf
b24b23c28a Add comment with function table address 2016-10-11 02:11:33 +02:00
Ted John
8cdfbf0271 Merge pull request #4590 from marijnvdwerf/paint/path-supports
Paint wooden path supports
2016-10-10 23:47:49 +01:00
Ted John
27549e9d40 Merge pull request #4587 from janisozaur/regenerate-invertable
Regenerate invertable Flying and Lay down RCs
2016-10-10 22:54:28 +01:00
Marijn van der Werf
acce4366fa Decompile path support drawing 2016-10-10 23:51:19 +02:00
Michał Janiszewski
7eab529b98 Restore photo and station for Flying RC 2016-10-10 23:27:12 +02:00
Michał Janiszewski
1326d69928 Restore photo and station for Lay down RC 2016-10-10 23:23:32 +02:00
Marijn van der Werf
e3d75efb01 Remove original path paint 2016-10-10 23:21:21 +02:00
Michał Janiszewski
5dbde5d565 Re-generate Flying RC as invertable 2016-10-10 23:12:10 +02:00
Michał Janiszewski
31c10040c4 Re-generate Lay down RC as invertable 2016-10-10 23:10:55 +02:00
Michał Janiszewski
053945034a Fix uninitialised value in testpaint 2016-10-10 23:08:48 +02:00
Ted John
b54cb2ca8a testpaint: Add flying rc and lay down rc as invertable 2016-10-10 22:05:15 +01:00
Michał Janiszewski
e70765caa2 Fix #4577: Crash when opening Rides dialog box
Fixed by properly initialising values.
2016-10-10 19:06:22 +01:00
Ted John
d266a987bb Merge pull request #4544 from IntelOrca/paint/wooden-rc
Paint Setup: Wooden Roller Coaster
2016-10-10 19:05:59 +01:00
Ted John
70a1e52472 Revert openrct2.vcxproj.user 2016-10-10 19:05:39 +01:00
Ted John
45e01f60f1 Fix station 2016-10-10 18:40:34 +01:00
Ted John
d405ef37a9 Fix track colours 2016-10-10 18:37:36 +01:00
Ted John
cd1f2f25ac Add remaining track pieces using generator 2016-10-10 18:27:38 +01:00
Manuel Vögele
36578fc47b Fix #4513: Use system encoding when accessing paths with posix 2016-10-10 14:13:51 +01:00
Ted John
b13af924e6 Implement slope bank tracks 2016-10-10 12:33:03 +01:00
Ted John
883912964e Implement banked quarter turn 5 2016-10-10 12:33:03 +01:00
Ted John
f18db76763 Implement flat to bank 2016-10-10 12:33:03 +01:00
Ted John
4c9caa1a67 Implement quarter turn 5 2016-10-10 12:33:03 +01:00
Ted John
4482babb65 Implement remaining simple slope tracks 2016-10-10 12:33:03 +01:00
Ted John
e488f41427 Implement 60, flat to 25, 25 to 60 2016-10-10 12:33:03 +01:00
Ted John
268723269e Implement deg 25 up 2016-10-10 12:33:03 +01:00
Ted John
18c3d9e618 Setup debug start info 2016-10-10 12:33:03 +01:00
Ted John
7e2074d16b Implement station and brakes 2016-10-10 12:33:03 +01:00
Ted John
89d70545c5 Implement flat 2016-10-10 12:33:03 +01:00
Ted John
da80205933 Setup wooden roller coaster paint function 2016-10-10 12:33:03 +01:00
Ted John
6f95ba4ae5 Merge pull request #4569 from janisozaur/generate-rides
Generated rides
2016-10-10 08:08:45 +01:00
Michał Janiszewski
4d4cc68d91 Merge pull request janisozaur/OpenRCT2#21
Fix station and on-ride photo painting for generated rides
2016-10-10 08:00:09 +02:00
OpenRCT2 git bot
c648335548 Merge Localisation/master into OpenRCT2/develop. 2016-10-10 04:00:23 +00:00
Ted John
3cedd8afa3 Fix suspended monorail painting 2016-10-10 00:10:01 +01:00
Ted John
7c0935f341 Fix vertical drop roller coaster painting 2016-10-10 00:05:58 +01:00
Ted John
42d14f62fe Fix twister roller coaster painting 2016-10-10 00:03:40 +01:00