Commit graph

8940 commits

Author SHA1 Message Date
Ted John
17198cfdb2 Integrate gTrackDesignSaveMode 2016-09-10 18:03:25 +01:00
Ted John
d2b3a08739 Misc cleanup of RCT2_GLOBAL 2016-09-10 17:55:32 +01:00
Ted John
8950a03822 Integrate variables in top_toolbar.c 2016-09-10 17:52:46 +01:00
Ted John
20c35b10eb Integrate variables in park.c 2016-09-10 17:46:34 +01:00
Marijn van der Werf
d1801f860b Fix CMake builds on macOS (#4398) 2016-09-10 17:30:07 +02:00
Ted John
f81c394c8b Remove unused variables 2016-09-10 15:22:14 +01:00
Ted John
2299b22cbc Integrate staff variables 2016-09-10 15:17:18 +01:00
Ted John
708efdd08c Integrate unknown game variables 2016-09-10 14:46:53 +01:00
Ted John
f303642ceb Remove unused variables 2016-09-10 14:42:57 +01:00
Ted John
c21a047331 Remove variable and integrate logic instead 2016-09-10 14:40:50 +01:00
Ted John
2db375fb32 Integrate some ride variables 2016-09-10 14:37:20 +01:00
Ted John
9f4a70d642 Integrate more ride construction variables 2016-09-10 14:30:16 +01:00
Ted John
1f0820f662 Integrate various ride construction variables 2016-09-10 14:13:36 +01:00
Ted John
3b0b8a12d1 Integrate ride count 2016-09-10 13:40:58 +01:00
Ted John
d12804b242 Show message boxes if unable to load g1 / g2 2016-09-10 12:45:33 +01:00
Ted John
b5211a41de Integrate viewport ref counters 2016-09-10 12:35:18 +01:00
Ted John
d0950af9df Integrate gClearSceneryCost and gLandRightsCost 2016-09-10 12:28:01 +01:00
Ted John
b1e9810ec6 Fix shop profit calculation by using integrated variables 2016-09-09 23:48:17 +01:00
Ted John
952b9cb194 Remove remaining GLOBALs from guest window 2016-09-09 23:39:00 +01:00
Michał Janiszewski
2237524f7e Remove unused addresses
These addresses are only ever written to and not read anywhere in
decompiled code. Vanilla code seems to still work fine.
2016-09-09 22:16:34 +01:00
Marijn van der Werf
c2a6eba1d3 Skip zeroed ride design previews 2016-09-09 22:15:29 +01:00
Michał Janiszewski
2759772fca Cleanup in SoftwareDrawingEngine::DisplayViaTexture 2016-09-09 20:00:06 +01:00
Marijn van der Werf
d00aa2c7bb Partially integrate vertical tunnels 2016-09-09 17:16:40 +01:00
wolfreak99
498bab24c3 Fix window limit displayed in options 2016-09-09 17:16:12 +01:00
Ted John
cdaddaa00d Fix #4385: Wrong numbers in guests thoughts summary
get_arguments_from_peep was not setting the output thought arguments when a guest had no valid thought.
2016-09-08 22:06:39 +01:00
Ted John
91eb33255b Remove Exception::GetMsg()
We can undef any macro windows.h defines and interferes with our code base. In this case GetMessage
2016-09-08 21:37:27 +01:00
Ted John
e4b53630ed Move S4Importer to cpp and only expose interface 2016-09-08 21:37:27 +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
Duncan
ae937a240b Merge pull request #4387 from janisozaur/mingw-fix
Workaround for mingw bug
2016-09-08 20:05:30 +01:00
Michał Janiszewski
7eb9f19450 Workaround for mingw bug 2016-09-08 20:50:22 +02:00
Duncan
9c78734765 Merge pull request #4382 from marijnvdwerf/integrate/side-tunnels
Partially integrate side tunnels
2016-09-08 19:10:39 +01: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
duncanspumpkin
933d13ecde Fix jr rc up/down slope tunnels 2016-09-08 18:09:10 +01:00
Michał Janiszewski
163e314379 Remove unused or set-but-not-read variables 2016-09-07 13:39:29 +01:00
Ted John
a48976cc6b Fix x86 warning 2016-09-06 22:06:56 +01:00
Michael Steenbeek
78a38b07b9 Merge pull request #3819 from marcovmun/Fix-3571
Fix #3571 and made scrolling in windowed mode more generic
2016-09-06 22:57:01 +02:00
Ted John
220afe04d5 x64: Fix readentirefile calls 2016-09-06 21:33:15 +01:00
Ted John
d6a3b1e093 Fix #4334: Some SV4 files fail to load
- Ride entries are now re-used where objects are the same.
- Number of scenery groups is now safely limited to 19, the maximum RCT2 supports.
2016-09-06 18:43:01 +01:00
Ted John
eccea88388 Fix Guard::Assert with null message 2016-09-06 18:41:05 +01:00
Michał Janiszewski
dc37095a41 Ensure rct1_get_ride_type_object is declared in C++ 2016-09-06 07:54:50 +02:00
Ted John
00bfe1befb Use RCT2_ADDRESS macro so mmap works correctly 2016-09-06 00:10:58 +01:00
Ted John
2b33c3d55e Integrate globals in new_ride.c 2016-09-05 23:20:08 +01:00
Ted John
248424e6ad Remove uses of 0x009BC677 buffer 2016-09-05 23:00:17 +01:00
Ted John
1e65c7e940 Replace cursor position globals with gCursorState 2016-09-05 22:37:57 +01:00
Ted John
1c9164d3d3 Use stack space instead of RCT2 string address 2016-09-05 22:34:07 +01:00
Ted John
7fd3fd0004 Remove s6Header use in editor_clear_map_for_editing 2016-09-05 22:31:12 +01:00
Ted John
32a6722cda Integrate gEditorSelectedObjects 2016-09-05 22:26:02 +01:00
Ted John
669396e841 Remove RCT_GLOBALs from track_design.c 2016-09-05 21:45:50 +01:00