Commit Graph

296 Commits

Author SHA1 Message Date
Marijn van der Werf 022b481d66 Use constant for black strings 2016-11-13 17:20:30 +00:00
Marijn van der Werf 4f47808201 Name glass palettes 2016-11-13 01:51:26 +01:00
Marijn van der Werf 80ea7f7de5 Name `gfx_fill_rect_inset` flags 2016-11-10 17:54:33 +00:00
Michał Janiszewski 512c7bcf51 Prevent crash when opening a window on invalid ride 2016-11-06 18:26:45 +01:00
Ted John 001120e6b2 Fix #4531: Ride sound focus not available any longer
Only reset the ride viewport if it the window has actually been resized and maintain the viewport flags.
2016-10-05 19:08:20 +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 ac5c8d7e1f Fix #2384: Testing a ride with a stretched out window leaves artifacts 2016-10-01 15:13:24 +01:00
Ted John 9d37b8bb9c Centre overall ride view on resize 2016-09-17 14:30:45 +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 f81c394c8b Remove unused variables 2016-09-10 15:22:14 +01:00
Marijn van der Werf c2a6eba1d3 Skip zeroed ride design previews 2016-09-09 22:15:29 +01:00
Michał Janiszewski 163e314379 Remove unused or set-but-not-read variables 2016-09-07 13:39:29 +01:00
Michał Janiszewski bfe1a7b58f Drop RCT2_GLOBAL from regular pointer 2016-09-04 21:19:19 +02:00
Ted John cb235c9d56 Integrate filter arguments in guest list window 2016-09-03 13:54:59 +01:00
Ted John 89c9cc26c0 Fix #4342: x64 version crashes on ride window, station view 2016-08-28 17:24:51 +01:00
Marijn van der Werf 46959b20b4 Split up ride mode values 2016-08-21 16:33:37 +02: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 fbbc871aea Clean up double-used strings 2016-08-21 16:32:13 +02:00
Marijn van der Werf bc3ec1b871 Use table for ride names 2016-08-21 16:31:06 +02: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
Michał Janiszewski 0ece63a7f6 Wrap RCT2's addresses in RCT2_ADDRESS macro 2016-08-06 21:38:46 +01:00
Marijn van der Werf b777a36722 Remove maze people limit override 2016-08-06 01:04:37 +02:00
Marijn van der Werf 082e4c76fa Include data from `0x0097D7CB` 2016-08-05 11:53:44 +01:00
Ted John 32fea99c36 Merge pull request #4210 from janisozaur/integrate
Fix pointer types for 64 bit
2016-08-04 23:14:29 +01:00
Michał Janiszewski 501f0126fa Fix #4213: FPS decreases with track window
The code must've been from before I got everything working properly,
because removing both these lines does not cause any glitches in
rendering.
2016-08-04 21:22:12 +01:00
Michał Janiszewski 436809f778 Integrate rct_window::var_496 2016-08-04 21:54:37 +02:00
Michał Janiszewski 91e04282ee Fix pointer types for 64 bit 2016-08-03 23:33:12 +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 7bfdbbd409 Include ride stats labels 2016-08-02 23:32:58 +02:00
Marijn van der Werf 51f4988e06 Clean/include peep/staff vars 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 09a20524a5 Integrate gRideProperties 2016-08-01 23:14:42 +02:00
Michał Janiszewski 41049e5a32 Fix positions of widgets 2016-08-01 22:17:38 +02:00
Michał Janiszewski 062ab25f95 Fix invalidation issues 2016-08-01 20:30:08 +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
Marijn van der Werf a17e6cee5e Use constants for shop item images 2016-07-28 23:28:32 +02:00
Marijn van der Werf 9401afa68f Use constants for colour preview images 2016-07-28 23:28:32 +02:00
Ted John 487fcc3c5b Fix #4134: Can't enable park-wide photo price for log flume and river ra
Caused by not shifting the shop item flags (those above 32) to the correct mask bit.
2016-07-19 18:35:44 +01: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
Ted John 304d6d9304 Fix #4110: guests still get charged for rides 2016-07-16 16:27:49 +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
Ted John edb4a4a822 fix get capacity string for vehicles 2016-07-11 22:50:55 +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