Commit Graph

14382 Commits

Author SHA1 Message Date
Michał Janiszewski f311fb11bc
Make Travis do Android builds on master and ^android branches 2018-03-16 10:13:26 +01:00
OpenRCT2 git bot 147067de60 Merge Localisation/master into OpenRCT2/develop. 2018-03-16 04:00:33 +00:00
Gymnasiast ddd03fb045 Fix #7284: Rotating a maze track rotates each piece individually 2018-03-15 22:32:33 +01:00
Michał Janiszewski 5ddf36ad42
Add systemd (udev) to 64 bit Arch dockerfile [ci skip]
https://git.archlinux.org/svntogit/packages.git/commit/trunk/PKGBUILD?h=packages/libdrm&id=d490fde508be38c2758588bb3b42b29101edcd78
enabled udev support in libdrm, however the dependency array was not
updated to reflect that, resulting in missing package in our docker
container.

This explicitly adds systemd to installed packages.

Upstream bug at https://bugs.archlinux.org/task/57851
2018-03-15 13:41:18 +01:00
OpenRCT2 git bot 328a838678 Merge Localisation/master into OpenRCT2/develop. 2018-03-15 04:01:24 +00:00
Michał Janiszewski 4b323f401f Initialise dl in Surface.cpp 2018-03-14 22:11:30 +01:00
Michał Janiszewski 9e1dfffee8 Remove unnecessary checks for __cplusplus 2018-03-14 22:11:30 +01:00
Michał Janiszewski c27307820e Remove more C-only code from common header 2018-03-14 22:11:30 +01:00
Michał Janiszewski 9b0fe5f09e Don't use registers struct where not strictly required
The only advantage of `struct registers` is the union hierarchy. If this
is not being actively exploited, it is detrimental to use this struct.
2018-03-14 22:11:30 +01:00
Michał Janiszewski 789c176517 Update common header 2018-03-14 22:11:30 +01:00
Michał Janiszewski 10dabfa15c Fix strncpy usage in GuestList.cpp 2018-03-14 22:11:01 +01:00
Michał Janiszewski d1d32456a5 Fix generating screenshot path for GCC8
GCC8 rightfully complains about using improperly-sized buffers in call
to snprintf.
2018-03-14 22:11:01 +01:00
Ted John edb7e7112a Fix import of park entrance locations
gParkEntrances was changed to sint32 positions from sint16 positions in f4ac2b4d5b. This caused a regression as the locations were not being sign extended when imported from S6 files.
2018-03-14 21:30:43 +01:00
Aaron van Geffen c21143505f Fix #7203: Undefined string in custom currency window. 2018-03-14 13:35:51 +01:00
Michał Janiszewski edbca00d66 Fix #7198: Update Android dependencies to 0.8 2018-03-14 01:30:00 +01:00
Aaron van Geffen a68c5301eb Use a range-based for loop in NetworkGroup::Write, too. 2018-03-14 01:25:10 +01:00
Aaron van Geffen e514b2c9cb Fix #6804: Network permissions are not visible. 2018-03-14 01:25:10 +01:00
Hielke Morsink 69867bcecd Fix typo 'instad' -> 'instead' [ci skip] 2018-03-13 23:44:34 +01:00
Gymnasiast 14b22c9801 Fix missing include 2018-03-13 21:07:26 +01:00
Gymnasiast 8e37ee26c9 Avoid warning spam during park entrance drawing 2018-03-13 20:48:16 +01:00
Hielke Morsink b78bd587b7 define BANNER_INDEX_NULL 2018-03-13 19:45:48 +01:00
Gymnasiast 38d3c3eff3 Use tile_element_[gs]et_banner_index() 2018-03-13 19:45:48 +01:00
Hielke Morsink 087519ca62 Fix #5261 Deleting the sign after copy/pasting it will crash the game
Prior to the previous commit, signs could be duplicated by pasting them using the tile inspector, which results in some funky behaviour. A duplicated sign refers to the same banner index (which in turn refers to the same user string ID), making the player unable to modify it. Deleting it would previously even crash the game.
This commit looks for such signs when loading a scenario, and attempts to fix them, by creating a new banner entry (and user string if one is used).
2018-03-13 19:45:48 +01:00
Hielke Morsink d2479e0de0 Create new banner entry and string upon pasting one
Previously pasted banners would refer to the same banner entry and same string ID, possibly causing crashes when deleting one.
2018-03-13 19:45:48 +01:00
Michał Janiszewski afb0c48ebd Sink some arrays 2018-03-13 13:37:41 +01:00
Michał Janiszewski 764520076f
Reduce header inclusion
* Update includes in PlatformEnvironment.cpp

* Update includes in ParkImporter.h

* Update includes of OpenRCT2.h

* Update includes in Intro.h

* Remove unused include from Input.cpp

* Update includes of Imaging.h

* Update includes in Game.h

* Update includes in Editor.h

* Update includes of Context.cpp

* Update includes in Cheats.cpp, CmdlineSprite.cpp

* Update includes of some source files

* Update includes in some cpp files

* Update includes in some cpp files

* Update includes in TextureCache.h

* Fix tests

* Update includes in Font.cpp

* Update includes in LightFX files

* Update some includes

* Fix GCC builds

* Update some includes

* Update some includes

* Update includes in FontsFamilies.*

* Update includes of Console.h

* Improve includes in Window.h

* Improve headers in Viewport.h/Window.h

* Fix MSVC build

* Fix network-less builds

* Reduce inclusion of Map.h
2018-03-13 13:14:02 +01:00
Michael Steenbeek bf580625f8 Fix calcutation of number of riders on import
Made a little mistake with this last time. This will now use the same logic as the Guest List window and the increment/decrement counters.
2018-03-13 11:45:06 +01:00
duncanspumpkin 33a6a5a994 Fix #7209: Reset spatial index before removeing peeps on fix save.
If the spatial index is corrupted such as in IndianaJones then deleting multiple peeps from the same spatial index will cause an infinite loop. Therefore this will now reset and remake the spatial index if there are peeps that require removing. Note it doesn't reset the spatial index for all saves as it is not required
2018-03-12 11:27:43 +00:00
deurklink e0c4f88295 Fix #7229: Exploding guests cheat gets rides stuck and freezes game 2018-03-12 10:23:46 +01:00
Michał Janiszewski c4f3643be1 Fix #7246: Android build fails with java.lang.UnsatisfiedLinkError
JNI DETECTED ERROR IN APPLICATION: JNI GetObjectClass called with
pending exception java.lang.UnsatisfiedLinkError: No implementation
found for long website.openrct2.ZipArchive.allocBytes(byte[], int)
(tried Java_website_openrct2_ZipArchive_allocBytes and
Java_website_openrct2_ZipArchive_allocBytes___3BI)
2018-03-11 23:57:50 +01:00
Michał Janiszewski 93041bbce5 Fix mismatched deleter in TryClassifyAsTD4_TD6 2018-03-11 21:19:26 +01:00
Mark Ramotowski 74eddea1f1 Adding missing packages to Mac build instructions (#7263) 2018-03-11 17:15:09 +01:00
Ted John 42490b64fc Show entrance / exit fix messages as verbose only
This is because some title sequences have parks which need fixes and they end up showing on stdout every game launch.
2018-03-10 15:18:25 +01:00
Ted John 74228ed35f Use iterators again for removing empty headings
Improving on f00aa15096, continue to use iterator and just set it to the result of erase.
2018-03-10 13:58:49 +00:00
Ted John f00aa15096 Fix assert in debug mode in initialise_list_items
Erasing vector iterators causes the iterator to become invalid, so use an index instead for the loop.
2018-03-10 10:52:32 +00:00
Hielke Morsink 4bfeaf0c72 Fix #6870 Crash when loading groena lund
This crash only occurs when the option "no test crashes" was enable. With this commit the sprite index will be checked before the vehicle gets checked.
2018-03-10 06:50:45 +00:00
Michał Janiszewski 8cf8db01d3 Fix #7180: Compiler error: trackType may be used uninitialised 2018-03-10 07:49:24 +01:00
Michał Janiszewski 4b2881b48e Improve declaration of deleter type in S4Importer.cpp 2018-03-09 21:34:24 +01:00
Michael Steenbeek 5411c77358 Clean up more direct access to tile elements 2018-03-09 19:40:16 +01:00
Michael Steenbeek 44524d1e6f Name unknown variable 2018-03-09 19:40:16 +01:00
Aaron van Geffen e14605b340
Fix #7075: Re-dump glassy_recolourable.png for libpng12 compatibility.
Note the file has deliberately not been optimised through `optipng`.
2018-03-09 19:32:54 +01:00
Michał Janiszewski 229c793b33 Fix NO_TTF builds for Windows and macOS 2018-03-09 16:40:40 +01:00
Hielke Morsink 35f3d9f4c9 Fix #7251: "Own all land" cheat does not work
`x` was not set back to `min` in the second for loop, causing all second iterations to immediately stop.
2018-03-09 16:39:04 +01:00
Michał Janiszewski bf61a4ce63 Update library links 2018-03-09 16:28:48 +01:00
Ted John cd562f2ff2 Add msbuild property to use shared libraries 2018-03-09 16:28:48 +01:00
Ted John 39a38dc193 Include SDL2 using sub directory 2018-03-09 16:28:47 +01:00
Ted John e318e0948a Fix a few assertions that were found when using debug CRT 2018-03-09 16:28:47 +01:00
Ted John cd6739c340 Use debug CRT for debug
Now that we can link to debug versions of our dependencies we can now use the debug CRT.
2018-03-09 16:28:47 +01:00
Ted John 3cba240035 Keep default libs 2018-03-09 16:28:47 +01:00
Ted John 3bbc34d841 Set vcpkg triplet 2018-03-09 16:28:47 +01:00