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
Ted John
db327d26c8
Remove RCT2_GLOBALs from track_list.c
2016-09-05 21:21:33 +01:00
Ted John
584ac8031f
Integrate tooltip text and num lines
2016-09-05 21:13:53 +01:00
Ted John
4a82cd0696
Centre keyboard shortcut key change window
2016-09-05 21:06:56 +01:00
Ted John
2dc315f228
Integrate gKeyboardShortcutChangeId
2016-09-05 21:04:22 +01:00
Ted John
3c5d4adcf0
Remove RCT2_GLOBALs from staff window
2016-09-05 20:59:38 +01:00
Ted John
eebdf8be7f
x64: Fix set sign name by removing RCT2_GLOBAL use
2016-09-05 20:57:30 +01:00
Ted John
d10fdd4904
Remove unread variable
2016-09-05 20:54:22 +01:00
Ted John
9d49dbd782
Integrate gCurrentCursor
2016-09-05 20:53:30 +01:00
Ted John
1338f7cedd
Remove mouse state globals, use parameters instead
2016-09-05 20:50:33 +01:00
Ted John
029da58459
Integrate _clickRepeatTicks
2016-09-05 20:42:08 +01:00
Ted John
9966ee9092
Clean up game_handle_input
2016-09-05 20:30:06 +01:00
Ted John
3b8e2436c2
Clean up window_map_place_park_entrance_tool_down
2016-09-05 20:26:33 +01:00
Ted John
aa15ff6ed9
Fix #4379 : x64: Crash when clicking audio device dropdown
...
The dropdown arguments are limited to 8 bytes which was not enough for STRING and the 64-bit address for the string. A similar issue also for the dropdown text field. Changed to same solution as other dropdowns.
2016-09-05 00:05:48 +01:00
Ted John
35fd831d57
Remove unread variable
2016-09-04 21:58:25 +01:00
Ted John
a3c14b59dc
Integrate _unk_F1AEF0
2016-09-04 21:56:56 +01:00
Ted John
a9f17a5ded
Integrate _unk_F1AEF1
2016-09-04 21:55:06 +01:00
Ted John
3d4b938be2
Integrate local in peep_update_fixing_sub_state_9
2016-09-04 21:53:19 +01:00
Ted John
925358134a
Integrate locals in get_ride_queue_end
2016-09-04 21:50:41 +01:00
Ted John
2cd16a6fe5
Remove unread variable
2016-09-04 21:47:05 +01:00
Ted John
826585c3fc
Integrate _peepRideConsideration
2016-09-04 21:43:37 +01:00
Ted John
147493f85a
Integrate distanceThreshold local
2016-09-04 21:39:11 +01:00
Ted John
10cafb479c
Integrate _peepRideEntranceExitElement
2016-09-04 21:36:01 +01:00
Ted John
b4d2d27c9a
Integrate _unk_F1EE18
2016-09-04 21:33:27 +01:00
Ted John
27a26a616a
Merge pull request #4378 from janisozaur/integrate
...
Integrations
2016-09-04 21:15:07 +01:00
Ted John
bf16890489
Use util_rand as there is no srand for rand to work
2016-09-04 20:22:27 +01:00
Michał Janiszewski
0f6f23d588
Integrate gBanners
2016-09-04 21:19:19 +02:00