mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
10,025 Commits 7 Branches 39 Tags 356 MiB
Commit Graph

10025 Commits

Author SHA1 Message Date
Michał Janiszewski 0793b3bc11 Fix #4755: Crash loading new map while running a server 2016-11-11 18:27:40 +01:00
Marijn van der Werf 0496cf6bd8 Merge colour maps 2016-11-11 08:46:14 +00:00
OpenRCT2 git bot a327fe46a2 Merge Localisation/master into OpenRCT2/develop. 2016-11-11 04:00:21 +00:00
Michał Janiszewski 65bb4977ce Fix #4769: peep renames broken 2016-11-10 22:49:18 +01:00
Marijn van der Werf 80ea7f7de5 Name `gfx_fill_rect_inset` flags 2016-11-10 17:54:33 +00:00
duncanspumpkin 3da10b7d7d Use correct comparison for previous commit 2016-11-09 19:16:25 +00:00
duncanspumpkin 2f6f728200 Fix #4714. Prevent invalid peep access on closed golf rides. 
When a golf ride is closed it will remove the peep from the vehicle (the ball). Due to the way vehicles leave stations the vehicle would still travel to the next hole but when it tried to update the peeps action it would crash. This skips updating the peeps action but lets the ball still continue. This will cause a phantom ball to go around the golf course until all the vehicles are back in their closed state.
 2016-11-09 19:00:09 +00:00
Ted John 4662b648d2 Merge pull request #4700 from IntelOrca/refactor/language-cpp 
Refactor language.cpp
 2016-11-09 18:38:24 +00:00
Ted John 953f479cd9 Fix #4762: Assertion in localisation (format_string_part) 
The buffer overflow protection in format_string was not working correctly for several reasons. For windows builds this just so happened to write over gMapTooltipFormatArgs causing the assertion. Extra asserts have been added to check overflows in format_string.
 2016-11-09 18:29:49 +00:00
wolfreak99 1f0b2aefb7 Fix #4771: Main Menu music not playing 
When audio_init_ride_sounds is called, it calls audio_stop_title_music, but never calls audio_start_title_music. if you do an assert for gTitleMusicChannel it shows it is null. this fixes that. i will say though this is most definitely a band-aid fix, because if run audio_start_title_music in the audio_init_ride_sounds, it still doesn't play out loud. at least on my setup it doesn't.
 2016-11-09 17:37:41 +00:00
Michał Janiszewski 33749ccfbe Lower jansson version requirement to 2.3 for CMake/Debian builds (#4778) 
We still need at least 2.3 for `json_object_foreach`
 2016-11-09 12:57:06 +01:00
Michał Janiszewski 867de18c96 Use json_is_true instead of json_boolean_value 
This should lower required version of jansson, which would
let us use 2.5 in Trusty (current version in Travis-CI)

See https://github.com/akheron/jansson/issues/146
 2016-11-09 13:19:12 +01:00
Michał Janiszewski 44e9129af5 Remove unused semicolons after end of function 
[ci skip]
 2016-11-09 13:15:46 +01:00
Ted John 7b5858cb92 Fix UTF-8 string literals, add BOM to language.cpp 
MSVC requires source files to be in UTF-8 with BOM in order to compile them correctly as UTF-8.
 2016-11-08 17:29:46 +00:00
Ted John 941d92dc2a Fix convert_multibyte_charset 2016-11-08 17:02:37 +00:00
Ted John c506f2730d Reformat language table 2016-11-08 17:02:37 +00:00
Ted John 894899630b Use UTF-8 literal strings 2016-11-08 17:02:37 +00:00
Ted John 3d1e4c10c1 Fix size argument in GetLanguagePath 2016-11-08 17:02:37 +00:00
Ted John 3af07f6e00 Remove unused constant 2016-11-08 17:02:37 +00:00
Ted John 91ef540c25 Fix gcc errors 2016-11-08 17:02:37 +00:00
Ted John b4e65ace52 Refactor font loading 2016-11-08 17:02:37 +00:00
Ted John 6461b21e09 Use more C++ functions 2016-11-08 17:02:37 +00:00
Ted John 6523081b84 Conform to C++ style 2016-11-08 16:59:46 +00:00
Ted John 216dc64342 Convert tabs to spaces in language.cpp 2016-11-08 16:59:46 +00:00
OpenRCT2 git bot a934590826 Merge Localisation/master into OpenRCT2/develop. 2016-11-08 04:00:14 +00:00
Michael Steenbeek f8ea5bd318 Add #1238, fix American spelling 2016-11-07 12:43:40 +01:00
Michael Steenbeek 26c695bdd1 Use ColourMapA for looking up the mini preview background colour, fixes #1238 (#4766) 2016-11-07 12:35:14 +01:00
OpenRCT2 git bot 780194d487 Merge Localisation/master into OpenRCT2/develop. 2016-11-07 04:00:18 +00:00
Michał Janiszewski 9c818ea2dc Reorder fields to reduce padding (#4758) 
Reduces padding:
* In `rct_viewport` from 5 to 1
* In `rct_ride_entrance_definition` from 4 to 0
 2016-11-06 21:06:02 +01:00
Michał Janiszewski b164c2be61 Extract openrct2_assert to guard.h (#4753) 
* Extract openrct2_assert to Guard.hpp

`openrct2_assert` is not defined in util.c and including all of
openrct2.h is unnecessary.
 2016-11-06 21:02:25 +01:00
Michał Janiszewski 43a7e6b854 Add missing static keyword to template-ised functions (#4750) 
This fixes building with ICC
 2016-11-06 21:01:07 +01:00
Michał Janiszewski 06b659db40 Replace malloc(0) with explicit NULL 
From documentation on `void* malloc( size_t size );`:
> If size is zero, the behavior is implementation defined (null pointer
may be returned, or some non-null pointer may be returned that may not
be used to access storage).

Both `free()` and `realloc()` understand `NULL`, so use that to avoid
implementation-defined behaviour
 2016-11-06 21:00:47 +01:00
Michał Janiszewski fe3b15c2f1 Mask translucent bit out from colour 
Fixes #4765
 2016-11-06 20:51:38 +01:00
Matte A c029515d76 Changing some default configs to true (#4540) 2016-11-06 19:12:42 +01:00
Michael Steenbeek fc9884092a Merge pull request #4764 from janisozaur/check-ride-type 
Prevent checking of flags of invalid ride type
 2016-11-06 18:40:56 +01:00
Michał Janiszewski 512c7bcf51 Prevent crash when opening a window on invalid ride 2016-11-06 18:26:45 +01:00
Michał Janiszewski 7e326972a9 Prevent checking of flags of invalid ride type 
Such case can happen with following function call chain in stack trace:
* `game_command_create_ride` ride.c:6234
* `ride_create` ride.c:6070
* `rideTypeShouldLoseSeparateFlag` rct1.c:88
 2016-11-06 18:03:26 +01:00
Michael Steenbeek 5e85b2e807 Merge pull request #4763 from zaxcav/develop 
Update contributors.md for pathfinding improvements.
 2016-11-06 17:36:04 +01:00
zaxcav a3844e229d Update contributors.md for pathfinding improvements. 2016-11-06 17:34:03 +01:00
Ted John c268b51521 Merge pull request #4757 from janisozaur/memory 
Ensure all memory allocated with Memory is valid
 2016-11-06 11:28:30 +00:00
Michał Janiszewski 2c6c99dfe0 Add user-friendly information about failed allocation 2016-11-06 11:59:30 +01:00
OpenRCT2 git bot c94a009860 Merge Localisation/master into OpenRCT2/develop. 2016-11-06 04:00:18 +00:00
Michał Janiszewski c9a1ce593c Fix wrong return value in Stopwatch::GetElapsedTicks 2016-11-05 22:40:28 +00:00
Michał Janiszewski e4e6f2f68a Ensure all memory allocated with Memory is valid 2016-11-05 23:12:35 +01:00
Duncan a4f9d41f57 Merge pull request #4746 from marijnvdwerf/fix/supports 
Fix scenery segments
 2016-11-05 10:38:45 +00:00
OpenRCT2 git bot 98981b691d Merge Localisation/master into OpenRCT2/develop. 2016-11-05 04:00:21 +00:00
Michael Steenbeek ea66b4ca84 Merge pull request #4749 from Overv/develop 
Fix #4747: Fix available land rights not being recounted when using sandbox tools
 2016-11-04 22:56:12 +01:00
Alexander Overvoorde 9be47d11ed Fix #4747: Fix available land rights not being recounted when using sandbox tools 
This commit fixes the game command set_land_ownership missing a land
rights recount call. This would cause problems when the user changes
land ownership with the sandbox mode tools.
 2016-11-04 22:51:35 +01:00
Michał Janiszewski b6525c298e Verify access to terrainEdgeTypeStringIds 2016-11-04 22:21:37 +01:00
Michał Janiszewski 3653baf720 Remove needless const for returned values 2016-11-04 09:44:13 +01:00