zaxcav
76974d2d45
Rebalance maxNumJunctions - increase value.
...
Remove earlier optimisation to heuristic search that was preventing searching for shorter paths once a path to the goal was reached.
Resolve Travis warnings.
2016-08-21 22:23:38 +02:00
zaxcav
86be86331e
Remove exlusions from path tiles being flagged wide based on tile coordinates.
2016-08-21 22:23:38 +02:00
zaxcav
9bf5707494
Rebalance maxNumJunctions to avoid exceeding maxTileChecked limit
...
With the changes to the path finding, a similar search space to the original now corresponds to half the maxNumJunctions value.
Added warning message when maxTilesChecked is exceeded - path finding issues are to be expected in that case.
Removed some commented out code left over in the previous commit.
2016-08-21 22:23:38 +02:00
zaxcav
a768be5e88
Fix the peep path finding
...
In the heuristic search, tiles in wide path were always being handled as junctions. Changed to handle junctions according to the path thinning.
There was no search loop detection. Added loop detection for returning to the starting location and any of the junctions visited in the current search path.
Various other optimisations added.
2016-08-21 22:23:38 +02:00
Marijn van der Werf
34e046df41
Include TrackHeightMarkerPositions
2016-08-12 20:22:25 +01:00
LRFLEW
aa962b2cc8
Fix Warning in Xcode ( #4241 )
2016-08-12 09:34:05 +02:00
OpenRCT2 git bot
85210322ae
Merge Localisation/master into OpenRCT2/develop.
2016-08-12 04:00:24 +00:00
OpenRCT2 git bot
bb07785e96
Merge Localisation/master into OpenRCT2/develop.
2016-08-10 04:00:26 +00:00
Ted John
0e04e9e47f
Merge pull request #4259 from marijnvdwerf/clean/constants-1
...
[Clean] Use more constants
2016-08-09 23:55:18 +01:00
Marijn van der Werf
bdf174d4a2
Use sprite constants for weather
2016-08-09 23:43:47 +02:00
Yaroslav Tretyakov
4066009778
Fix #4253 : Crash in vehicle_update_motion_collision_detection
2016-08-09 08:35:16 +01:00
OpenRCT2 git bot
a7454d6d88
Merge Localisation/master into OpenRCT2/develop.
2016-08-09 04:00:19 +00:00
Michał Janiszewski
645bb44eb4
Minor fixes to 64 bit builds
2016-08-08 23:06:10 +01:00
Ted John
53ec220bf9
Merge pull request #4244 from janisozaur/osx-test-64
...
64 bit support for OS X, Windows
2016-08-08 11:51:30 +01:00
Michał Janiszewski
796f496677
Remove leftover debug code from openrct2.c
2016-08-08 10:22:46 +02:00
Yaroslav Tretyakov
c967114463
Fix #4215 : Multiplayer, default group does not work correctly with group IDs
2016-08-08 09:01:52 +01:00
Michał Janiszewski
af91148051
Cast pointer to segment to satisfy mingw
2016-08-08 07:30:34 +02:00
Ted John
94397784bb
Let x64 Windows builds use mmap configuration
2016-08-08 07:25:23 +02:00
Ted John
c93a6f1275
Fix build for MSVC
...
Variable not used, but warning can be suppressed by initialising it
2016-08-08 07:25:22 +02:00
Michał Janiszewski
79e755a36b
Fix segments pointer type
2016-08-08 07:25:22 +02:00
Aaron van Geffen
95ef81b4c8
CMake: split OpenGL check for macOS and Linux.
...
The GL check doesn't work nicely with macOS, while find_package doesn't work well with multiarch on Ubuntu.
2016-08-08 07:25:22 +02:00
Michał Janiszewski
7e5102dd6f
mmap data segment to arbitrary location
2016-08-08 07:25:22 +02:00
Michał Janiszewski
db00598d18
Fix `main()` signature for Windows
2016-08-08 07:25:22 +02:00
Michał Janiszewski
20781a2922
Prevent using drawing functions in NO_RCT2 builds
2016-08-08 07:25:22 +02:00
LRFLEW
69404bd394
Fix OpenSSL CMake Dependency on macOS
2016-08-08 07:25:22 +02:00
Ted John
0fbdcbe62d
Unload objects before g1 and g2
...
This fixes a crash that happens when exiting the game where g1 elements has been disposed before the object images get disposed. Only apparent in NO_RCT2 or x64 builds where g1 elements is a dynamically allocated.
2016-08-08 01:30:55 +01:00
Ted John
7013e05c50
Update dependencies to version 9
...
This now includes both an x86 and x64 lib, so make changes accordingly to vcxproj.
2016-08-08 00:38:03 +01:00
Aaron van Geffen
807d53e43c
Prevent undefined behaviour in zooming functions. ( #4249 )
2016-08-07 23:12:09 +02:00
Ted John
6644902829
Merge pull request #4246 from marijnvdwerf/clean/data-7
...
Integrate data
2016-08-07 17:35:59 +01:00
Marijn van der Werf
ceaa7c8a04
Add track mirroring data
2016-08-07 14:31:19 +02:00
Marijn van der Werf
d5b8fe3732
Integrate dodgems data
2016-08-07 14:31:13 +02:00
Marijn van der Werf
897fc0591b
Integrate track pricing
2016-08-07 14:31:08 +02:00
Ted John
ba4df424cb
Merge pull request #4245 from janisozaur/integrate3
...
Integrations
2016-08-07 13:02:31 +01:00
Marijn van der Werf
ec4cf80623
Use `RideData4`
2016-08-07 13:01:20 +01:00
Marijn van der Werf
a81b7c4892
Use `WALL_SCENERY` flags
2016-08-07 12:57:22 +02:00
Marijn van der Werf
198ebd0cb1
Use constants for colours
2016-08-07 12:57:12 +02:00
Marijn van der Werf
207f552203
Use contants for `_currentTrackCurve`
2016-08-07 12:57:07 +02:00
Michał Janiszewski
fa68d31dbf
Remove RCT2_GLOBAL macro from stack buffer
2016-08-07 11:44:49 +02:00
Michał Janiszewski
9ac3b78530
Integrate g_currently_drawn_item
2016-08-07 11:41:33 +02:00
Michał Janiszewski
d9dcf86bd7
Apply RCT2_ADDRESS macro to strings as well
2016-08-07 09:06:55 +02:00
Yaroslav Tretyakov
bb822e351d
Fix #4237 : Some scenery dissapears while zooming out x2 or more
2016-08-07 01:47:31 +01:00
Ted John
c55d72412c
Add x64 VS project configurations
2016-08-07 01:47:18 +01:00
LRFLEW
e5666683aa
More RCT2_ADDRESS macro usage
2016-08-06 22:22:11 +01:00
Michał Janiszewski
0ece63a7f6
Wrap RCT2's addresses in RCT2_ADDRESS macro
2016-08-06 21:38:46 +01:00
Yaroslav Tretyakov
802fcedb6f
Fix #4222 : Artifacts with uncap fps on
2016-08-06 17:21:08 +01:00
Marijn van der Werf
680f7b7770
Integrate maze building data
2016-08-06 15:05:37 +01:00
Marijn van der Werf
ac950e0496
Integrate `0x0098DDB8` and `0x0098DDBA`
2016-08-06 13:20:18 +01:00
duncanspumpkin
dd7e988f08
Fix #4231 . Ride colour issue caused by overlapping vars.
...
By using a union instead of a struct var_494 and var_496 where ontop of the same location this meant var_496 when written to would overwrite ride_colour that was also in a union with var_494/496. This in turn would cause the wrong ride_colour to be overwritten when using the colour picker.
2016-08-06 08:03:57 +01:00
Ted John
1abc4a1915
Integrate and clean up rest of guest list window vars
2016-08-06 01:52:03 +01:00
Ted John
c2db79919d
Integrate gWindowUpdateTicks
2016-08-06 01:35:46 +01:00