Commit graph

14047 commits

Author SHA1 Message Date
Michał Janiszewski
4732afa315 Add some bounds checks 2018-02-10 13:07:52 +01:00
Hielke Morsink
8e55c811f6 Check for server version instead of address (#7155) 2018-02-09 19:16:54 +00:00
Gymnasiast
f003366d22 Remove STEX selection from Object Selection window 2018-02-09 13:47:15 +01:00
Gymnasiast
3261753510 Ignore missing STEX entries 2018-02-09 13:47:15 +01:00
Gymnasiast
b1ab852fb7 Add object_entry_get_type() 2018-02-09 13:47:15 +01:00
Ted John
504e635933
Merge pull request #7150 from Broxzier/absolute-path
Make custom paths absolute and show full path in load/save window
2018-02-08 17:25:52 +00:00
Ted John
9f533d7265
Merge pull request #7143 from IntelOrca/refactor/server-list
Refactor server list
2018-02-08 17:25:37 +00:00
Michael Steenbeek
acc6136847 Do not pack Ride struct 2018-02-08 15:33:43 +01:00
Michael Steenbeek
e2dd629aaf Remove padding and offsets in Ride struct 2018-02-08 15:33:43 +01:00
Michael Steenbeek
34c8409251 Clean up ride struct and num_riders import, update changelog 2018-02-08 15:33:43 +01:00
Gymnasiast
02196a1919 Fix #3330: Current number of passengers overflows 2018-02-08 15:33:43 +01:00
Hielke Morsink
ced75956d1 Populate loadsave window with absolute path
When pressing "up", the code would look for the parent in the given path, which doesn't work well with relative paths. This commit fixes this behaviour.
2018-02-08 14:23:21 +01:00
Hielke Morsink
e1b99479a2 Make custom paths absolute
Then gCustomUserDataPath and relatant variables are set, they overwrite the gBasePath array, which uses absolute paths. This commit makes the custom paths absolute as well, to prevent issues with assumptions in the code (file dialog for example).
2018-02-08 14:23:21 +01:00
Michał Janiszewski
35b86e3aa1 Fix Android assertion (#7148) 2018-02-08 07:47:48 +00:00
Michał Janiszewski
0e032c9ca4 Avoid shifting negative values in Audio.cpp (#7147)
Rather than shifting negative values, which invokes undefined behaviour,
use a multiplication.
2018-02-08 07:47:35 +00:00
OpenRCT2 git bot
00cc6fd7fe Merge Localisation/master into OpenRCT2/develop. 2018-02-08 04:01:27 +00:00
Michał Janiszewski
282553f0c5 Upgrade some char arrays to strings 2018-02-07 23:14:29 +01:00
Michał Janiszewski
4c7053f581 Fix remaining usages of strings used in intents 2018-02-07 23:14:29 +01:00
Michał Janiszewski
20f95d073a Fix remaining uses of WC_LOADSAVE intent 2018-02-07 23:14:29 +01:00
Michał Janiszewski
d08924a9c2 Add missing breaks in WindowManager 2018-02-07 23:14:29 +01:00
Ted John
142facb8a3
Remove Memory::Duplicate and Memory::DuplicateArray (#7142) 2018-02-07 19:56:46 +00:00
Ted John
9d50a36f2c More improvements to server list 2018-02-07 19:23:44 +00:00
Ted John
c7128ec988 Refactor ServerList more 2018-02-07 13:01:36 +00:00
Ted John
c42a63c52c Refactor memory handling in ServerList more 2018-02-07 12:51:52 +00:00
Ted John
5d51676523 Refactor memory handling in ServerList 2018-02-07 12:51:52 +00:00
Michał Janiszewski
04ea015302 Fix #7135: Pass save path as std::string, not a pointer (#7141) 2018-02-07 12:11:37 +00:00
OpenRCT2 git bot
ac8353eef9 Merge Localisation/master into OpenRCT2/develop. 2018-02-07 04:00:58 +00:00
Ted John
214df1cf75 Fix #6958: Recent messages are not coloured
This fix is a workaround to what I believe is a bug in MSVC's optimised code generator. Somehow the casting of a wchar_t to a sint32 is causing some strange behaviour where the number 147 gets changed to 0x??93. Adding a printf to display codepoint was enough to alter the behaviour, making it very difficult to understand what was going on.
2018-02-06 23:29:23 +00:00
Michał Janiszewski
8b72c4f1ad Fix mismatched deleter in TextureCache (#7138) 2018-02-06 20:51:40 +00:00
Ted John
fbf0243aa3 Fix #7136: Wrong categorisation of objects
Regression introduced in DuplicateArray when converting CopyArray to memcpy
2018-02-06 18:19:23 +00:00
Ted John
0fc0d16e85 Remove unused String::Substring 2018-02-06 18:19:23 +00:00
Hielke Morsink
b6823242b6 Add temporary fix to make mechanics find ride exits 2018-02-06 19:09:51 +01:00
Hielke Morsink
5e86782f0a Check for nullptr instead of using !ptr + format document
This changes all similar checks in the TileInspector file to use `ptr == nullptr` instead of `!ptr`
and applies the coding style.
2018-02-06 19:09:51 +01:00
Hielke Morsink
3e4981af85 Add changelog entry
[ci skip]
2018-02-06 19:09:51 +01:00
Hielke Morsink
915dbdf869 Add button to tile inspector to make entrances usable
With this, entrances and exits that have been moved away from its original XY
location can be made usable. Only one entrance or exit will be usable per
station.
2018-02-06 19:09:51 +01:00
Hielke Morsink
7fe50a481f Allow building queues from raised/lowered entrances
The original code assumes the entrance is at the exact same height as the
station, which is not always the case with hacked rides.
2018-02-06 19:09:51 +01:00
Ted John
97032f7044
Merge pull request #7062 from rwjuk/fix7052
Fix #7052: Infinite loops occur in track circuit iteration
2018-02-06 11:42:19 +00:00
Ted John
a6cb15c3b6
Merge pull request #7130 from IntelOrca/improve-bad-g1-handling
Improve bad g1.dat handling
2018-02-06 11:37:22 +00:00
Michael Steenbeek
9629f50294 Update changelog for #7125 [ci skip] 2018-02-06 10:41:31 +01:00
Michael Steenbeek
b78a744b8e Create footpath_get_edges() 2018-02-06 10:41:31 +01:00
zaxcav
688577375f Correct identification of thin junctions in the heuristic search.
Previously, thin junctions were identified based on the permitted edges - i.e. exit edges from the tile. This causes incorrect handling of tiles with 'no entry' signs. In the worst case, this breaks the heuristic search for paths with 'no entry' signs. Correct to identify thin junctions based on all edges rather than only the permitted edges.

Fixes #7125.
2018-02-06 10:41:31 +01:00
OpenRCT2 git bot
1037eb5dae Merge Localisation/master into OpenRCT2/develop. 2018-02-06 04:01:17 +00:00
Gymnasiast
cc4f7e144a Remove most usages of 'new Intent' 2018-02-05 23:23:26 +01:00
Gymnasiast
e3c0f6606d Clean up Intent.{cpp,h}
This gets rid of the C transfer functions, add licence and does some alignment fixes
2018-02-05 23:23:26 +01:00
Ted John
f031763531 Use rct_gx for g1 2018-02-05 19:04:01 +00:00
Ted John
b8e93177d8 Use std::vector for g2 and csg 2018-02-05 18:56:03 +00:00
Ted John
b0755123fd Fix loading of bad g1.dat 2018-02-05 18:47:40 +00:00
Ted John
8e7a0e9110 Fix memcpy to copy_n mistake from 0c71855 2018-02-05 18:32:23 +00:00
Gymnasiast
ba7548089c Fix warnings when converting RCT1 research 2018-02-05 19:06:10 +01:00
Ted John
76344498bb Fix outPath not set in platform_get_user_directory 2018-02-05 17:19:39 +00:00