Commit Graph

683 Commits

Author SHA1 Message Date
Andy Ford ebf8c19272 Fix #7653: Loan spinner too small for big loans (#7663)
On large loans in the millions (e.g. Alton Towers / BPB), the loan
amount can extend that it runs over the loan spinner widget. This change
enlarges the loan box to allow for large loans.
2018-06-11 22:08:59 +02:00
Hielke Morsink 7355b497a1 Use new banner index type
BannerIndex is defined in common.h (like some other types such as money32 and rct_string_id), so that banner.h wouldn't have to be includede everywhere. Later on, it may be nicer to have a custom types file instead of putting them all in common.h.
2018-06-11 13:29:41 +02:00
Hielke Morsink ead97a4638 Split colour into union with ride index
The colour field in the banner object is also used to store the ride index when a banner is linked to a ride. This commit turns this field into a union with both named fields, to make the code clearer.

It also changes the return types of related functions to uint8 instead of sint32, and makes use of the RIDE_ID_NULL define where applicable.
2018-06-11 13:21:48 +02:00
Aaron van Geffen 7cfa6aa176 Fix non-network builds. 2018-06-11 11:49:45 +02:00
Aaron van Geffen f1d4e5b596 Rename Http namespace, add default initialisers. 2018-06-11 11:19:04 +02:00
Tobias Kohlbau 62c25d88fb HTTP: refactor http into modern C++
Signed-off-by: Tobias Kohlbau <tobias@kohlbau.de>
2018-06-11 10:24:19 +02:00
Ted John b043428cf0
Merge pull request #6998 from JeroenDStout/railway-crossings-wait
Railway crossing behaviour for peeps and vehicles
2018-06-11 09:09:07 +01:00
Ted John 3096c4de00 Remove window internals from TileInspector logic 2018-06-11 00:09:00 +01:00
Ted John ae6af47341 Move TitleSequencePlayer to libopenrct2ui 2018-06-10 23:39:56 +01:00
Ted John 5a368ce6d9 Move theme code to libopenrct2ui 2018-06-10 23:34:27 +01:00
Ted John d1d9f0a86a Add debug drawing option for blocked tiles
Replace old unused original drawing code toggle options with new option to show which tiles are blocked by vehicles.
2018-06-10 22:59:58 +01:00
Hielke Morsink 36d123b272
Revert renaming of spinners (#7650) 2018-06-10 21:31:08 +02:00
Hielke Morsink 82370c36c6
Allow holding down spinners in tile inspector (#7647)
This basically moves much of the event handling from mouseup to mousedown, and adds a new array with widget indices for the spinners. This automatically enables scrolling for them as well.
2018-06-10 18:55:44 +02:00
Andy Ford 1acb1c4b35 Fix #7434: Diagonal ride segments cannot be deleted if they are isolated
Mimic vanilla RCT2:

- If the isolated track is the last piece on the ride, delete and
set the construction mode to a straight piece. Rotate said piece
45 degrees anti-clockwise.
- If other track still exists, delete and rotate as above but
set the track type to station-platform.
- If banked, set track type to the turn that entered the previous
orientation. For example, north west banked track would continue
with a banked 45 degree turn starting facing west.
2018-06-10 17:34:37 +02:00
Hielke Morsink 0fc4cad80f
Fix tile inspector errors for banner (#7640)
This is likely the least used page of the tile inspector, since two things have been broken for months apparently.

- The checkboxes for the blocked edges weren't being positioned correctly
- Rotating a banner that has either 0 or more than 1 edges blocked, the blocked edges weren't updated correctly
2018-06-09 17:16:04 +02:00
Aaron van Geffen e920871d67
Fix #7601: Always-researched items not rendered with inset. (#7638)
This re-introduces the use of buffers to work around colours not being set properly.

For clipping strings, we also now manually invoke `gfx_clip_string` instead of relying
on `gfx_draw_string_left_clipped` to do it for us. The latter resets the current font,
meaning it prevents the use of `MEDIUM_EXTRA_DARK` bases. This issue should be addressed
in a later commit.
2018-06-08 22:57:29 +02:00
Aaron van Geffen b2b997c328
Fix #6647: Prevent changelog window from painting lines out of view. (#7611) 2018-06-08 09:30:20 +02:00
Michał Janiszewski 27b684e785
Merge pull request #7629 from Broxzier/missing-field-initializers
Fix missing field initializers
2018-06-06 20:28:41 +02:00
Hielke Morsink b9590f14b1
Merge pull request #7627 from Broxzier/scrolling-spin-uh-steppers
Allow scrolling on spinners/steppers
2018-06-06 20:00:38 +02:00
Hielke Morsink 8aa122f54e Use empty initializer lists in the openrct2ui project 2018-06-05 14:37:24 +02:00
Aaron van Geffen 5b6ae9d9cb Fix appearance of brake/booster speed widgets 2018-06-04 18:51:37 +02:00
Hielke Morsink 32c4dab6c8 Move cut-away stepper logic to mousedown handler
This makes scrolling work for the stepper widget, and overrides behaviour for scrolling anywhere else in the window.
2018-06-04 13:41:27 +02:00
Hielke Morsink 15c908e4af Remove no longer needed global widget indices 2018-06-04 01:11:00 +02:00
Michał Janiszewski 995d72f262 Remove function unused with HTTP disabled 2018-06-03 19:56:11 +02:00
Aaron van Geffen 35242f4815 Improve scrolling behaviour in object selection window (#7607) 2018-06-03 14:46:17 +02:00
Michał Janiszewski debb6cd46c Remove declarations of unimplemented functions (#7615) 2018-06-02 13:51:23 +02:00
Aaron van Geffen 9ee1a1f4df
Fix #7613: Improve scrolling behaviour in staff list. (#7614) 2018-06-02 13:06:38 +02:00
Aaron van Geffen 635eab3305
Merge pull request #7579 from AaronVanGeffen/widgets/spinners
Make widget spinners horizontal
2018-06-02 00:03:20 +02:00
Aaron van Geffen f2b0f7457e Terminology change: rename spinners to steppers. 2018-06-01 23:25:07 +02:00
Aaron van Geffen 0e930287c6 Change spinners for MapGen, Editor{Objective,Scenario}Options. 2018-06-01 23:25:07 +02:00
Ted John e40a8d2cf5
Merge pull request #7591 from OpenRCT2/performance/msbuild
Improve msbuild performance

Ensure source file names are unique so that all object files can be written to a single directory which allows a single MSVC instance to compile all source files in parallel.
2018-06-01 21:26:15 +01:00
Aaron van Geffen 03020530ef Order vehicle type dropdown orthographically. 2018-06-01 20:35:52 +02:00
Aaron van Geffen 9806ab878d Refactor current vehicle dropdown preparation into its own function.
Splitting the lot off to window_ride_show_vehicle_type_dropdown.
2018-06-01 18:48:27 +02:00
Aaron van Geffen af0d8fea36 Change spinners for Cheats and Map windows. 2018-06-01 15:29:56 +02:00
Aaron van Geffen e5f184b01b Spinners for CustomCurrency, RideConstruction, ServerStart, ViewClipping. 2018-06-01 15:20:13 +02:00
Aaron van Geffen 64b04cccd1 Change spinners in Tile Inspector to new +/- buttons. 2018-06-01 15:20:13 +02:00
Aaron van Geffen 88955543d1 Spinners for Finances, NewCampaign, Park windows. 2018-06-01 15:20:13 +02:00
Aaron van Geffen 262409a8d4 Fix #7578: Clicking same price throughout park on accident. 2018-06-01 15:20:13 +02:00
Aaron van Geffen 2181e35b95 Replace spinner widgets with horizontal +/- buttons.
Limited to Options and Ride windows so far.
2018-06-01 15:20:13 +02:00
Michael Steenbeek e91777bd7e
Small cleanup to ride window price box 2018-06-01 14:23:46 +02:00
Ted John 92f6ac7333 Rename header files to match renamed source files 2018-06-01 09:38:30 +02:00
Hielke Morsink 2fed57d792
Check for ghost flag when removing track blocks (#7596) 2018-05-31 22:36:45 +02:00
Hielke Morsink f805c8db1a Fix #7589: Error in ride window's hold_down_widgets 2018-05-31 00:24:48 +02:00
Aaron van Geffen bf44007197 Allow fine-tuning the virtual floor style (#7577)
The virtual floor by @JeroenDStout, introduced in the v0.1.2 release, has generally been well-received. However, some players find it too intrusive in its current appearance (cf. #7221). This PR gives them the option of a toned-down version, rather than having to turn it off completely.

![screenshot_20180528_221350](https://user-images.githubusercontent.com/604665/40628292-6e71358e-62c4-11e8-9293-e166e75d0da6.png)

The clear/transparent style, introduced by this PR, looks like the virtual floor as originally introduced in #6338:
![](https://user-images.githubusercontent.com/14242454/31050274-e3f0e62e-a645-11e7-9b10-ec26b733d631.gif)

The glassy/translucent style is the virtual floor as we've come to know it since the v0.1.2 release, and remains the default setting.
2018-05-30 13:09:50 +02:00
Aaron van Geffen 2127a0170e
Merge pull request #7567 from IntelOrca/performance/park-loading
Improve performance of park loading
2018-05-30 11:51:16 +02:00
Ted John f5e77a9e15 Load objects for title editor and scenario editor 2018-05-29 18:39:12 +01:00
Aaron van Geffen 6eadf00a33 Order ride type dropdown orthographically. 2018-05-29 19:09:56 +02:00
Aaron van Geffen 8a1de9d8fd Turn ride type selection into a normal dropdown.
This removes the spinner aspect that previously worked around dropdown item limits.
2018-05-29 19:09:56 +02:00
Park Joon-Kyu 30fa405eb3 Make Twitch integration API URL configurable. (#7555) 2018-05-28 22:01:37 +02:00
Hielke Morsink 617372fd38 Check for page correctly 2018-05-27 18:07:05 +02:00
Hielke Morsink 15ae358946
Fix #7569: Assertion hit when using the XY spinners (#7570)
The X/Y spinners change the currently tile selected, and reset the element selection index. Previously this would also set the page to default immediately, but since that's now done on invalidation instead, the page would not be correct. This is fixed by checking the index of the selected element too, instead of only the selected page, in the mouse_up event.
2018-05-27 18:03:34 +02:00
Hielke Morsink f5c8ad2189
Merge pull request #7562 from AaronVanGeffen/windows/inventions-resize
Resizeable invention list window
2018-05-27 15:28:18 +02:00
Ted John cce37698e8 Fix #7454: Rides list windows has weird strings...
The ride list assumed the ride structure had 0 packing. Format the name by explicitly setting format arguments to the ride's name arguments.
2018-05-27 13:27:43 +01:00
Aaron van Geffen 1a2958df84 Make text painting adapt to scrollview width as well. 2018-05-27 00:45:50 +02:00
Aaron van Geffen 248585281c Fix #6221: Make invention list resizeable. 2018-05-27 00:37:45 +02:00
Aaron van Geffen 7a107264df Tile inspector: clip overly long object name strings. 2018-05-26 01:20:46 +02:00
Aaron van Geffen 146235931f Tile inspector: use SCROLLABLE_ROW_HEIGHT constant.
The tile inspector window was using its own LIST_ITEM_HEIGHT constant,
instead of the SCROLLABLE_ROW_HEIGHT constant commonly used in other windows.

This fixes CJK text overlapping.
2018-05-26 01:20:29 +02:00
Hielke Morsink 1a9dc7beee
Fix #7564 Some buttons are not greyed out when they should (#7565) 2018-05-25 23:09:52 +02:00
Aaron van Geffen 8a724c3983 Hide speed and length statistics for flat ride TD6 files (#7563)
This hides the speed and length statistics in the track design list when viewing designs for non-tracked rides.

Fixes #7507.
2018-05-25 23:01:27 +02:00
Aaron van Geffen a2f39079a7
Merge pull request #7556 from Gymnasiast/tile-element-cleanup
Replace all occurrences of tile_element_is_last_for_tile()
2018-05-25 13:34:28 +02:00
Hielke Morsink c50011aa3e Re-add zebra stripes and light text 2018-05-25 00:46:21 +02:00
Hielke Morsink 59c7b097ee Add Ctrl + Click to select tile elements
Co-authored-by: wolfreak99 <jbminor1991@gmail.com>
2018-05-25 00:46:20 +02:00
Hielke Morsink 0d77c279aa Fix: buttons sometimes stay pressed
In the invalidate function of the tile inspector, the checkboxes get checked to match the selected tile element. Some of those checkboxes share their widget index with buttons from other pages. When a checkbox is checked, the it's set to be "pressed", which causes the butons in the other tabs so appear that way. This behaviour is fixed by unpressing widgets when switching to another page.
2018-05-25 00:46:20 +02:00
Hielke Morsink fe40005372 Automatically set the correct page
Instead of having to set the page and setup the widgets correctly when a new elements gets selected, it now switches automatically on invalidation to the correct tab. This fixes the issue where pasted elements were selected but the page for them not shown, and removes two of the intents that were made for the tile inspector.
2018-05-25 00:46:20 +02:00
Hielke Morsink 4b25a71924 #5832 Resize tile inspector automatically when selecting a tile element 2018-05-25 00:46:19 +02:00
Hielke Morsink f79589527d Adjust list style to match other lists
- No odd/even checked colours
- Black text (white on hover)
- Darker background
- Solid fill background for hovered and selected element
2018-05-25 00:46:19 +02:00
Hielke Morsink 4c1097d5b1 Minor code cleanups 2018-05-25 00:46:19 +02:00
Michael Steenbeek b573bd49b3 Replace all occurrences of tile_element_is_last_for_tile() 2018-05-24 11:44:53 +02:00
Aaron van Geffen ca16fe8e62 Fix refurbishment confirmation window not closing in multiplayer mode. 2018-05-23 16:33:37 +02:00
jensj12 3f0308a517 Fix Travis builds 2018-05-23 16:33:37 +02:00
jensj12 50e3f8b4f6 Cleanup of ride_demolish 2018-05-23 16:33:37 +02:00
jensj12 23dc6bb9d3 Add button to refurbish ride
Add a button to refurbish the selected ride. The cost for this is 35% of the
build price and may only be done if the ride is closed and empty.
2018-05-23 16:33:37 +02:00
deurklink 996ca5a880 Fix #7528: Tab changing in park pricing window happens on mousedown instead of mouseup (#7542) 2018-05-19 14:57:05 +02:00
wolfreak99 8c9b56d0f2 Keep "Save track design" dropdown open (#7531) 2018-05-19 14:13:08 +02:00
Ted John 34531f7afb
Fix signed/unsigned mismatch warnings (#7529)
Unignore MSVC warning: C4245:
'conversion_type': conversion from 'type1' to 'type2', signed/unsigned mismatch
2018-05-16 21:22:17 +01:00
Michał Janiszewski a2ef4bd699
Exclude pre-formatted blocks from clang-format (#7520)
[ci skip]
2018-05-16 20:41:29 +02:00
Aaron van Geffen 829ac11bec
Merge pull request #7519 from IntelOrca/refactor/new-object-types-prep
Refactor code around object types
2018-05-15 15:10:16 +02:00
Aaron van Geffen 19442eb6c2
Merge pull request #7510 from Broxzier/feature/horizontal-clipping
Horizontal Clipping
2018-05-15 14:55:05 +02:00
Aaron van Geffen 59e682a835
Merge pull request #6807 from ZehMatt/ga-removewall
Refactors GAME_COMMAND_REMOVE_WALL to a GameAction.
2018-05-15 09:54:37 +02:00
Ted John 6f00e6aafe Make ObjectRepositoryItem C++ 2018-05-15 00:36:35 +01:00
Ted John f8271e93b0 Refactor code base to allow easy addition of new object types 2018-05-15 00:32:36 +01:00
Michael Steenbeek fcf507e051
Spin off shop item stuff to separate files 2018-05-14 19:21:43 +02:00
Hielke Morsink 9f0d820b7c Use TileCoordsXYZD for wall locations 2018-05-14 12:36:45 +02:00
Hielke Morsink 5b64abd7aa Keep 'select area' button pressed while the tool is active 2018-05-12 14:48:22 +02:00
Hielke Morsink 1324b6ae8f Add group boxes and clear button 2018-05-12 14:26:03 +02:00
Hielke Morsink 4e5f5de1a3 Update the year in copyright notice for changed files 2018-05-12 14:24:51 +02:00
Hielke Morsink 9034a0bce9 Restore old selection when the tool gets interupted
And re-type the selection variables to use LocationXY8 instead of storing them separately.
2018-05-12 14:24:47 +02:00
Hielke Morsink 28c1dbaf5a Show hovered tile selection 2018-05-12 14:24:06 +02:00
Hielke Morsink f1bbf077d6 Add clip selection
This allows the user to select an area of tiles. Anything outside of this area won't be drawn.
2018-05-12 14:24:01 +02:00
Ted John 35df72e61f Remove use of gCurrentLanguage 2018-05-11 20:39:00 +01:00
Ted John 7b28078da2 Remove use of gUseTrueTypeFont 2018-05-11 20:37:48 +01:00
Aaron van Geffen afd1dee580 Leftover cleanup of unnecessarily setting widget types. 2018-05-11 19:39:51 +02:00
Aaron van Geffen 56b9f5ff16 Removed unused string from audio options. 2018-05-11 19:39:47 +02:00
Aaron van Geffen 5ecb2d951e Draw misc options' dropdown captions directly through widgets. 2018-05-11 19:39:47 +02:00
Aaron van Geffen fe044477c2 Draw interface options' dropdown captions directly through widgets. 2018-05-11 19:39:47 +02:00
Aaron van Geffen bf817d2312 Draw culture options' dropdown captions directly through widgets. 2018-05-11 19:39:47 +02:00
Aaron van Geffen 13f3fb3448 Draw audio options' dropdown captions directly through widgets. 2018-05-11 19:39:47 +02:00
Aaron van Geffen adf3e55d9b Draw display options' dropdown captions directly through widgets. 2018-05-11 19:39:47 +02:00
ZehMatt 5e4cdeb78b Refactor out references to compatibility function wall_remove 2018-05-11 12:33:57 +02:00
ZehMatt b0f7435e9d Refactor GAME_COMMAND_REMOVE_WALL to game action. 2018-05-11 12:32:14 +02:00
rwjuk 9a167bb9d3 Disable saving without scenery for flat rides 2018-05-10 20:54:53 +02:00
Richard Jenkins 41f0b181bf Display flat rides correctly in previews 2018-05-10 20:54:53 +02:00
rwjuk 066980a9d4 Initial implementation of track saving for flat rides 2018-05-10 20:54:53 +02:00
Duncan 7b8507cb22
Merge pull request #7404 from OpenRCT2/peep
Peep Refactor
2018-05-08 20:22:39 +01:00
Michael Steenbeek 907d318e1c
Make Ride Groups more C++-like 2018-05-07 20:18:06 +02:00
deurklink 0d332cdf68 Implement #7459: Allow opening and closing of parks that use no mone 2018-05-07 19:48:47 +02:00
Hielke Morsink afac7f6557 Make more global functions part of rct_peep 2018-05-05 11:42:43 +01:00
duncanspumpkin fcb66b7449 Start refactoring pathfinding to use tileCoords 2018-05-05 11:42:34 +01:00
Hielke Morsink 6e02d6af4c Make peep_has_food, has_item and has_drink member functions 2018-05-05 11:13:22 +01:00
Aaron van Geffen e92264a2af Fix #7484: Incorrect label offsets in New Campaign window 2018-05-04 10:45:14 +02:00
Hielke Morsink a86482576f Land Line Tools (select land edges/row of tiles)
(This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.)

This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles.

The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type.

Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2018-05-03 23:03:07 +02:00
Michael Steenbeek 5f9d40be7a
Replace tile_element_get_type() with struct method 2018-05-02 19:27:04 +02:00
Michael Steenbeek b725916808 Use TitleCase 2018-05-02 13:27:53 +02:00
Michael Steenbeek ef433df26a Clean up tile element usage, introduce struct methods 2018-05-02 11:58:12 +02:00
oli414 3bff12c081 Seperate surface tile element 2018-05-01 16:33:16 +02:00
Aaron van Geffen 735cc2df89 Take line height into account in scenario selection screen 2018-05-01 13:58:46 +02:00
Toby Hinloopen 2fc01cb698 Fix #7424: Do not auto-rotate shops to face queue paths 2018-04-30 14:54:26 +02:00
Olivier Wervers 7713cdac4d Replace month count magic numbers 2018-04-29 20:46:46 +02:00
Michael Steenbeek 2d92ecf10b Fix #7436: Only the first 32 vehicles of a train can be painted 2018-04-26 10:33:54 +02:00
Hielke Morsink 30063984e6
Delete unused function arguments or mark them so (#7426)
This aims to make future refactoring easier. The arguments are removed where possible, but kept and marked with C++17's [[maybe_unused]] where they could not be removed (e.g. when they are used as a callback, rather than called directly).

I've skipped the rides/<category>/* and peep/* source files, because the rides source files are mostly generated and have a ton of unused variables, and the peep source files are being refactored.
I've also skipped most of window/* source files, because most of the functions are used as callbacks and will be bulk-renamed at some point.
2018-04-20 13:56:37 +02:00
Aaron van Geffen 11207f9c41 Re-introduce zebra striping. 2018-04-16 22:11:53 +02:00
Aaron van Geffen 97d1c296a4 Increase row height for object load error window. 2018-04-16 22:11:53 +02:00
Albert Morgese a3b04a67b2 Implement #1675: Auto-rotate shops to face footpaths 2018-04-16 20:02:46 +02:00
duncanspumpkin 765500adfa Label offsets and functions
Actually save before commiting

Label more peep vars.

Remove unread var

Further refactoring

Fix mistake in map element type
2018-04-11 18:16:09 +01:00
Ted John 1cd88a1641
Fix #7367: 'invalid name for park' shown when opening a scenario (#7394)
Apply extra changes from my own implementation of ParkSetNameAction
which re-introduces logging and calls the action directly from the UI
layer.
2018-04-10 17:14:32 +01:00
Hielke Morsink dc673a64d8 Give context the ownership of repositories and the object manager (#7340)
This makes them no longer a singleton, which fixes annoying behaviour when launching multiple contexts in one game session.
2018-04-10 13:19:23 +01:00
Ted John 124fb0df90 Fix out of bounds error in window_editor_object_selection_scroll_mouseover 2018-04-09 17:46:43 +01:00
NathanZabriskie cc256997ef Opening the mini-map reverts the size of the land tool to 1x1, regardless of what was selected before. #7382 (#7387)
* Opening the mini-map reverts the size of the land tool to 1x1, regardless of what was selected before. #7382
* Updated changelog and contributors
2018-04-08 19:34:36 +02:00
Duncan 0ab3d0955c
Merge pull request #7310 from OpenRCT2/json-objects
Add support for new JSON object format
2018-04-08 10:45:55 +01:00
Fusxfaranto 69bb1cdf82 Use STR_NONE over magic number, and conform to style guide 2018-03-31 10:54:41 +02:00
Fusxfaranto 74361dcf87 Add different titles for multiplayer window tabs (#2989) 2018-03-31 10:54:41 +02:00
Ted John 63e9275b60 Protect against unknown ride types 2018-03-30 16:58:12 +01:00
Michał Janiszewski fa11f05dba Remove unused variable 2018-03-27 20:46:12 +02:00
Gymnasiast 566af0c4f7 Remove residual usages of rideEntry->enabledTrackPieces 2018-03-27 20:40:50 +02:00
Duncan 1b2b020246
Merge pull request #7343 from ZehMatt/ga-stringbased
Implement some game actions for naming things
2018-03-27 18:55:28 +01:00
ZehMatt 417a2586b6 Implement game action for banner naming. 2018-03-27 16:29:53 +02:00
Michael Steenbeek 3d86ec2bc0 Remove dead code from research 2018-03-26 20:36:16 +02:00
Hielke Morsink 9ddda9ac77 Move comment 2018-03-24 13:34:05 +01:00
Hielke Morsink 6528a2fe37 Invalidate window when populating list
The new comment is there for clarity, because this confused me for a sec.
2018-03-24 13:25:40 +01:00
Hielke Morsink 45a92a7356 Fix #5210 Unable to open system dialog for saving
The reason the file dialog failed to open (on Windows at least) is that the dialog would be used to save a file, yet a folder was provided as the default path. This commit attempts to append a logical filename to the path, including an extension.
2018-03-24 13:25:40 +01:00
Hielke Morsink c5aececcb1 Set scenario save path upon successfully loading a park
Instead of setting the path when clicking on a file in the loadsave dialog, it's now set when the park gets actually loaded.

This fixes the System Dialog not showing when saving a park loaded from command.
2018-03-24 13:24:39 +01:00
ZehMatt 199a3e33f4 Implement game action for sign naming. 2018-03-24 05:19:19 +01:00
Ted John a913fd2d4a
Merge pull request #7266 from IntelOrca/feature/interactive-stdinout
Make stdin / stdout a game console
2018-03-23 22:19:08 +00:00
xp4xbox 674e094b3a Add shortcut definition for 'View Path Issues' and 'Cutaway View' 2018-03-23 10:37:13 +01:00
Ted John dd0573b235 Move in game console to UI library 2018-03-22 20:16:58 +00:00
Michael Steenbeek 61ddbd918b Add option to freeze all staff to Cheats window 2018-03-22 09:32:20 +01:00
Michael Steenbeek 919533d7c2 Show ride and vehicle names in research list 2018-03-21 22:04:10 +01:00
Ted John 5245b35a90
Merge pull request #7286 from IntelOrca/refactor/gameaction-parksetloan
Implement some more basic game actions:
- ParkMarketingAction
- ParkSetLoanAction
- ParkSetResearchFundingAction
- StaffSetColourAction
2018-03-20 13:38:56 +00:00
thyeggman ccb1b330a5 Option for early scenario completion (#7187) 2018-03-20 12:58:59 +01:00
Ted John 9b604310a2 Implement game action for staff set colour 2018-03-20 09:31:39 +01:00
Ted John 708843b526 Implement game action for park marketing 2018-03-20 09:31:39 +01:00
Ted John 5a803d2551 Implement game action for park set research funding 2018-03-20 09:31:39 +01:00
Ted John 16a7e21ffa Implement game action for park set loan 2018-03-20 09:31:39 +01:00
Michał Janiszewski cd065d4f41 Reduce includes in common header 2018-03-20 00:27:58 +01:00
Aaron van Geffen 7bc63dc30a Themes window: use header widgets; minor code clean up. 2018-03-19 10:36:39 +01:00
Aaron van Geffen 8ab568a6a9 Multiplayer: use table header widgets for column headers. 2018-03-19 10:36:39 +01:00
Aaron van Geffen f6933aea4e Multiplayer information: take font line height into account. 2018-03-19 08:34:16 +01:00
Aaron van Geffen a61c84d3b0 Increase button height in server list window. 2018-03-19 08:34:16 +01:00
Aaron van Geffen ca4e1a36fb Fix widget dimensions for 'Start server' window. 2018-03-19 08:34:16 +01:00
Aaron van Geffen 686fedc671 Player window: use LIST_ROW_HEIGHT. 2018-03-19 08:34:16 +01:00
Aaron van Geffen 32e0f12f5b Multiplayer window: use SCROLLABLE_ROW_HEIGHT in scrollpaint. 2018-03-19 08:34:16 +01:00
Aaron van Geffen c0bc2da529 Increase button height in save prompt window. 2018-03-19 08:34:16 +01:00
xp4xbox 463cb7ab26 Fix #5339: Change scenery eyedropper to use a relevant icon. 2018-03-19 08:33:59 +01:00
Michał Janiszewski 4dd0995efb Move cmath out of common.h 2018-03-18 23:29:13 +01:00
Michał Janiszewski 5c6e28284b Move cstddef out of common.h 2018-03-18 23:29:13 +01:00
Aaron van Geffen bab1ef465a Automatically scroll once a new month appears in Finances. 2018-03-18 22:41:34 +01:00
Aaron van Geffen df6a86d9bf Leverage more historical data in Finances window.
This adds a horizontal scrollbar to the summary page.
2018-03-18 22:41:34 +01:00
Hielke Morsink 1cd3e5e49c use GAME_COMMAND_FLAG_APPLY instead of hardcoded value 2018-03-18 12:21:24 +01:00
Michał Janiszewski f045370fcf Improve track preview window with OpenGL renderer
This adds a warning to track preview window explaining it's not
supported with OpenGL renderer. Also fixes the issue whereby no stats
were printed because of early exit.
2018-03-16 22:41:08 +01:00
Michał Janiszewski 10dabfa15c Fix strncpy usage in GuestList.cpp 2018-03-14 22:11:01 +01:00
Aaron van Geffen c21143505f Fix #7203: Undefined string in custom currency window. 2018-03-14 13:35:51 +01:00
Michał Janiszewski 764520076f
Reduce header inclusion
* Update includes in PlatformEnvironment.cpp

* Update includes in ParkImporter.h

* Update includes of OpenRCT2.h

* Update includes in Intro.h

* Remove unused include from Input.cpp

* Update includes of Imaging.h

* Update includes in Game.h

* Update includes in Editor.h

* Update includes of Context.cpp

* Update includes in Cheats.cpp, CmdlineSprite.cpp

* Update includes of some source files

* Update includes in some cpp files

* Update includes in some cpp files

* Update includes in TextureCache.h

* Fix tests

* Update includes in Font.cpp

* Update includes in LightFX files

* Update some includes

* Fix GCC builds

* Update some includes

* Update some includes

* Update includes in FontsFamilies.*

* Update includes of Console.h

* Improve includes in Window.h

* Improve headers in Viewport.h/Window.h

* Fix MSVC build

* Fix network-less builds

* Reduce inclusion of Map.h
2018-03-13 13:14:02 +01:00
Ted John 74228ed35f Use iterators again for removing empty headings
Improving on f00aa15096, continue to use iterator and just set it to the result of erase.
2018-03-10 13:58:49 +00:00
Ted John f00aa15096 Fix assert in debug mode in initialise_list_items
Erasing vector iterators causes the iterator to become invalid, so use an index instead for the loop.
2018-03-10 10:52:32 +00:00
Michael Steenbeek 5411c77358 Clean up more direct access to tile elements 2018-03-09 19:40:16 +01:00
Michael Steenbeek 44524d1e6f Name unknown variable 2018-03-09 19:40:16 +01:00
Ted John e318e0948a Fix a few assertions that were found when using debug CRT 2018-03-09 16:28:47 +01:00
Hielke Morsink a8f167c45d Fix a few typos
'vehichle' -> 'vehicle'
'none zero' and 'non zero' -> 'nonzero'
2018-03-09 15:58:12 +01:00
Michael Steenbeek 88af2d3954 Rename sub_6CA2DF() to window_ride_construction_update_state() 2018-03-09 09:17:24 +01:00
Joshua Moerman d6c28b2fa4 Using some more CoordsXY instead of separate xy in Map.cpp 2018-03-08 23:41:33 +01:00
Joshua Moerman 426c21eb56 Uses some more informative types in Map.cpp 2018-03-08 23:41:33 +01:00
Joshua Moerman c2eb735871 Replaces magic numbers with appropriate constants 2018-03-08 23:41:33 +01:00
Joshua Moerman e5d143b748 Simplifies map_window_get_pixel_colour_ride
- Splits uint32 into two uint16
- Reuse code for unowned land colour
2018-03-08 23:41:33 +01:00
Michael Steenbeek 1fa2fa8f80
Refactor ride->entrances and ride->exits 2018-03-07 19:10:50 +01:00
ZehMatt e3708c0593 Split special direction to new parameter. 2018-03-05 00:17:34 +01:00
ZehMatt bdc1cf8adc Refactor GAME_COMMAND_MAZE_SET_TRACK to game action. 2018-03-05 00:17:34 +01:00
Aaron van Geffen ba1d269227 Move all Virtual Floor code from Map to its own file. 2018-03-04 19:28:56 +01:00
Gymnasiast 7a2a73b418 Fix #7205: Park entrance fee cannot be set higher than £100 2018-02-21 22:37:54 +01:00
Michał Janiszewski 08bcbe3912 Make network version a variable to reduce recompilations 2018-02-21 22:21:09 +01:00
Michael Steenbeek 2de6529cf5 Use big coordinates for PeepSpawn's Z coordinate 2018-02-21 09:50:07 +01:00
wolfreak99 2d8c473f75 Sync Peep Spawn over network 2018-02-19 21:11:14 +01:00
Michael Steenbeek bde913ee16 Rename SmallCoords and BigCoords 2018-02-15 22:26:50 +01:00
Michael Steenbeek a2260929dd Replace rct_xy_element with BigCoordsXYE 2018-02-15 22:26:50 +01:00
Michael Steenbeek d481cca2ed
Remove some redundant casts and fix rct_sprite::AsDuck() 2018-02-15 13:04:25 +01:00
Hielke Morsink 55979a3fff Remove and replace C typedefs
`typedef struct/union/enum name { ... } name_again;` is not needed whe compiling C++, moving the name at the back to be in front of the object and removing `typedef` makes it usable the very same way.
This also replaces typedefs with the using keyword. They have better readability, especially for function pointer types, and would allow more flexibility when used with templates.
2018-02-14 09:42:26 +01:00
Ted John d22572d0b9 Remove rct_object_entry_extended 2018-02-12 12:48:41 +00:00
Ted John 4d8fe051e8 Remove most usages of object_entry_groups 2018-02-12 12:48:41 +00:00
Ted John d905dde070 Simplify selected object flags 2018-02-12 12:48:41 +00:00
Hielke Morsink 8e55c811f6 Check for server version instead of address (#7155) 2018-02-09 19:16:54 +00:00
Gymnasiast f003366d22 Remove STEX selection from Object Selection window 2018-02-09 13:47:15 +01:00