Ted John
5c5e9095db
Fix #4476 : Assertion Failed
...
Disable track preview for OpenGL drawing until a later time where we can use a different drawing engine for track preview alongside OpenGL.
2016-09-24 01:07:40 +01:00
wolfreak99
9a708cd9d2
auto-disable lightning without modifying config.
2016-09-21 10:37:50 -04:00
wolfreak99
ce85e0e743
Make lightning disabled while weather effects are disabled (Gymnasiast
...
suggestion)
Interpreting Gymnasiast part 2
2016-09-21 10:36:35 -04:00
wolfreak99
c60396cb53
Add option to disable weather gloom and rain effects
2016-09-21 10:35:02 -04:00
duncanspumpkin
9840a73cc1
Refactor naming of paint global vars
...
Removed EDF81C from none viewport files this previously was used to pass image flags to the sprite renderer.
gUnkF1A4CC replaced with address reference to paint struct array to allow for non rct builds
Renamed _paint_structs to _paint_struct_quadrants. This array is used for working out which paint struct is at which quadrant and is not the main paint struct array
2016-09-20 18:08:45 +01:00
Marijn van der Werf
487d6d8f15
Remove unnecessary addresses.h imports
2016-09-17 20:59:55 +01:00
Ted John
f4cf1d6158
Integrate gUnkF1A4CC
2016-09-17 16:14:46 +01:00
Ted John
9d37b8bb9c
Centre overall ride view on resize
2016-09-17 14:30:45 +01:00
Ted John
b43ff24c3e
Use non _t versions of int for consistency
2016-09-14 23:37:01 +01:00
Michał Janiszewski
f6daea7cef
Guard against passing NULL to qsort()
2016-09-11 21:20:48 +02:00
Ted John
64df46ba16
Integrate and remove unused globals
2016-09-11 01:02:16 +01:00
Ted John
7edcd11aa7
Integrate entertainer costumes
2016-09-11 00:40:51 +01:00
Ted John
0553ed5b95
Integrate various buffers
2016-09-10 23:01:42 +01:00
Ted John
07ce3c67ee
Integrate last address in guest_list.c
2016-09-10 22:49:30 +01:00
Ted John
ab12cda49d
Remove unnecessary draw string and address
2016-09-10 22:49:30 +01:00
Ted John
83de03b260
Remove unused address in about.c
2016-09-10 22:49:30 +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
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
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
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
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
Marijn van der Werf
c2a6eba1d3
Skip zeroed ride design previews
2016-09-09 22:15:29 +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
Michał Janiszewski
163e314379
Remove unused or set-but-not-read variables
2016-09-07 13:39:29 +01:00
Ted John
220afe04d5
x64: Fix readentirefile calls
2016-09-06 21:33:15 +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
32a6722cda
Integrate gEditorSelectedObjects
2016-09-05 22:26:02 +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
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
2cd16a6fe5
Remove unread variable
2016-09-04 21:47:05 +01:00
Michał Janiszewski
bfe1a7b58f
Drop RCT2_GLOBAL from regular pointer
2016-09-04 21:19:19 +02:00
Michał Janiszewski
b7497f6654
Reduce inclusions of addresses.h
2016-09-04 21:19:19 +02:00
Ted John
6a665330c2
Integrate gCommonStringFormatBuffer
2016-09-04 15:55:37 +01:00
Ted John
5893c6da82
Remove loan hash, but keep for S6 export
2016-09-04 15:11:15 +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
Ted John
73d453228a
Integrate gDisableErrorWindowSound
2016-09-03 14:22:03 +01:00
Ted John
f2dea1832a
Integrate gScreenshotCountdown
2016-09-03 14:15:29 +01:00
Ted John
cb235c9d56
Integrate filter arguments in guest list window
2016-09-03 13:54:59 +01:00
Ted John
01c78bc9de
Merge pull request #4361 from marijnvdwerf/integrate/window-map
...
Integrate map window variables
2016-09-03 12:52:56 +01:00
Michał Janiszewski
1a533147d0
Initalise g_ps_EE7880 properly
...
This should fix rendering problems in 64-bit mmap builds
2016-09-01 22:57:17 +02:00
Marijn van der Werf
7766faf00d
Rename _curPixel to _currentLine
2016-09-01 13:13:07 +02:00
Marijn van der Werf
74eac21162
Dynamically allocate memory for map
2016-09-01 13:07:28 +02:00
Marijn van der Werf
2431930a8e
Integrate map array
2016-09-01 00:22:41 +02:00
Marijn van der Werf
4e8e664e94
Integrate 0x00F1AD61
2016-08-31 21:12:07 +02:00
Michał Janiszewski
dd7bfdc529
Conditionally integrate pointer at 0xEE7880
2016-08-30 15:27:08 +01:00
Ted John
89c9cc26c0
Fix #4342 : x64 version crashes on ride window, station view
2016-08-28 17:24:51 +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
Ted John
76043d4050
Fix peep thoughts crashing on x64
2016-08-28 00:37:10 +01:00
Ted John
8cf7e87b5c
Fix many warnings for x64
2016-08-27 23:32:15 +01:00
jensj12
13979397de
Allow corner tiles when using mountain tool
...
The tile selection was limited to full tiles when using the mountain tool on a single tile. The game now allows selecting and raising/lowering corner tiles and the smoothing algorithm is modified to support that. The cost is the same as the old single-tile mountain tool. A bug where the mountain tool sometimes creates sharp edges has also been fixed.
2016-08-23 19:30:09 +01:00
Luke Lau
c05eef02d6
Fix #3809 : No tooltip delay
2016-08-21 15:47:20 +01:00
Marijn van der Werf
46959b20b4
Split up ride mode values
2016-08-21 16:33:37 +02:00
Marijn van der Werf
7a6d1ac082
Use different title for keyboard shortcut dialog
2016-08-21 16:33:37 +02:00
Marijn van der Werf
ac8403f805
Use different title for preserved ride tab
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
8d1d699710
Clean up music credits window
2016-08-21 16:31:06 +02:00
Marijn van der Werf
bc3ec1b871
Use table for ride names
2016-08-21 16:31:06 +02:00
Ted John
3f1a95cbee
Merge pull request #4317 from marijnvdwerf/clean/data-palette
...
Clean/data palette
2016-08-21 13:48:37 +01:00
Marijn van der Werf
bdb04e3da3
Integrate data at 0x009DEDF4
2016-08-21 14:24:55 +02:00
Ted John
1fb7458207
Remove drawing of expansion packs on title screen
...
This never worked anyway as we no longer read the registry keys for it.
2016-08-20 22:24:56 +01:00
LRFLEW
248a933ab1
Fix Invalid Save Default Path ( #4308 )
2016-08-19 22:33:49 +01:00
Wirlie
9ec3fbc39b
Chat: Add colour scheme (themes) + 3d edge style.
2016-08-16 23:26:03 -06:00
Ted John
3f9c5456d4
Merge pull request #4212 from marijnvdwerf/clean/data-trackflags
...
Include track flags
2016-08-16 17:55:29 +01:00
wolfreak99
791733a571
See-through paths, Convert gCurrentViewportFlags to uint32
2016-08-15 00:58:15 -04:00
Marijn van der Werf
18edae3edf
Integrate TerrainPricing
2016-08-14 14:49:32 +01:00
wolfreak99
eec0a0cb18
Invalidate Map Generator button when resizing map window ( #4271 )
2016-08-13 10:06:47 +02:00
Marijn van der Werf
6610190e8c
Include track flags
2016-08-12 22:42:48 +02:00
Marijn van der Werf
76b470ac26
Integrate data at 0x0098D7E0
2016-08-12 22:37:05 +02:00
Marijn van der Werf
71c1f13ffa
Integrate 0x0098D8B4
2016-08-12 22:36:39 +02:00
Marijn van der Werf
69bbf7ea3b
Use RequiredSelectedObjects
2016-08-12 22:36:34 +02:00
Marijn van der Werf
8889530869
Use wage_table
2016-08-12 22:36:27 +02: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
Ted John
0e04e9e47f
Merge pull request #4259 from marijnvdwerf/clean/constants-1
...
[Clean] Use more constants
2016-08-09 23:55:18 +01:00
Marijn van der Werf
b428a95724
Ride classes
2016-08-07 20:11:43 +02:00
Marijn van der Werf
718c2906e9
Include news type list
2016-08-07 20:11:41 +02:00
Marijn van der Werf
897fc0591b
Integrate track pricing
2016-08-07 14:31:08 +02:00
Marijn van der Werf
ec4cf80623
Use `RideData4`
2016-08-07 13:01:20 +01:00
Marijn van der Werf
a81b7c4892
Use `WALL_SCENERY` flags
2016-08-07 12:57:22 +02:00
Marijn van der Werf
198ebd0cb1
Use constants for colours
2016-08-07 12:57:12 +02:00
Marijn van der Werf
207f552203
Use contants for `_currentTrackCurve`
2016-08-07 12:57:07 +02:00
LRFLEW
e5666683aa
More RCT2_ADDRESS macro usage
2016-08-06 22:22:11 +01:00
Michał Janiszewski
0ece63a7f6
Wrap RCT2's addresses in RCT2_ADDRESS macro
2016-08-06 21:38:46 +01:00
Ted John
1abc4a1915
Integrate and clean up rest of guest list window vars
2016-08-06 01:52:03 +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
4d7db62336
Use RideKeyColours for map legend
2016-08-06 01:04:37 +02:00
Marijn van der Werf
6c76d3f2d2
Use `FlatTrackCoordinates`
2016-08-06 01:04:37 +02:00
Marijn van der Werf
1fc5681f00
Use `TrackCoordinates`
2016-08-06 01:04:35 +02: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
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
Marijn van der Werf
3d8b71ffbc
Rename `gTrackDefinitions` to `TrackDefinitions`
2016-08-04 01:15:23 +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
Ted John
690e0641b4
Merge pull request #4206 from janisozaur/integrate
...
Add more 64-bit compatibility fixes enabling toolbars to work.
2016-08-03 20:58:49 +01:00
Michał Janiszewski
6c28a17906
Fix pointer casting for some strings
2016-08-03 20:53:25 +02:00
Michał Janiszewski
f8e0d4b25b
Add explicit empty string
...
Needed to properly handle toolbars in 64 bit builds
2016-08-03 20:51:53 +02: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
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
a71e60bed5
Make window_start_textbox accept pointer argument
2016-08-01 23:14:42 +02:00
Michał Janiszewski
a40b3c63af
Convert loadsave dialog to new string format
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
Ted John
349684b7ce
Merge pull request #4146 from AaronVanGeffen/reposition-mouse
...
Change mouse scroll zooming behaviour to zoom towards the cursor keeping the map position under the cursor consistent. This new behaviour is opt-out.
2016-07-31 12:38:06 +01:00
Michael Steenbeek
ff7e119b46
Name some track design flags
2016-07-31 12:02:38 +01:00
Aaron van Geffen
a1b8bdfa11
Make zooming to cursor optional.
...
This adds a checkbox to the interface settings panel to enable zooming around the cursor.
If disabled, which it is by default, vanilla RCT2 behaviour is retained.
2016-07-30 21:18:59 +02:00
Michael Steenbeek
19220cbbce
Add a button to the map generator window in the Map window ( #4098 )
...
Includes many fixes by @Wirlie
2016-07-30 21:10:04 +02:00
wolfreak99
8f254702a2
Add cheat to reset date ( #4188 )
2016-07-29 20:49:38 +02:00
Marijn van der Werf
b4f8f13849
Use sprite constants for staff list dialog
2016-07-28 23:28:32 +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
Marijn van der Werf
c23750911f
Add missing description for paint debug shortcut
2016-07-28 21:49:08 +01:00
Alexander Overvoorde
3842728f38
Fix indentation and code style in various files
2016-07-27 16:31:25 +02:00
Alexander Overvoorde
c56a683eed
Disable OpenGL vsync when uncap fps option is enabled
2016-07-27 04:01:25 +02:00
Marijn van der Werf
7478cfc053
Wrap defines in round brackets
2016-07-26 23:37:22 +02:00
Marijn van der Werf
7ec458f1bd
Fix indentation of new menu option
2016-07-26 23:18:52 +02:00
Marijn van der Werf
763ae7edd7
Use `#define` instead of constant
2016-07-26 23:16:25 +02:00
Marijn van der Werf
f9670fc1d4
Add debug menu option
2016-07-26 10:55:48 +02:00
Marijn van der Werf
dd756cb8be
Add paint debug window
2016-07-26 10:55:47 +02:00