Ted John
497c99a2b8
Setup wild mouse paint function
2016-10-04 18:21:55 +01:00
zaxcav
5fdfb397d2
Fix typo
2016-10-04 15:50:23 +02:00
zaxcav
5217221067
Only add adjacent station rating bonus if ride actually has adjacent station(s).
2016-10-04 15:11:39 +02:00
Ted John
973765769d
Remove unnecessary braces
2016-10-04 00:20:22 +01:00
Ted John
ef81919f02
Implement quarter turn 3
2016-10-04 00:10:50 +01:00
Ted John
c6a1ecab91
Implement quarter turn 1
2016-10-03 23:50:48 +01:00
Ted John
475a142bf7
Implement steep to flat pieces
2016-10-03 23:50:34 +01:00
Ted John
3c43bb5522
Implement most of the slope pieces
2016-10-03 22:35:06 +01:00
Ted John
fc8bd70f93
Implement 25 and 60 deg up
2016-10-03 21:40:32 +01:00
Ted John
e18233d71e
Implement station
2016-10-03 21:40:32 +01:00
Ted John
041b286c8b
Implement flat
2016-10-03 21:40:32 +01:00
Ted John
7c61b960b7
Setup paint function for wooden wild mouse coaster
2016-10-03 21:40:32 +01:00
Ted John
2ece5fbd64
Fix arrays, too many braces
2016-10-02 23:45:58 +01:00
Ted John
004cef2d0c
Implement banked quarter turn 5
2016-10-02 23:32:15 +01:00
Ted John
e7823df1e1
Implement quarter turn 5
2016-10-02 22:38:50 +01:00
Ted John
03e5f6b4f4
Implement vertical slopes
2016-10-02 21:44:07 +01:00
Ted John
62296c6558
Implement vertical up, down and top
2016-10-02 19:10:27 +01:00
Ted John
ab7d38bc36
Add single tile banks
2016-10-02 18:00:30 +01:00
Ted John
ecb48b8332
Implement brakes
2016-10-02 17:36:20 +01:00
Ted John
5accbe33b5
Implement station
2016-10-02 17:33:15 +01:00
Ted John
d770c5d7f8
Implement flat
2016-10-02 17:24:54 +01:00
Ted John
64dcc5ccb6
Begin air powered vertical coaster painting
2016-10-02 17:14:27 +01:00
Michael Steenbeek
2f2c2beb7f
Merge pull request #4375 from jensj12/trains-tooltip
...
Allow 31 trains per ride (cheat and tooltip), solves #3537
2016-10-02 10:08:57 +02:00
Ted John
362f143163
Merge pull request #4459 from IntelOrca/paint/water-rc
...
Paint setup: Water Coaster
2016-10-01 23:37:01 +01:00
Ted John
6d5a0da438
Implement covered turns
2016-10-01 23:26:34 +01:00
Ted John
0337cf7baa
Implement quarter_turn_3
2016-10-01 23:08:15 +01:00
jensj12
44a53dd031
Allow 31 trains per ride (cheat and tooltip)
...
Changes the disable train lenght limit cheat to also disable the limit on the number of trains and renames it to 'disable vehicle limits'. Now any tracked ride can have up to 31 trains with 255 cars each. To reduce confusion, I also added a tooltip to the spinners on the vehicle tab.
2016-10-01 20:58:46 +02:00
Ted John
a37679f5ef
Implement quarter turn 5
2016-10-01 19:21:19 +01:00
Ted John
753ef64ac2
Implement S bend uncovered
2016-10-01 17:58:47 +01:00
Ted John
5c4e8d445f
Implement S bend covered
2016-10-01 17:58:47 +01:00
Ted John
2b7612a922
Implement station
2016-10-01 17:58:47 +01:00
Ted John
c8d3f591f3
Implement non covered versions of single tile tracks
2016-10-01 17:58:46 +01:00
Ted John
8959c5cf6a
Implement single tile covered tracks
2016-10-01 17:58:46 +01:00
Ted John
e5b2cac905
Implement flat
2016-10-01 17:58:45 +01:00
Ted John
8aa7c5ed2e
Add dingy slide paint function
2016-10-01 17:58:44 +01:00
Ted John
bec7713ad2
Fix flat_to_25_deg_up tunnels
2016-10-01 17:45:44 +01:00
Ted John
90d512683b
fix tunnels for 25_deg_up
2016-10-01 17:38:35 +01:00
Ted John
a715d27caa
Implement down elements that have chain lift
2016-10-01 17:38:35 +01:00
Ted John
42c56dbcc5
Implement diagonals
2016-10-01 17:38:35 +01:00
Ted John
5d4e262a40
Add newly supported track pieces
2016-10-01 17:38:35 +01:00
Ted John
8f13c9019e
Mark out pieces left to do
2016-10-01 17:38:35 +01:00
Ted John
f68cd430f2
Implement chain lift pieces and reuse
2016-10-01 17:38:35 +01:00
Ted John
f14788f74f
Implement flat and flat water for water rc
2016-10-01 17:38:35 +01:00
Ted John
ee896a481e
Fix remaining Junior RC testpaint fails
2016-10-01 17:06:12 +01:00
Ted John
23094d25bb
Fix #4265 : Delete trackpiece bug
...
Safely handle invalid track pieces when demolishing a ride.
2016-10-01 14:12:52 +01:00
Ted John
fffb4b1d7b
Fix tunnels
2016-10-01 12:43:03 +01:00
Ted John
39de20e0a3
Implement remaining tracks
2016-10-01 12:43:03 +01:00
Ted John
f2279984cb
Implement half of splash boat tracks
2016-10-01 12:43:02 +01:00
Ted John
f42fd74837
Use river rafts for shared track pieces
2016-10-01 12:43:02 +01:00
Ted John
4b453a3160
Add splash boats paint function
2016-10-01 12:43:01 +01:00
Ted John
ae062dea69
Fix river raft painting
2016-10-01 12:33:03 +01:00
Ted John
16124f6d33
Only draw supports on even squares
2016-10-01 11:36:11 +01:00
Ted John
b22d2d43f2
Define sprite IDs for s bend
2016-10-01 11:36:11 +01:00
Ted John
ce03db20f9
Inverse s bend image arrays
2016-10-01 11:36:10 +01:00
Ted John
a9cd816eb6
Define sprite IDs for 3 turn
2016-10-01 11:36:10 +01:00
Ted John
34ada367d5
Implement right quarter turn 3
2016-10-01 11:36:10 +01:00
Ted John
a15b721d89
Implement left quarter turn 3
2016-10-01 11:36:09 +01:00
Ted John
417d4a94ca
Implement S bend right
2016-10-01 11:36:09 +01:00
Ted John
1c371a7edd
Implement S bend left
2016-10-01 11:36:08 +01:00
Ted John
f04523283c
Implement down tracks
2016-10-01 11:36:08 +01:00
Ted John
d960f79c37
Implement up tracks
2016-10-01 11:36:08 +01:00
Ted John
aaa4fd0e7d
Implement reverser
2016-10-01 11:36:07 +01:00
Ted John
48ebfeeb83
Implement on ride photo
2016-10-01 11:36:07 +01:00
Ted John
91578fa50e
Implement station
2016-10-01 11:36:07 +01:00
Ted John
209ec19c8c
Implement track flat
2016-10-01 11:36:06 +01:00
Ted John
112c3d22d2
Setup log flume paint function
2016-10-01 11:36:05 +01:00
Marijn van der Werf
7693ba1af9
Partly fix Junior RC
2016-10-01 01:29:23 +02:00
Marijn van der Werf
db85b413b5
Fix Circus Show
2016-10-01 01:08:12 +02:00
Marijn van der Werf
584ef402c7
Fix Ghost Train
2016-10-01 00:45:44 +02:00
Marijn van der Werf
142bb0ca22
Fix Lift
2016-10-01 00:28:23 +02:00
Marijn van der Werf
88235d1b0b
Fix Roto Drop
2016-10-01 00:28:17 +02:00
Marijn van der Werf
95cae68e5f
Fix Observation Tower
2016-10-01 00:28:11 +02:00
Ted John
e26b2d4047
Fix #4462 : Multiple Corkscrew RC track sprites missing in build window
...
rct_trackdefinition.special should have been signed.
2016-09-29 18:45:49 +01:00
Ted John
7987395444
Merge pull request #4471 from Gymnasiast/onride-photo-underground
...
Allow building on-ride photo elements underground
2016-09-26 12:24:05 +01:00
duncanspumpkin
d953f25b96
Fix #4377 . Entrances correctly saved for tracked rides
2016-09-25 12:17:27 +01:00
duncanspumpkin
7c42322f0c
Fix likely cause of #4377 . Track design entrance locations.
...
During a refactor the entrance locations were incorrectly computed and this would cause issues. This would only happen when tracks were rotated so would not occur in some situations
2016-09-25 11:06:19 +01:00
Ted John
fcb0f2acd6
Fix #4468 : Boats at the Boat hire dock move on top of each other
...
Confusingly gSpriteSpatialIndex is indexed by .yx not .xy, all the more reason to use the dedicated helper method.
2016-09-24 12:55:17 +01:00
Ted John
2429cd84df
Fix remaining issues
2016-09-24 11:21:04 +01:00
Ted John
21bb6c507d
Fix bugs spotted by testpaint
2016-09-24 11:20:12 +01:00
Ted John
d94d2e5820
Clean up paint_reverse_freefall_rc_flat
2016-09-24 11:20:12 +01:00
Ted John
df761fb64d
Fix bound boxes and draw order
2016-09-24 11:20:12 +01:00
Ted John
09cb01b28a
Implement vertical
2016-09-24 11:20:12 +01:00
Ted John
8e6871cf77
Correct name of SPR enum items
2016-09-24 11:20:12 +01:00
Ted John
f713eb201a
Implement slope
2016-09-24 11:20:12 +01:00
Ted John
a62277c44f
Implement flat
2016-09-24 11:20:12 +01:00
Ted John
12109993ae
Implement station
2016-09-24 11:20:12 +01:00
Gymnasiast
c84e2f3184
Name some constants
2016-09-24 11:08:52 +02:00
Michael Steenbeek
d3197884d1
Allow building on-ride photo elements underground
2016-09-24 11:08:52 +02:00
Gymnasiast
ffcd0cacd1
Convert tabs to spaces and split off switches into own function
2016-09-19 22:04:08 +02:00
Gymnasiast
5610b72394
Add drawing for missing B&M and mini RC pieces
2016-09-19 19:15:31 +02:00
Ted John
23b5af6145
Close #3981 : Global configuration option/argument for RCT2 data path
...
Add the command line option --rct2-data-path which allows the RCT2 data path to be set irrespective of the config file.
2016-09-18 22:25:49 +01:00
Ted John
2258652e83
Wrap direction in vehicle_update_motion_collision_detection
2016-09-18 21:49:58 +01:00
Michał Janiszewski
453e508716
Check access to duck_move_offset
2016-09-18 20:01:22 +02:00
Marijn van der Werf
487d6d8f15
Remove unnecessary addresses.h imports
2016-09-17 20:59:55 +01:00
Ted John
665f5e794b
Merge pull request #4442 from marijnvdwerf/integrate/vehicle
...
Integrate vehicle data
2016-09-17 19:15:27 +01:00
Marijn van der Werf
a3a8484059
Complete integration of 0x009A3B04
2016-09-17 19:54:44 +02:00
Marijn van der Werf
a76e21a767
Integrate data at 0x009A37C4
2016-09-17 19:49:52 +02:00
Marijn van der Werf
1a6392cbc9
Integrate data at 0x009A37E4 - 0x009A39C4
2016-09-17 19:08:30 +02:00
Ted John
9f847ca8bb
Remove old RCT2 compatibility from vehicle paint
2016-09-17 15:58:59 +01:00
Ted John
c2ca1316e8
Integrate / remove various GLOBALs
2016-09-17 15:51:06 +01:00
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