Ted John
a5d85cd15f
Merge pull request #1955 from janisozaur/fixes
...
Fixes
2015-09-22 23:02:47 +01:00
Michał Janiszewski
52e0b737be
Drop initial null check from SafeFree
...
Both free and delete treat nullptr the same way: as a no-op [1][2].
Get rid of checking if the pointer passed is a null one before acting on
it.
See stackoverflow.com/q/154136/do-while-and-if-else-statements-in in
case you are wondering why is it done this way.
[1] http://www.cplusplus.com/reference/cstdlib/free/
[2] http://www.cplusplus.com/reference/new/operator%20delete/
2015-09-22 22:58:34 +02:00
Michał Janiszewski
a3d407079f
fix windows position clamping
2015-09-22 22:58:34 +02:00
Michał Janiszewski
8ec1054477
add missing parntheses
2015-09-22 22:58:34 +02:00
Michał Janiszewski
33d5e0b79f
fix loop counter
2015-09-22 22:58:34 +02:00
Michał Janiszewski
cf7c827d0d
Fix possible null dereference and resource leak
2015-09-22 22:58:20 +02:00
Michał Janiszewski
5ceafd66a3
Fix memory leak in screenshot.c and guest.c
2015-09-22 22:58:20 +02:00
Ted John
976ea0d775
Merge pull request #1953 from janisozaur/file-not-found
...
Safely handle 'file not found' or wrong parameters
2015-09-22 08:20:02 +01:00
Michał Janiszewski
16eb4666ee
Safely handle 'file not found' or wrong parameters
...
`platform_enumerate_files_begin` (and it directory counterpart) can
return `-1`, make sure we handle that value properly when passed on
to `platform_enumerate_files_next` and `platform_enumerate_files_end`
2015-09-22 08:33:40 +02:00
Ted John
a0d5d592c2
Merge pull request #1951 from zsilencer/develop
...
fix #1944
2015-09-21 18:10:02 +01:00
zsilencer
0af364a9b6
fix #1944
2015-09-21 10:41:09 -06:00
Ted John
e7c3c1ff3c
Merge pull request #1941 from janisozaur/linux-platform-file
...
Linux platform file
2015-09-21 12:39:23 +01:00
Michał Janiszewski
b64d4225be
Declare link directories prior to using them
...
As it turns out, you have to declare your link directories before you
use them in cmake, otherwise your executables/binaries will have no
knowledge of them.
This should fix travis builds for mingw.
2015-09-20 23:19:38 +02:00
Michał Janiszewski
4ce0e3a8b2
Linux platform file
...
Add bulk of the platform file for linux, change the compilation target
from shared library to executable for linux, provide necessary changes
to make it compile & load the stub of a process.
Make sure functions are marked as stubs where needed, and implementation
is expected.
2015-09-20 23:19:08 +02:00
Ted John
46a4b47715
Merge pull request #1946 from Gymnasiast/mingw-fix
...
Take out MinGW error preventing Linux from being detected, closes #1626
2015-09-20 11:07:36 +01:00
Gymnasiast
c86f07bbba
Fix Travis
2015-09-20 12:02:09 +02:00
Gymnasiast
48ef64c913
Take out MinGW error preventing Linux from being detected.
2015-09-20 11:47:01 +02:00
Ted John
22196d931d
Merge pull request #1945 from kiwipxl/develop
...
Stopped infinite loop in ride_set_boat_hire_return_point
2015-09-20 09:26:22 +01:00
FlynnsPixel
5b99a587d5
Stopped infinite loop in boat_hire_return_point
2015-09-20 17:44:20 +10:00
Ted John
0bef4f3467
Merge Localisation/master into OpenRCT2/develop.
2015-09-20 04:00:15 +01:00
Ted John
cc01e748e8
Merge pull request #1940 from janisozaur/paths
...
Make file paths use platform-specific separators
2015-09-19 11:08:23 +01:00
Michał Janiszewski
e0860bc3ab
Make file paths use platform-specific separators
2015-09-19 09:29:39 +02:00
Ted John
e4b7785bdd
Merge Localisation/master into OpenRCT2/develop.
2015-09-19 04:00:15 +01:00
Ted John
105ff7472b
Merge pull request #1938 from janisozaur/remove-windows
...
Remove windows
2015-09-18 17:25:47 +01:00
Michał Janiszewski
4df8761831
remove windows-only code
...
Step 1 on road towards Linux.
Remove windows-specific code, stub it out where needed and make sure we
can still compile it the way it is.
Take care of Travis' build matrix to include new build configuration.
Install new packages.
2015-09-18 16:01:38 +02:00
Michał Janiszewski
30cccce98b
try libsdl2-dev:i386
2015-09-18 14:43:43 +02:00
Ted John
a762390abe
Merge pull request #1936 from Gymnasiast/operating-modes
...
Add cheat option to show all operating modes; cleanup
2015-09-18 12:44:38 +01:00
Ted John
0a1604b099
Merge pull request #1937 from janisozaur/travis-matrix
...
Create a matrix of jobs for easier configuration testing
2015-09-18 12:41:26 +01:00
Michał Janiszewski
b4a9132105
Create a matrix of jobs for easier configuration testing
...
Right now it will post two jobs, one regular and the other one
with network disabled, so both get tested on future commits.
2015-09-18 12:01:00 +02:00
Gymnasiast
e2ec6e0970
Move 'show all operating modes' to Cheats window
2015-09-18 11:55:52 +02:00
Ted John
5358b566fe
Merge pull request #1933 from janisozaur/memory
...
make sure strings are properly terminated
2015-09-18 10:39:50 +01:00
Gymnasiast
4909272a44
Add cheat option to show all operating modes; cleanup
2015-09-18 10:54:48 +02:00
Ted John
338855ba50
Merge Localisation/master into OpenRCT2/develop.
2015-09-15 04:00:15 +01:00
Michał Janiszewski
ee96aaec8e
reduce amount of times the pointer is freed to one
...
track_list_cache is being free()d as part of track_load_list, which
is a better place to do so, as it has full ownership of that pointer.
2015-09-15 00:23:46 +02:00
Michał Janiszewski
3ea534f758
make sure strings are properly terminated
2015-09-15 00:03:47 +02:00
Ted John
1d6c3baf24
Merge pull request #1932 from janisozaur/memory
...
Memory
2015-09-14 22:17:33 +01:00
Michał Janiszewski
02d83f860e
In case any memory was allocated for lang pack, free it
2015-09-14 23:03:03 +02:00
Michał Janiszewski
34f56a262b
Null-terminate buffer read from language packs
2015-09-14 22:59:44 +02:00
Ted John
5abc574593
Merge pull request #1930 from janisozaur/memory
...
memory safeness
2015-09-13 21:25:35 +01:00
Michał Janiszewski
d58b4e3589
memory safeness
...
Just some more memory checks.
One memset appears to be wrong, is fixed now.
I think this might fix #1928 , but please check.
2015-09-13 21:45:57 +02:00
Ted John
597c9e19de
Merge Localisation/master into OpenRCT2/develop.
2015-09-13 04:00:15 +01:00
IntelOrca
f988f69ae0
implement sub_6D31A6
2015-09-13 03:00:03 +01:00
Ted John
5e58dc9789
Merge pull request #1929 from janisozaur/hwnd-twisting
...
workaround for mingw bug
2015-09-12 22:59:03 +01:00
Michał Janiszewski
42691726fc
workaround for mingw bug
...
For some reason mingw or sdl has trouble providing proper HWND, which
in turn prevents opening up a window for selecting file to save when
trying to convert save game to scenario.
Fixes #1486 .
2015-09-12 23:46:40 +02:00
IntelOrca
72398151a7
implement ride_create_cable_lift
2015-09-12 18:17:35 +01:00
Ted John
f081f8430a
Merge Localisation/master into OpenRCT2/develop.
2015-09-12 13:59:21 +01:00
Ted John
daf61d0ca5
Merge pull request #1920 from Gymnasiast/fix-warnings-2
...
Fix more warnings
2015-09-12 13:54:22 +01:00
Ted John
70c88edb5d
Merge pull request #1925 from janisozaur/memory
...
Memory access fixes
2015-09-11 23:40:55 +01:00
Michał Janiszewski
788e988992
Memory access fixes
2015-09-12 00:16:05 +02:00
Ted John
967fccdac9
Merge pull request #1924 from janisozaur/painter-fix
...
Incrementation of paint_struct pointer looks bogus
2015-09-11 22:13:05 +01:00