1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 21:13:05 +01:00
Commit Graph

115 Commits

Author SHA1 Message Date
Ted John
17198cfdb2 Integrate gTrackDesignSaveMode 2016-09-10 18:03:25 +01:00
Ted John
2299b22cbc Integrate staff variables 2016-09-10 15:17:18 +01:00
Marijn van der Werf
d00aa2c7bb Partially integrate vertical tunnels 2016-09-09 17:16:40 +01:00
Michał Janiszewski
5d09dbd24c Replace erroneous memcpy with memmove
When memory regions may overlap, memmove is required
2016-09-08 22:36:06 +02:00
Michał Janiszewski
0cc4238025 Replace erroneous memcpy with memmove 2016-09-08 22:13:11 +02:00
Michał Janiszewski
7eb9f19450 Workaround for mingw bug 2016-09-08 20:50:22 +02:00
Marijn van der Werf
3ddf3e350b Backup and restore tunnels after first side paint 2016-09-08 19:43:07 +02:00
Marijn van der Werf
8f3c43fcf1 Partially integrate side tunnels 2016-09-08 19:43:06 +02:00
Ted John
6a665330c2 Integrate gCommonStringFormatBuffer 2016-09-04 15:55:37 +01:00
Michał Janiszewski
f8145b6edc Refactor inclusion of addresses.h
addresses.h is now only included when necessary, limiting scope as much
as possible.
2016-09-03 21:25:19 +01:00
Ted John
17b69d257b Merge pull request #4097 from marijnvdwerf/clean/string-ids-2
Continue string ID cleanup
2016-08-28 14:05:13 +01:00
Ted John
8cf7e87b5c Fix many warnings for x64 2016-08-27 23:32:15 +01:00
Marijn van der Werf
3a7fa512a2 Use rct_string_id as type where applicable 2016-08-21 16:33:37 +02:00
Marijn van der Werf
bb1ea5c9c7 Use construction_markers 2016-08-07 20:13:46 +02:00
Michał Janiszewski
9ac3b78530 Integrate g_currently_drawn_item 2016-08-07 11:41:33 +02:00
Yaroslav Tretyakov
bb822e351d Fix #4237: Some scenery dissapears while zooming out x2 or more 2016-08-07 01:47:31 +01:00
Marijn van der Werf
0333eb760a Add macro for support height 2016-08-02 23:32:58 +02:00
Michał Janiszewski
de980c5c7a Integrate paint structs 2016-07-16 16:02:30 +01:00
Michał Janiszewski
a6d0e6916e Fix function definitions to match their declarations
This makes sure every function is properly declared, which includes
proper `extern` wrappers.
2016-07-14 14:11:49 +02:00
Marijn van der Werf
5204fb0ce9 Clean up string and sprite ID's (#3977) 2016-07-14 14:07:49 +02:00
Ted John
dca816cfd3 Merge pull request #4024 from IntelOrca/refactor/object-list
Refactor and improve the object system:
- Objects are now exported to user directory under 'object'.
- Object directories are scanned recursively.
- Improves reliability of object loading and handling of bad objects.
- Improve performance of object scanning.
- Only load new objects when loading a new game.
- Improve changing language experience.
2016-07-11 23:45:45 +01:00
duncanspumpkin
4fa10b049b Fix #3999. Animated objects correctly apply secondary colours 2016-07-09 08:05:25 +01:00
Ted John
82d90fe350 use pointer for smallscenery/var10 2016-07-08 22:58:38 +01:00
Ted John
52c11267bc add small scenery preview 2016-07-08 22:58:38 +01:00
Michał Janiszewski
644a36a310 Fixes to -Wall compilation
By default, not all warnings are enabled. This change makes sure that
the project compiles correctly with following options turned on:

    -Wall -Wno-unused-but-set-variable -Wno-missing-braces \
    -Wno-unknown-pragmas -Wno-unused-function
2016-06-20 13:46:27 +01:00
Yaroslav Tretyakov
9829fc13d3 Fix #3885: Scenery with 0 height bound box incorrect 2016-06-17 20:53:14 +01:00
Michał Janiszewski
3d4eceb5ca Fix rebase 2016-06-16 11:36:15 +02:00
Ted John
ad1b9265dc integrate variables for various drawing pointers 2016-06-16 11:36:15 +02:00
Ted John
d07b9535c2 integrate variables: object entry lists 2016-06-16 11:36:15 +02:00
Duncan
f339bd6e7a Merge pull request #3465 from marijnvdwerf/paint-setup/path
Path paint
2016-06-15 07:10:55 +01:00
duncanspumpkin
0bdff0af63 Refactor 2016-06-14 20:33:56 +01:00
Yaroslav Tretyakov
a5bf11ce86 Fix #3859: Scenery bounding box incorrect (#3874) 2016-06-14 08:02:59 +01:00
Ted John
3d76480808 fix #1433: Peep spawn point does not get set using sandbox mode
Now show peep spawns if in editor OR in sandbox mode.
2016-06-13 21:23:30 +01:00
Ted John
602d84156c fix #3856: Save Game causes Crash 2016-06-13 19:39:11 +01:00
Marijn van der Werf
b0d08d6e42 Make two branches match better 2016-06-12 19:00:30 +02:00
Marijn van der Werf
3edcadcbec Clean up function to use less globals 2016-06-11 11:47:44 +02:00
Marijn van der Werf
8e962c9157 Restore original path support drawing 2016-06-11 11:35:18 +02:00
duncanspumpkin
4131396844 Fix bugs 2016-06-11 11:24:45 +02:00
duncanspumpkin
a36a6c3ef9 Small refactor 2016-06-11 11:24:45 +02:00
duncanspumpkin
63f42c6d47 Fix support issue 2016-06-11 11:10:11 +02:00
duncanspumpkin
27eab3b0ec Finish implementing path bit drawings 2016-06-11 11:10:11 +02:00
duncanspumpkin
9f46773961 Start adding path bits paints 2016-06-11 11:10:11 +02:00
duncanspumpkin
1099a17686 Fix minor issue with declaration 2016-06-11 11:10:11 +02:00
duncanspumpkin
fc296428fd Finish function. Readd path additions. Fix scrolling text 2016-06-11 11:10:11 +02:00
duncanspumpkin
980e6ca30a Start last part 2016-06-11 11:07:41 +02:00
duncanspumpkin
a37d5e7382 Finish var_0A paths 2016-06-11 11:06:53 +02:00
Marijn van der Werf
9de7492121 Start decompilation of 0x6A3590 2016-06-11 11:06:53 +02:00
Michał Janiszewski
60630b9ad7 Drop PACKED attribute 2016-06-03 10:55:21 +02:00
Michał Janiszewski
df3030e4a9 Provide static_assert for hard-coded struct sizes. 2016-06-03 10:55:21 +02:00
Michał Janiszewski
3907fcd9d2 Explicitly pack structs 2016-06-03 10:55:21 +02:00