Marijn van der Werf
59d2c7a341
Integrate table at 0x009A36C4
2016-09-17 16:07:45 +02:00
Ted John
814f67fb3d
Revert "Remove unoriginal junior RC tracks"
...
This reverts commit 6d03980f20
.
2016-09-16 18:54:54 +01:00
Marijn van der Werf
8982d87e77
Add missing paint functions to track_data_old
2016-09-16 19:45:07 +02:00
Marijn van der Werf
6d03980f20
Remove unoriginal junior RC tracks
2016-09-16 19:44:20 +02:00
Marijn van der Werf
0935ac6ea9
Start drawing debug test
2016-09-16 19:42:53 +02:00
Marijn van der Werf
840ab4a1aa
Fix Crooked House
2016-09-16 15:48:36 +02:00
Marijn van der Werf
f185003060
Fix Submarine Ride
2016-09-16 15:48:36 +02:00
Marijn van der Werf
d1e2a206c9
Fix Junior RollerCoaster
2016-09-16 15:48:36 +02:00
Marijn van der Werf
5ae8d40e16
Fix Mini Helicopters
2016-09-16 15:48:36 +02:00
Marijn van der Werf
4dea417470
Fix Viriginia Reel
2016-09-16 15:48:35 +02:00
Marijn van der Werf
f0dd452fa3
Fix Maze
2016-09-16 15:48:35 +02:00
Marijn van der Werf
81b62a75ff
Fix Mini Golf
2016-09-16 15:48:35 +02:00
Marijn van der Werf
c434c80bb5
Fix Monorail Cycles
2016-09-16 15:48:34 +02:00
Marijn van der Werf
37b41da9f3
Fix Go Karts
2016-09-16 15:48:34 +02:00
Marijn van der Werf
fbc85d8e4a
Fix Pirate Ship
2016-09-16 15:48:34 +02:00
Marijn van der Werf
67539ed466
Fix Monorail
2016-09-16 15:48:34 +02:00
Marijn van der Werf
f88ef72c7f
Fix River Rapids
2016-09-16 15:48:34 +02:00
Ted John
0f8cd56c1a
Conditionally integrate gUnk9DE568 and gUnk9DE56C
2016-09-14 23:43:30 +01:00
Ted John
931fc59506
Replace 0x009DE56A, 0x009DE56E with gPaintMapPosition
2016-09-14 22:07:42 +01:00
Marijn van der Werf
f28c35712f
Partially integrate 0x0141E9DB
2016-09-14 18:36:46 +01:00
Duncan
00e2d44264
Refactor sprite functions
2016-09-14 18:22:37 +01:00
Marijn van der Werf
d3b7a0cbb9
Integrate addresses of old paint functions
2016-09-13 20:25:06 +01:00
Duncan
6e92df1299
Fix #4386 : Wrong animation - Merry Go Round
...
Issue caused by data integration. The rotation time to sprite maps had an extra 7 end bytes at the end of each array to account for the increased time increments during control failure. Without the extra end bytes the game would access invalid memory during a control failure.
Refactored code of vehicle update to remove register names.
2016-09-13 19:47:31 +01:00
Ted John
d8a2ee47b8
Remove unused globals in track.c
2016-09-12 20:51:57 +01:00
Ted John
8d5a553c0a
Remove old config compatibility
...
Note: This will stop paths from showing the correct height markers when in original drawing mode.
2016-09-12 20:39:07 +01:00
Ted John
a2bf35eee5
Remove old Junior RC paint hack
2016-09-12 19:51:30 +01:00
Marijn van der Werf
2232f63973
Integrate leftover references to gTrackColours
2016-09-12 13:02:32 +02:00
Ted John
64df46ba16
Integrate and remove unused globals
2016-09-11 01:02:16 +01:00
Ted John
4a6b2f2ef2
Integrate gRides and gRideMeasurements
2016-09-11 00:05:32 +01:00
Ted John
2f8b307ab7
Merge pull request #4405 from marijnvdwerf/integrate/various-paint
...
Partially integrate various paint variables
2016-09-10 23:02:15 +01:00
Marijn van der Werf
b80377f5da
Partially integrate track colours
2016-09-10 22:45:54 +01:00
Marijn van der Werf
e490070a11
Partially integrate 0x009DEA58
2016-09-10 23:43:46 +02:00
Marijn van der Werf
c5d947c1aa
Partially integrate surface variables
2016-09-10 23:43:41 +02:00
Ted John
ba453db01f
Integrate vehicle globals, part 2
2016-09-10 22:32:01 +01:00
Ted John
e234dcbb10
Integrate vehicle globals, part 1
2016-09-10 22:18:51 +01:00
Ted John
4350e53392
Integrate gS6Info
2016-09-10 18:30:53 +01:00
Ted John
f36485557d
Integrate remaining globals in ride window
2016-09-10 18:21:05 +01:00
Ted John
17198cfdb2
Integrate gTrackDesignSaveMode
2016-09-10 18:03:25 +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
Marijn van der Werf
d00aa2c7bb
Partially integrate vertical tunnels
2016-09-09 17:16:40 +01: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
669396e841
Remove RCT_GLOBALs from track_design.c
2016-09-05 21:45:50 +01:00
Michał Janiszewski
0d9fa13dc9
Integrate gTotalRideValue, gSamePriceThroughoutParkA and B
2016-09-04 21:19:19 +02:00
duncanspumpkin
8c5395cbd1
Fix jr rc left/right half banked helix up/down small bound boxes
2016-09-04 18:07:27 +01:00
duncanspumpkin
b449ed16ec
Fix jr rc left quarter turn 5 tiles 25 deg up bound boxes
...
And right quarter turn 5 tiles 25 deg down
2016-09-04 17:41:04 +01:00
duncanspumpkin
b7e72cec36
Fix jr rc left/right quarter turn 5 tiles bound box
2016-09-04 17:28:09 +01:00
duncanspumpkin
5494dcd0e7
Fix jr rc right/left quarter turn 3 tile bank bound boxes
2016-09-04 16:58:51 +01:00
duncanspumpkin
c4a20ec6ae
Fix jr rc left/right s bend bound boxes
2016-09-04 16:58:50 +01:00
duncanspumpkin
292f7f87ef
Fix jr rc left/right diag bank bound boxes
2016-09-04 16:58:49 +01:00
duncanspumpkin
47f4722e84
Fix jr rc Right/left Eigth Bank to Diag Bound Box
2016-09-04 16:58:49 +01:00
duncanspumpkin
fbb1f740df
Fix jr rc left bank bounding boxes
2016-09-04 16:58:48 +01:00
Ted John
ae0eb1804c
Integrate gParkRatingCasualtyPenalty
2016-09-04 15:44:59 +01:00
Ted John
e47b8d906e
Integrate gLastEntranceStyle
2016-09-04 15:21:49 +01:00
Ted John
9c645e0a0f
Refactor track_design_draw_preview
2016-09-04 12:16:56 +01:00
Ted John
73cf06d334
Merge pull request #4359 from jensj12/infinite-loop
...
Fix #2081 : Prevent infinite loop
2016-09-04 00:12:02 +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
jensj12
5500e9e5cd
Fix backwards loop in vehicle.c
2016-09-03 16:56:00 +02:00
jensj12
c7879d08cd
Fix #2081 : prevent infinite loop in ride_find_track_gap
...
Adds an extra iterator that steps forward at half the speed of the
normal iterator. If they ever meet, there's a loop in the track and the
track is classified as incomplete.
2016-09-03 16:56:00 +02:00
Ted John
2722a85ee4
Fix #4349 : x64: Crash when placing roller coaster track designs
2016-09-03 13:09:50 +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
Michael Steenbeek
7ebdec7e8f
Implement flat-to-steep pieces and 25-to-60-degree lifts on the Junior rc
2016-08-27 23:36:36 +01:00
Ted John
8cf7e87b5c
Fix many warnings for x64
2016-08-27 23:32:15 +01:00
Marijn van der Werf
245f289fd8
Identify raw string ids
2016-08-21 16:33:37 +02: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
bc3ec1b871
Use table for ride names
2016-08-21 16:31:06 +02:00
Ted John
9b77bb35ae
Fix #4113 : Free rides: Income and profit calculated using old price
2016-08-21 13:49:37 +01:00
Marijn van der Werf
9319bee91f
Use already integrated data
2016-08-20 22:12:52 +01:00
Marijn van der Werf
853b1c79b2
Integrate stru_9A3AC4
2016-08-20 21:59:59 +01:00
Marijn van der Werf
d51a14e8ca
Integrate word_9A3684
2016-08-20 22:20:18 +02:00
Marijn van der Werf
f862bc8675
Integrate dword_9A2970
2016-08-20 22:01:42 +02:00
Marijn van der Werf
db92fc474f
Integrate dword_9A2930
2016-08-20 21:50:27 +02:00
Marijn van der Werf
d0399dd7f7
Include motion simulator vehicle data
2016-08-20 16:56:55 +01:00
Marijn van der Werf
d99fa770fd
Include vehicle rotation data
2016-08-20 00:53:54 +01:00
Marijn van der Werf
72cb30c7c4
Include topspin vehicle data
2016-08-19 18:59:23 +01:00
Ted John
5a046ece60
Merge pull request #4291 from zaxcav/stationSync
...
Fix problems with syncing adjacent stations
2016-08-17 23:04:02 +01:00
Marijn van der Werf
103be20db9
Fix #4297 : Rides floating above ground level
2016-08-16 22:42:37 +01:00
Ted John
3f9c5456d4
Merge pull request #4212 from marijnvdwerf/clean/data-trackflags
...
Include track flags
2016-08-16 17:55:29 +01:00
zaxcav
6e4290eed7
Remove incorrect details from comment.
2016-08-15 13:21:06 +02:00
zaxcav
a562fc4e0b
Remove commented out code.
2016-08-15 12:44:20 +02:00
zaxcav
de00f27195
Fix issues with sync adjacent stations
...
Change try_add_synchronised_station() so that adjacent stations are always in the _synchronisedVehicles list; those without a vehicle to sync have vehicle_id == SPRITE_INDEX_NULL.
Change vehicle_can_depart_synchronised() so that adjacent stations are searched for on both sides of the tile; reverse the logic of the return values to make sense with respect to the function name (all except for the case when there are no adjacent stations, which already made sense and was consequently flipped in relation to all other returns; numerous minor fixes to the checks on the departure conditions/exceptions.
In vehicle_update_waiting_to_depart() flip the logic on the call to vehicle_can_depart_synchronised() according with the above change to its return values.
Fixes issues: #4178 and #4182
2016-08-15 12:13:46 +02:00
Ted John
154bb0d475
Integrate guest and park globals
...
Note: this also fixes loading of landscapes in the editor which did not use the new SC loading code.
2016-08-14 15:50:52 +01:00
Ted John
cb3a023755
Use integrated variables for ride ratings brakes and reversers
2016-08-14 15:01:16 +01:00
Ted John
9830ca3561
Format code for #ifdefs in ride_ratings.c
2016-08-14 14:48:47 +01:00
Ted John
223d377d09
Integrate ride rating calc data using struct
2016-08-14 14:47:53 +01:00
Marijn van der Werf
82d0d229ce
Use word_981D6C
2016-08-14 13:12:07 +01:00
Marijn van der Werf
57ea87ed0b
Integrate FlatTrackCoordinates
2016-08-14 13:10:44 +01:00
Michael Steenbeek
7f71bece5c
Clean up some residual usage of non-integrated versions of already integrated variables
2016-08-13 10:52:42 +01:00
Marijn van der Werf
6610190e8c
Include track flags
2016-08-12 22:42:48 +02:00
Marijn van der Werf
38b5bba668
Integrate TrackSequenceElementAllowedWallEdges
2016-08-12 21:39:49 +01:00
Ted John
97b0245697
Merge pull request #4181 from marijnvdwerf/clean/data-1
...
Misc RCT data integration
2016-08-12 20:52:10 +01:00
Marijn van der Werf
8903559f75
Include data at `0x99ba64` and `0x99ca64`
2016-08-12 20:51:22 +01:00
Ted John
389d75534d
Merge pull request #4224 from marijnvdwerf/clean/data-5
...
[Clean] Use already integrated data
2016-08-12 20:50:37 +01:00
Marijn van der Werf
34e046df41
Include TrackHeightMarkerPositions
2016-08-12 20:22:25 +01:00
Yaroslav Tretyakov
4066009778
Fix #4253 : Crash in vehicle_update_motion_collision_detection
2016-08-09 08:35:16 +01:00
Michał Janiszewski
20781a2922
Prevent using drawing functions in NO_RCT2 builds
2016-08-08 07:25:22 +02:00
Marijn van der Werf
b707053fce
Add defines for colour groups
2016-08-07 20:13:46 +02:00
Marijn van der Werf
d556281a5a
Include RideColourPresets
2016-08-07 20:13:46 +02:00
Marijn van der Werf
6bdc2206d9
Use `gPaintInteractionType`
2016-08-07 20:13:44 +02:00
Marijn van der Werf
fc750583f9
Use MAP_ELEMENT_TYPE_FLAG_HIGHLIGHT
2016-08-07 20:12:48 +02:00
Marijn van der Werf
040a35f254
Inline `0xF4413E` as local variable
2016-08-07 20:12:46 +02:00
Marijn van der Werf
b428a95724
Ride classes
2016-08-07 20:11:43 +02:00
Marijn van der Werf
f05a1b1e89
Clean up Top Spin
2016-08-07 20:05:21 +02:00
Marijn van der Werf
0054493d41
Remove globals used by crooked house paint
2016-08-07 20:05:19 +02:00
Marijn van der Werf
ceaa7c8a04
Add track mirroring data
2016-08-07 14:31:19 +02:00
Marijn van der Werf
d5b8fe3732
Integrate dodgems data
2016-08-07 14:31:13 +02:00
Marijn van der Werf
897fc0591b
Integrate track pricing
2016-08-07 14:31:08 +02:00
Ted John
ba4df424cb
Merge pull request #4245 from janisozaur/integrate3
...
Integrations
2016-08-07 13:02:31 +01:00
Marijn van der Werf
ec4cf80623
Use `RideData4`
2016-08-07 13:01:20 +01:00
Michał Janiszewski
9ac3b78530
Integrate g_currently_drawn_item
2016-08-07 11:41:33 +02:00
Michał Janiszewski
0ece63a7f6
Wrap RCT2's addresses in RCT2_ADDRESS macro
2016-08-06 21:38:46 +01:00
Marijn van der Werf
680f7b7770
Integrate maze building data
2016-08-06 15:05:37 +01:00
Marijn van der Werf
ac950e0496
Integrate `0x0098DDB8` and `0x0098DDBA`
2016-08-06 13:20:18 +01:00
Marijn van der Werf
dd2178c7cf
Include AlternativeTrackTypes
2016-08-06 01:09:28 +01:00
Marijn van der Werf
b777a36722
Remove maze people limit override
2016-08-06 01:04:37 +02:00
Marijn van der Werf
1fc5681f00
Use `TrackCoordinates`
2016-08-06 01:04:35 +02:00
Marijn van der Werf
d0bb8597d9
Use RideProperties
2016-08-06 01:03:45 +02:00
Michał Janiszewski
801c7f27d5
Use named addresses
2016-08-05 22:46:45 +01:00
Ted John
a66f55269b
Merge pull request #4211 from marijnvdwerf/clean/data-trackdefinitions
...
Integrate track definitions
2016-08-05 17:29:27 +01:00
Marijn van der Werf
9288029bd6
Include RideConstructionDefaultTrackType
2016-08-05 13:11:25 +01:00
Marijn van der Werf
082e4c76fa
Include data from `0x0097D7CB`
2016-08-05 11:53:44 +01:00
Marijn van der Werf
de6dcaaa86
Include data at `0x00982164`
...
Reversed columns used for hot and cold values. Seemed to be a mistake in decompiling.
2016-08-04 23:36:51 +01:00
Marijn van der Werf
eb25fe2f38
Integrate (FlatRide)TrackDefinitions
2016-08-04 01:16:31 +02:00
Marijn van der Werf
3d8b71ffbc
Rename `gTrackDefinitions` to `TrackDefinitions`
2016-08-04 01:15:23 +02:00
Marijn van der Werf
69027a81e4
Add constants for flat ride tracks ( #4209 )
2016-08-04 00:36:42 +02:00
Ted John
70853d65d6
Merge pull request #4203 from janisozaur/integration
...
Integration commits from #4181
2016-08-03 21:21:27 +01:00
Michael Steenbeek
c522f9cfd3
Implement max people on maze properly
...
Last year the limit for max people on maze was raised using a hack. Since the responsible table has been implemented since then, remove the hack and update the value in the table.
2016-08-03 19:41:31 +01:00
Marijn van der Werf
0333eb760a
Add macro for support height
2016-08-02 23:32:58 +02:00
Michał Janiszewski
a7f31dda4f
Fix issues from gRideProperties review
...
Also renames it to RideProperties
2016-08-02 23:04:18 +02:00
Michał Janiszewski
6db035f318
Extract gRideProperties ride flags
2016-08-02 12:56:08 +02:00
Michał Janiszewski
6ba62ed123
Integrate vehicle synchronisation info
2016-08-01 23:33:55 +02:00
Michał Janiszewski
2db2ef5eec
Fix pointer types
2016-08-01 23:14:42 +02:00
Michał Janiszewski
09a20524a5
Integrate gRideProperties
2016-08-01 23:14:42 +02:00
Michał Janiszewski
155bc054df
Fix #4172 : Expose ride-type changing capability in UI
...
This also allows changing ride type in multiplayer games. Very crashy.
2016-08-01 20:30:08 +02:00
Michael Steenbeek
ff7e119b46
Name some track design flags
2016-07-31 12:02:38 +01:00
Marijn van der Werf
a17e6cee5e
Use constants for shop item images
2016-07-28 23:28:32 +02:00
Michał Janiszewski
3fcc7ab4ef
Fix #3822 : Crash in check_and_apply_block_section_stop_site
2016-07-27 23:09:17 +01:00
Ted John
f5f4238c0b
Merge pull request #3888 from marijnvdwerf/integrate/mini-golf
...
Integrate mini golf data.
2016-07-26 19:24:08 +01:00
Marijn van der Werf
215ed5e14d
Attempt to name animations
2016-07-25 22:11:35 +02:00
Michał Janiszewski
418eb06e66
Fix #3987 : division by zero in vehicle update
...
Prevent division by zero by checking the value first.
2016-07-23 21:52:28 +01:00
duncanspumpkin
9652f68024
Implemented junior rollercoaster paint
2016-07-22 19:16:03 +01:00
Ted John
2d1cbc916f
Check for valid colour presets on vehicle game command
...
Fixes an issue some people were getting on servers where clients were somehow sending invalid preset IDs for a given ride entry.
2016-07-21 19:51:06 +01:00
Michał Janiszewski
c2929181c2
Ensure validity of gActiveTrackDesign
2016-07-18 21:18:36 +02:00
Michał Janiszewski
313230a9a4
Refactor more code to correctly handle sprite count
2016-07-17 23:24:16 +02:00
Michał Janiszewski
381545aa2b
Refactor loop in vehicle update not to access invalid memory
2016-07-17 23:14:27 +02:00
Michał Janiszewski
9f57c82653
Refactor access to g_sprite_list
...
Hide g_sprite_list behind accessor function with a check. `assert` is
temporarily disabled, as it breaks nearly every park.
2016-07-17 22:19:34 +02:00
Michał Janiszewski
81ab78a335
Add missing `static` to `ride_is_ride`
2016-07-16 17:42:10 +02:00
Ted John
304d6d9304
Fix #4110 : guests still get charged for rides
2016-07-16 16:27:49 +01:00
Michał Janiszewski
a2ce5d5696
Integrate gCurrentVehicle
2016-07-16 14:47:53 +01:00
Michał Janiszewski
601f344b40
Integrate g_music_tracking_viewport
2016-07-16 13:07:01 +01:00
Ted John
fd339d29b1
import pointer parts of data for top spin and rotations
2016-07-16 13:06:05 +01:00
Ted John
439220b86e
import SwingingTimeToSpriteMaps data
2016-07-16 13:06:05 +01:00
Ted John
1d8f14715c
import vehicle data for various rides
2016-07-16 13:06:05 +01:00
Duncan
1e1546d87c
Merge pull request #4064 from gDanix/fix-4060
...
Fix #4060 : Block brakes have a different behaviour from RCT2.
2016-07-16 13:04:53 +01:00
Michał Janiszewski
1742ce71ed
Fix handling of signed types
2016-07-15 18:48:22 +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
Daniel Trujillo
8638cf924d
Refactor hill stop site code
2016-07-12 20:33:19 +02:00
Daniel Trujillo
4fba02567f
Add support for cable lift chain to stop train (old behaviour)
2016-07-12 19:47:03 +02:00
Daniel Trujillo
37c4b549d2
Revert block brakes behaviour to the old one (always braking)
...
Anyway, there is possible to swith between different behaviours
through a preprocessor directive
2016-07-12 19:32:53 +02:00
Daniel Trujillo
ac314a4d61
Fix the block-sectioned lift chain not working properly
2016-07-12 19:32:53 +02:00
duncanspumpkin
af2746e087
Display path name of incorrect track checksum. Part of #4063
2016-07-12 17:44:19 +01:00
Marijn van der Werf
6c702fb1a9
Set correct sprite type for Magic Carpet drawing
2016-07-11 23:46:43 +01: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
Sijmen Schoon
d8bc890d0a
Exit scenery selection mode when done saving
2016-07-11 19:13:30 +02:00
Sijmen Schoon
a194c91997
Use OpenRCT2 dialog for saving tracks
2016-07-11 19:13:30 +02:00
Daniel Trujillo
8eeb6056a1
Fix grammar issues.
2016-07-10 00:01:55 +02:00
Daniel Trujillo
13f6959ae3
Rector block_brake_closed parameter from apply_block_brakes
...
To remark that is a variable, rather than a constant (closed)
2016-07-09 23:43:04 +02:00
Daniel Trujillo
3e782d9295
Deep splitting and rewriting of the sub_6D... code
2016-07-09 23:43:04 +02:00
Daniel Trujillo
a3661e5842
Swapped if/else at line 5402
...
Applied De Morgan's laws to simplify condition
2016-07-09 23:43:04 +02:00
Daniel Trujillo
453b33a7b7
Move "apply_block_section_stop_site" on top of "check_and_apply...()"
...
To make it callable from "check_and_apply...()"
2016-07-09 23:43:04 +02:00
Daniel Trujillo
3e0754f14d
Rename sub_6DAB4C_chunk_2
2016-07-09 23:43:04 +02:00
Daniel Trujillo
013266c6ae
Add needed calls to the new function
2016-07-09 23:43:04 +02:00
Daniel Trujillo
ed73a9dfe0
Break vehicle-handling code into another function
2016-07-09 23:43:04 +02:00
Daniel Trujillo
efb720326d
Add an implicit "else"
...
After "vehicle->velocity = 0", the sentence:
"vehicle->velocity -= vehicle->velocity >> 3" doesn't have any
effect, so insert an "else" can clarify the code
2016-07-09 23:43:04 +02:00
Daniel Trujillo
95e727d376
Add comments to the code
2016-07-09 23:43:04 +02:00
Daniel Trujillo
92b5e661fb
Break an "else" into pieces
2016-07-09 23:43:04 +02:00
Daniel Trujillo
f56f7065ac
Make more obvious the last "else" previously made with a "return"
2016-07-09 23:43:04 +02:00
Daniel Trujillo
cb4fe669a9
Name constant (1 << 5) -> MAP_ELEMENT_FLAG_BLOCK_BREAK_CLOSED
2016-07-09 23:43:04 +02:00
Ted John
d7e1933f12
fix track manager preview
2016-07-08 22:58:38 +01:00
Ted John
a47c039f22
remove lots of old object code
2016-07-08 22:58:38 +01:00
Ted John
202b754d8d
fix ride type to ride entry map
2016-07-08 22:58:38 +01:00
Ted John
76b2621a51
Merge pull request #4000 from SijmenSchoon/develop
...
Add a "default" button to the loadsave window
2016-07-08 22:58:07 +01:00
Sijmen Schoon
d06633331a
Fix the closing of ferris wheels
...
Well, that was anticlimactic
2016-07-08 23:36:59 +02:00
Daniel Trujillo
d731a015ea
Fix bug causing block brakes blocking vehicles in non-block mode
...
A comparison has been added to ensure that, if the ride isn't in a
block-sectioned mode, the block brakes will act as a simple brakes
(with 6 km/h boosters)
2016-07-08 19:03:22 +02:00
Sijmen Schoon
511ce8f06a
Sort includes
2016-07-08 15:21:08 +02:00
Sijmen Schoon
662d92be74
Fix track load/save last-dir storing
...
Doesn't really belong to this PR, but it's needed anyway
2016-07-08 11:29:45 +02:00
X123M3-256
6c0d4c52c3
Enable diagonal steep slopes for the junior coaster
2016-07-07 21:36:00 +01:00
Michał Janiszewski
6c28df8250
Integrate gTypeToRideEntryIndexMap
2016-06-24 23:25:40 +02:00
Michał Janiszewski
dfa482b1b5
Revert "Merge pull request #3897 from janisozaur/rebase-no-rct2"
...
This reverts commit 22c0cc92e6
, reversing
changes made to 7b421c8052
.
2016-06-24 22:40:37 +02:00
Gymnasiast
c487e1278b
Allow most steep inclines for the Junior RC
2016-06-20 20:08:11 +02: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
Michał Janiszewski
c177cc72e9
fix #3917 : no rides show in new ride window
...
Make sure gTypeToRideEntryIndexMap is properly sized
2016-06-20 10:20:22 +01:00
Michał Janiszewski
cb4b9ba1c3
Integrate gTypeToRideEntryIndexMap
2016-06-19 23:52:20 +02:00
Michał Janiszewski
58b4361e8d
Pack structs for when loading from files
2016-06-19 18:12:14 +02:00
Michał Janiszewski
340997b365
Add new function to object vtable: reset
...
For use when an object has to be recreated based on already-existing
copy in memory with pointers of native length.
2016-06-19 18:12:14 +02:00
Michał Janiszewski
8a6eec0236
Try loading objects for x86-64
2016-06-19 18:12:14 +02:00
Marijn van der Werf
6050b1d07a
Identify `rct_vehicle:var_D4`
2016-06-19 16:17:23 +02:00
Marijn van der Werf
2d7526cd7e
Attempt to name mini golf animations
2016-06-19 16:16:35 +02:00
Marijn van der Werf
d3d48bd9af
Use macro for currentViewportFlags
2016-06-19 16:16:12 +02:00
Josue Acevedo
fd13c200e6
Fix possible track configurations. Fixes #3564 . ( #3898 )
2016-06-18 01:10:09 +01:00
Marijn van der Werf
1534c95f9c
use integrated data for `vehicle_update`
2016-06-18 00:24:53 +02:00
Marijn van der Werf
7d1e1671ed
Integrate mini golf variables
2016-06-16 23:37:44 +02:00
Michał Janiszewski
542828b5d4
Fix wrong vehicle position, nullptr guard
2016-06-16 23:14:38 +02:00
Michał Janiszewski
c2bf4b75e7
Integrate tile map element pointers usage ( #3442 )
2016-06-16 19:05: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
Ted John
2fa0c7977a
add OpenGL drawing engine with FillRect impl
2016-06-07 22:45:36 +01:00
X123M3-256
706b3db99e
Chain lift cheat ( #3818 )
...
* Fix conflict with disable plant aging cheat
* Allow chain lift on any piece
* Keep chain toggled while building
* Ignore current chain lift state when cheat enabled
* Update string ids to one not already used
* Implement command for toggling cheat
* Allow chain on steep tracks when cheat is enabled
* Add checkbox for chain cheat
* Fix spacing
* Send cheat over network
* Change label for checkbox
* Replaced tabs with spaces
2016-06-07 22:08:38 +01:00
Jeroen D Stout
21dcb405ce
Merged with Open dev
2016-06-04 15:35:14 +02:00
Jeroen D Stout
3f10698bf7
Removed insertion code from vehicle paint (was unreliable)
2016-06-04 15:31:32 +02:00
Jeroen D Stout
c98b121a05
Add lights to rides
2016-06-04 01:03:22 +02:00
Ted John
428724d86c
refactor reset_sprite_spatial_index, integrate gSpriteSpatialIndex
2016-06-03 18:13:00 +01:00
Michał Janiszewski
a44cd9cb15
Fix undefined left shifts
2016-06-03 13:14:36 +02:00
Michał Janiszewski
24991b03ec
Check for NULL mapElement in ride_update_station_blocksection
...
Fixes #3434
2016-06-03 13:14:35 +02:00
Michał Janiszewski
1508e49a28
Change macro to assert_struct_size
2016-06-03 11:29:50 +02:00
Michał Janiszewski
934ce5e84e
Fix 64 bit by skipping static_asserts for structs with pointers
2016-06-03 10:55:21 +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
Jeroen D Stout
29b91c442c
Replaced 'peep_*' with 'vehicle_*' in light insertions in vehicle_paint
2016-06-01 16:00:00 +02:00
JeroenDStout
f5783231c0
Lightfx
2016-05-31 23:49:58 +02:00
Ted John
fbcc68dff1
fix #3575 : Construction Redirection Bug
...
Was probably only caused when a player did not have 'Allow unfinished tracks to be tested' enabled. The function was too embeded to work into a callback function, so a new flag is added to say whether the current game command is network sourced or not. This now means the host has to have the unfinished tracks option enabled, otherwise nothing will happen on the client machine. Unfortunately if the host has it enabled and the client doesn't, the command will run on the host game but not the client game and desync. The option, like some of the cheats is game session fixed.
2016-05-30 12:39:17 +01:00
Ted John
2334e701e4
fix infinite loop
2016-05-30 02:15:45 +01:00
Duncan
8a427a2676
Merge pull request #3737 from marijnvdwerf/paint-setup/monorail
...
Paint setup/Monorail
2016-05-29 07:54:35 +01:00
duncanspumpkin
e373eeafa8
Fix virginia reel tunnels.
2016-05-27 20:41:41 +01:00
Marijn van der Werf
b39c086293
Draw station
2016-05-26 18:22:48 +02:00
Marijn van der Werf
9089a9d560
Paint other diagonal tracks
2016-05-26 18:22:48 +02:00
Marijn van der Werf
abdf86c6fb
Draw flat diagonal
2016-05-26 18:22:48 +02:00
Marijn van der Werf
dbb4933c63
Draw S-bends
2016-05-26 18:22:48 +02:00
Marijn van der Werf
23a9cdb6ce
Draw 3-tile turns
2016-05-26 18:22:48 +02:00
Marijn van der Werf
7d5f842d0f
Paint 5-tile turn
2016-05-26 18:22:47 +02:00
Marijn van der Werf
45686c2ab2
Paint 25 deg up to flat
2016-05-26 18:22:47 +02:00
Marijn van der Werf
4c0ea51540
Draw flat to 25 deg up
2016-05-26 18:22:47 +02:00
Marijn van der Werf
85c6f75acd
Draw 25 deg up
2016-05-26 18:22:47 +02:00
Marijn van der Werf
22e20aa4dc
Draw flat track
2016-05-26 18:22:47 +02:00
Marijn van der Werf
883031b83c
Draw Monorail half-corners
2016-05-26 18:22:46 +02:00
Michael Steenbeek
712d97da79
Remove Intamin and Phoenix easter eggs ( #3732 )
2016-05-25 20:01:24 +01:00
Marijn van der Werf
30e82ba82c
Fix car ride station drawing
2016-05-25 14:59:52 +02:00
Marijn van der Werf
b276604277
Draw station
2016-05-25 14:59:33 +02:00
Marijn van der Werf
26ff0ab5a5
Paint 3-tile turn
2016-05-25 14:54:15 +02:00
Marijn van der Werf
3e11d70272
Draw spinning tunnel
2016-05-25 14:44:06 +02:00
Marijn van der Werf
e74435af64
Paint quarter turn
2016-05-25 14:26:35 +02:00
Marijn van der Werf
91a470c905
Draw inverse slopes
2016-05-25 14:26:35 +02:00
Marijn van der Werf
9fdb73452d
Draw 25 deg up to flat
2016-05-25 14:26:35 +02:00
Marijn van der Werf
75493a5433
Draw flat to 25 deg up
2016-05-25 14:26:35 +02:00
Marijn van der Werf
9e84237da3
Paint 25 deg up
2016-05-25 14:26:35 +02:00
Marijn van der Werf
2723713f7f
Draw brakes
2016-05-25 14:26:35 +02:00
Marijn van der Werf
f618a67dc4
Draw flat track
2016-05-25 14:26:35 +02:00
Marijn van der Werf
30c4f2232b
Draw station
2016-05-24 21:31:46 +02:00
Marijn van der Werf
7e92395bf5
Draw 3-tile turns
2016-05-24 21:31:44 +02:00
Marijn van der Werf
ed08deaac1
Paint quarter turns
2016-05-24 21:31:07 +02:00
Marijn van der Werf
8f4ac4bd2a
Draw spinning tunnel
2016-05-24 21:31:07 +02:00
Marijn van der Werf
52eaedbefa
Draw log bumps
2016-05-24 21:31:06 +02:00
Marijn van der Werf
b3a134586c
Draw 60 deg up - 25 deg up
2016-05-24 21:31:06 +02:00
Marijn van der Werf
1503b024c8
Draw 25 deg up - 60 deg up
2016-05-24 21:31:06 +02:00
Marijn van der Werf
9947ada17a
Draw 60 degree slope
2016-05-24 21:31:06 +02:00
Marijn van der Werf
3ff5b83366
Draw 25 deg up - flat / flat - 25 deg down
2016-05-24 21:31:06 +02:00
Marijn van der Werf
eaa259ac2f
Draw flat-25 deg up/ 25 deg down-flat
2016-05-24 21:31:06 +02:00
Marijn van der Werf
92c6e513be
Draw 25-deg slope
2016-05-24 21:31:06 +02:00
Marijn van der Werf
25c1c93cab
Draw flat
2016-05-24 21:31:06 +02:00
Marijn van der Werf
0dd0c9c1f2
Prepare for drawing car ride
2016-05-24 21:31:05 +02:00
Marijn van der Werf
a96ccbf21c
Add shortcut for switching between paint modes ( #3714 )
2016-05-24 19:59:37 +01:00
Ted John
ac014d0e24
fix warnings
2016-05-23 20:54:32 +01:00
Marijn van der Werf
dd64c0f3b7
Fix segment support heights ( #3715 )
2016-05-23 20:44:32 +01:00
Ted John
55186e4252
add sprite constants for river rafts
2016-05-23 19:10:16 +01:00
Ted John
0efb23159e
fixed river rafts quarter turn draw
2016-05-22 23:01:07 +01:00
Ted John
c11fc8b0cb
draw river rafts, quarter 5 turn
2016-05-22 19:27:28 +01:00
Ted John
f1edf9c9d6
paint river rafts station and refactor
2016-05-22 18:01:54 +01:00
Ted John
c30d9ded65
fix river raft supports for s bend
2016-05-22 18:01:54 +01:00
Ted John
5012355754
paint river rafts,s bends
2016-05-22 18:01:54 +01:00
Ted John
600eae1bfe
paint river rapids, flat
2016-05-22 18:01:54 +01:00
Ted John
1cd857a0f6
add original addresses back to track paint table
2016-05-22 18:01:21 +01:00
Marijn van der Werf
d34bc77dd2
Draw station
2016-05-22 18:20:25 +02:00
Marijn van der Werf
53c7cb3a0c
Draw right S-bend
2016-05-22 18:17:52 +02:00
Marijn van der Werf
b11982b5a6
Draw left S-bend
2016-05-22 18:17:49 +02:00
Marijn van der Werf
75441584b6
Draw 5-tile turns
2016-05-22 18:17:35 +02:00
Marijn van der Werf
1b99457826
Draw 3-tile turns
2016-05-22 18:17:35 +02:00
Marijn van der Werf
f58886e68c
Draw flat track
2016-05-22 18:17:35 +02:00
Marijn van der Werf
5f5daa873a
Add empty functions
2016-05-22 16:14:27 +02:00
Marijn van der Werf
419c11271e
Draw station
2016-05-22 13:11:03 +02:00
Marijn van der Werf
db4f96bff9
Draw 1-tile turns
2016-05-22 13:11:03 +02:00
Marijn van der Werf
3d49f6ada3
Draw up-flat / flat-down
2016-05-22 13:11:03 +02:00
Marijn van der Werf
ae9cf7dfbe
Draw flat-up / down-flat
2016-05-22 13:11:03 +02:00
Marijn van der Werf
2e890673e4
Draw slopes
2016-05-22 13:11:03 +02:00
Marijn van der Werf
2c6cf3cab5
Implement flat track
2016-05-22 13:11:03 +02:00
Marijn van der Werf
dc4eed9042
Set up functions for drawing go-karts
2016-05-22 13:11:03 +02:00
Ted John
78de827ddc
fix warnings
2016-05-22 10:30:55 +01:00
Ted John
7275c5daa5
fix typos in virginia reel
2016-05-22 10:30:45 +01:00
Ted John
1e4a8d6fba
Merge pull request #3701 from IntelOrca/paint/magic-carpet
...
Paint Magic Carpet ride
2016-05-22 10:18:32 +01:00
Ted John
229d0915db
add sprite ID constants
2016-05-22 01:36:49 +01:00
Ted John
5ceba87e5b
integrate magic carpet draw data
2016-05-22 01:19:14 +01:00
Ted John
e84c0d1c5a
draw magic carpet vehicle
2016-05-22 01:02:49 +01:00
Marijn van der Werf
783715cc7b
Fix wrong height of station covers
2016-05-22 01:26:20 +02:00
Marijn van der Werf
c4d2a3f7ae
Draw station
2016-05-22 01:26:20 +02:00
Marijn van der Werf
e95aefe15c
Draw 3-tile turns
2016-05-22 01:26:20 +02:00
Marijn van der Werf
0ff972a0d6
Draw 1-tile turns
2016-05-22 01:26:20 +02:00
Marijn van der Werf
b8218a0546
Draw upwards/downwards track
2016-05-22 01:26:20 +02:00
Marijn van der Werf
914a320dae
Draw up-flat / flat-down
2016-05-22 01:26:20 +02:00
Marijn van der Werf
447dc19db5
Draw flat-up / down-flat
2016-05-22 01:26:19 +02:00
Marijn van der Werf
0522241b01
Draw flat track
2016-05-22 01:26:19 +02:00
Ted John
98ebf66d15
paint magic carpet pendulum and refactor
2016-05-22 00:00:48 +01:00
Ted John
b1a652dc8c
draw magic carpet frame
2016-05-21 23:35:39 +01:00
Marijn van der Werf
60bdda7b72
Add empty paint functions
2016-05-21 23:18:56 +02:00
Ted John
9afdd0494e
add original paint swap mechanism
2016-05-21 22:14:32 +01:00
Marijn van der Werf
3c1366eefd
Draw swinging inverter ship ( #3698 )
2016-05-21 18:31:31 +01:00
Marijn van der Werf
8442de943d
Paint Twist ( #3694 )
2016-05-21 18:30:11 +01:00
Marijn van der Werf
1374e9f257
Draw proper tunnels for Mini Golf hole E ( #3696 )
2016-05-21 16:12:12 +01:00
Ted John
8c5e5ecc01
implement paint motion simulator
2016-05-21 16:07:29 +01:00
Ted John
4739eb2716
add variable macro for gPaintInteractionType
2016-05-21 13:24:51 +01:00
Marijn van der Werf
9154c9755d
Draw Space Rings ( #3692 )
2016-05-21 13:20:02 +01:00
Marijn van der Werf
d4e9faaed0
Share enum for floors
2016-05-21 12:21:56 +02:00
Marijn van der Werf
f7b56da726
Draw hole E
2016-05-21 12:21:56 +02:00
Marijn van der Werf
90b22f0178
Draw hole D
2016-05-21 12:20:58 +02:00
Marijn van der Werf
97083cacad
Draw holes A, B, C
2016-05-21 12:19:53 +02:00
Marijn van der Werf
4bd8049969
Draw corners
2016-05-21 11:39:33 +02:00
Marijn van der Werf
a38050da28
[fixup] right slopes
2016-05-21 11:39:32 +02:00
Marijn van der Werf
ae1a25a5ae
Draw station
2016-05-21 11:39:32 +02:00
Marijn van der Werf
5c4f9c0e65
Draw upwards to flat track
2016-05-21 11:39:32 +02:00
Marijn van der Werf
e4e2506069
Draw flat to upwards track
2016-05-21 11:39:32 +02:00
Marijn van der Werf
73a07a33e5
Draw upwards slope
2016-05-21 11:39:32 +02:00
Marijn van der Werf
ed137f6fb8
Paint flat track
2016-05-21 11:39:32 +02:00
Marijn van der Werf
77bab8cd73
Rebase branch
2016-05-21 11:39:32 +02:00
Ted John
25ac99e04a
add variable for gS6Info
2016-05-20 23:26:19 +01:00
Marijn van der Werf
48935db3bf
Draw quarter turns
2016-05-20 21:38:15 +02:00
Marijn van der Werf
be666436f5
Draw pier
2016-05-20 21:38:14 +02:00
Marijn van der Werf
790966d928
Draw flat track
2016-05-20 21:38:13 +02:00
Marijn van der Werf
c43e3ee471
Draw pirate ship ( #3682 )
2016-05-20 20:25:13 +01:00
Marijn van der Werf
8c6f248b41
Paint Enterprise ( #3680 )
2016-05-20 20:24:43 +01:00
Ted John
9a09cb5dad
Merge pull request #3639 from zsilencer/paint-setup/scenery
...
Decompile scenery_paint
2016-05-20 08:12:26 +01:00
Marijn van der Werf
8fbc3b72de
Draw Lift ( #3677 )
2016-05-20 08:11:19 +01:00
Marijn van der Werf
b8383af253
Paint launched freefall ( #3678 )
2016-05-20 08:11:04 +01:00
Ted John
00aeaaff7e
Merge pull request #3664 from marijnvdwerf/paint-setup/mini-helicopters
...
Paint mini helicopters
2016-05-20 08:09:36 +01:00
Marijn van der Werf
6cc35eb09d
Fix #3674 : Ferris Wheel rendering ( #3676 )
2016-05-20 08:09:23 +01:00
Marijn van der Werf
f015a9ae28
Refactor 3-tile turn
2016-05-20 01:00:38 +02:00
Marijn van der Werf
87f60b6ba4
Refactor 1-tile corner drawing
2016-05-20 01:00:38 +02:00
Marijn van der Werf
a7cb43d863
Sort switch
2016-05-20 00:59:16 +02:00
Marijn van der Werf
6914c93533
Draw other station rotation
2016-05-20 00:59:16 +02:00
Marijn van der Werf
66350f9d8a
Name station sprites
2016-05-20 00:59:16 +02:00
Marijn van der Werf
5322c88acc
Draw 1-tile turns
2016-05-20 00:59:16 +02:00
Marijn van der Werf
87a39593d0
Draw station direction 2
2016-05-20 00:59:16 +02:00
Marijn van der Werf
ca905a62f8
Draw station (direction 0)
2016-05-20 00:59:16 +02:00
Marijn van der Werf
46fcfa4bab
Draw station
2016-05-20 00:59:16 +02:00
Marijn van der Werf
fe8b7cfd78
Flip cover drawing check
2016-05-20 00:59:16 +02:00