Commit graph

2278 commits

Author SHA1 Message Date
Michael Steenbeek
4290d0a65d Fix some erroneous use of LOCATION_NULL
Found by @janisozaur and introduced in PR #6461.
2017-10-25 11:59:29 +02:00
blackhand1001
e4caeb7ef9 Use constants for energy bars in Peep window 2017-10-24 09:19:17 +02:00
Aaron van Geffen
ec53c1c953 Add extra padding to the editor's scrollable invention lists. 2017-10-22 22:00:49 +02:00
Aaron van Geffen
9dbba6e56e Add extra padding to scrollable list items in staff window. 2017-10-22 22:00:49 +02:00
Aaron van Geffen
cbb178743f Add extra padding to scrollable list items in guest window. 2017-10-22 22:00:49 +02:00
Aaron van Geffen
84435262ba Increase height of the options button on the title screen. 2017-10-22 22:00:49 +02:00
Aaron van Geffen
01b92b06fd Take line heights into account in Error windows. 2017-10-22 21:48:09 +02:00
Aaron van Geffen
4fe70294e2 Take line heights into account in About and Music Credits windows. 2017-10-22 21:48:09 +02:00
Aaron van Geffen
9f67fafc43 Add theme support for console background colour. 2017-10-19 21:26:53 +02:00
Michał Janiszewski
8fd2266bda Refactor includes (#6512)
* Refactor Intent.h inclusion

* Use forward declaration of ITcpSocket

* Remove unused include

* Forward declare rct_ride_entry

* Remove unused headers

* Forward-declare rct_drawpixelinfo

* Remove unused headers

* Lower header include from header to source file

* Reduce included headers

* Reduce includes
2017-10-19 10:01:05 +02:00
blackhand1001
ce0650daf5 Change min energy cheat to the correct min value 32.
Change min energy cheat to the correct min value 32. This fixes the issue with the min energy cheat that causes it to reset to 255 a few seconds after applying it.
2017-10-18 21:52:46 +02:00
Duncan
d224f1219e Reintroduce error titles to game actions. Small refactor. (#6462)
* Reintroduce error title to game actions. Small refactor.

Removed setting error titles in any calling functions.
Refactored place park entrance result to conform with other game actions.

* Remove unread variable (fixing Travis)
2017-10-18 19:57:36 +01:00
Robert Jordan
ec22d04089 Fix #6470: Title sequence naming issues
Predefined title sequence filenames are now treated as "reserved".
Custom title sequences cannot use reserved names and an error will
appear if the user tries.

Duplicating predefined title sequence now uses default text of
predefined sequence's proper name instead of filename.

Renamed `WIDX_TITLE_EDITOR_RENAME_SAVE_BUTTON` to
`WIDX_TITLE_EDITOR_RENAME_BUTTON` to follow formatting of other preset
button ids.

Added string id 6154, `STR_ERROR_RESERVED_NAME`, "Name is reserved".
2017-10-18 11:18:14 +02:00
Aaron van Geffen
d6ee66acb4 Split/rename ROW_HEIGHT constant into widget-specific ones. 2017-10-18 11:17:22 +02:00
Aaron van Geffen
7e9a5bbb6b Increase padding for finances summary and marketing tab. 2017-10-18 11:17:22 +02:00
Christian F. Coors
e5ce3859a3 Fix Intent pointers/strings 2017-10-17 22:31:05 +02:00
Michael Steenbeek
bb01699b7d Compile track.c as C++ 2017-10-17 13:51:47 +02:00
Aaron van Geffen
60aa849a83 Increase height for items in shortcuts window.
This increases the height for each item in the keyboard shortcuts window from 10px to 12px.
While this may not seem like much, it ensures the text no longer overlaps for Japanese and Korean.
At also has the added benefit of making the window look a bit nicer for Western languages.
2017-10-17 11:39:24 +02:00
Robert Jordan
9d5c6a4127 Use proper names for predefined themes
Predefined themes *RCT1* and *RCT2* will now be called their respective
game name*RollerCoaster Tycoon 1* or *RollerCoaster Tycoon 2* in the
current language.

Predefined themes in the config file now are prefixed with an asterisk
like they are supposed to be. AKA `*RCT1` instead of `RCT1`.

This will invalidate the user's currently selected theme in the config
file, but only if they were using RCT1's theme.
2017-10-16 10:04:09 +02:00
Christian F. Coors
e1d24641a4 Fix saving without dialog in new scenario 2017-10-16 08:07:10 +02:00
Martin Müller
ffdc854c1f Fix #5741: Disappearing land/construction rights indicators 2017-10-15 16:11:08 +02:00
Tomas Dittmann
e393ff1f22 Stop using (void*)-1 for invalid pointers 2017-10-15 15:53:16 +02:00
Robert Jordan
74f1eb39a8 Fix: TitleSequence spelling errors
```c++
bool TileSequenceSave(TitleSequence * seq);
bool TileSequenceAddPark(TitleSequence * seq, const utf8 * path, const
utf8 * name);
bool TileSequenceRenamePark(TitleSequence * seq, size_t index, const
utf8 * name);
```

Renamed to:

```c++
bool TitleSequenceSave(TitleSequence * seq);
bool TitleSequenceAddPark(TitleSequence * seq, const utf8 * path, const
utf8 * name);
bool TitleSequenceRenamePark(TitleSequence * seq, size_t index, const
utf8 * name);
```
2017-10-15 10:33:10 +02:00
Michael Steenbeek
7f9c25a7a9 Use constant for LOCATION_NULL, split off location stuff to Location.h 2017-10-13 22:23:07 +02:00
Michał Janiszewski
ab3835719a Compile peep and staff logic as C++ 2017-10-13 10:06:36 +02:00
Michael Steenbeek
3a9dc3f491 Ensure that get_ride_entry returns NULL on invalid ride entries 2017-10-12 21:07:35 +02:00
Michael Steenbeek
3a2aeda398 Refactor expenditure table and history graph 2017-10-12 20:35:59 +02:00
Michael Steenbeek
42d6a10952 Compile management as C++ 2017-10-11 21:38:26 +02:00
Michael Steenbeek
17557569d0 Turn 'unlock all prices' into a regular option
This uses a previously unused S6 flag to save this option persistently.
This should not make S6 import much harder, but should reduce the amount of questions about S4 import.

Also refactor the checks whether the user can ask money for rides or entry. This should make it a lot easier
when our own save format comes around.
2017-10-11 08:33:17 +02:00
Michał Janiszewski
c4538496c5 Make sure variables are either static or declared externally 2017-10-09 22:59:40 +02:00
Marijn van der Werf
ebb4bbe5d5 Move ride list window to UI module (#6412) 2017-10-08 22:15:41 +02:00
vector-of-bool
57a8bbac23 Respect POSIX path separators on Windows (#6356) 2017-10-08 21:28:38 +02:00
Christian F. Coors
e737b3108c Add status messages to server list window 2017-10-08 11:51:22 +02:00
Aaron van Geffen
34685b07a0 Fix #6407: Load/Save window theme is not applied 2017-10-07 23:56:47 +02:00
Marijn van der Werf
d02976695d Move new ride and research windows 2017-10-07 22:24:14 +02:00
Marijn van der Werf
eef3bd9af5 Move staff and guest windows 2017-10-07 22:24:14 +02:00
Marijn van der Werf
8569a7fe2f Move map window 2017-10-07 22:24:14 +02:00
Michael Steenbeek
25b72260d7 Compile research.cpp as C++, small refactor 2017-10-06 21:41:50 +02:00
Aaron van Geffen
af3fa4b0ff Options window: fix background colour for some dropdowns 2017-10-05 14:11:37 +02:00
ZehMatt
bf0bc77dfc Refactor SetParkEntranceFeeAction to use constructor for parameters.
Add RideSetNameAction.
Support of string serialisation.
Check requested status for ride in Query.
Add RideDemolishAction.
2017-10-05 10:42:44 +02:00
Michael Steenbeek
289e154fe4 Fix #6315: Not all researched items in S4 are available 2017-09-28 16:24:44 +02:00
Michael Steenbeek
18db4a5274 Implement #6292: Allow building queue lines in the the Scenario Editor
Also format the file properly and do a bit of clean up.
It's now also possible to build queue lines for editor-only paths.
2017-09-25 22:09:40 +02:00
Marijn van der Werf
9d80f7efed Apply recommended fixes 2017-09-24 22:41:49 +02:00
Marijn van der Werf
47e65d1ab1 Finish rebase 2017-09-24 22:41:49 +02:00
Marijn van der Werf
6df955dd27 Add missing window initializers 2017-09-24 22:41:49 +02:00
Marijn van der Werf
9d93d28efb Change method argument type 2017-09-24 22:41:49 +02:00
Marijn van der Werf
257c9d60d5 Fix imports 2017-09-24 22:41:49 +02:00
Marijn van der Werf
b7164c5eac Rename intent extra keys 2017-09-24 22:41:49 +02:00
Marijn van der Werf
619733ba05 Move track design windows 2017-09-24 22:41:49 +02:00
Marijn van der Werf
d18e59ff17 Move loadsave dialog 2017-09-24 22:41:49 +02:00
Marijn van der Werf
9b1b2b5c62 WIP window moving 2017-09-24 22:41:49 +02:00
Marijn van der Werf
ac910a5979 Move Error, Campaign and Ride Demolition windows 2017-09-24 22:41:49 +02:00
Marijn van der Werf
a49a777047 Move Banner, Player and Sign windows 2017-09-24 22:41:49 +02:00
Marijn van der Werf
8503b8e204 Move Finances and Park windows 2017-09-24 22:41:49 +02:00
Michael Steenbeek
1fd1d8c26b Move editor to C++; add defines for object limits 2017-09-22 07:56:24 +02:00
Michael Steenbeek
fa5ec031f1 Clean up ride naming 2017-09-20 21:19:55 +02:00
Michał Janiszewski
00fd18809c Move extern "C" {} blocks to headers (#6282) 2017-09-18 17:05:28 +02:00
Michael Steenbeek
597d40b25b Add cheat to show all drawable track elements 2017-09-13 19:38:30 +02:00
Gymnasiast
a28509e24c Split Ride and rct2_ride 2017-09-12 11:16:57 +02:00
Ted John
3f1991804a Add debug option to show dirty blocks 2017-08-31 22:36:15 +01:00
wolfreak99
3e4d4ca56f Allow Random Terrain and Place Trees on Simplex Map Generator 2017-08-23 08:56:56 +02:00
Richard Jenkins
71e580a58f Refactor game load functions, resolves #6011 2017-08-23 08:04:36 +02:00
jensj12
c3a5ffbe04 Implement #3994: Show bottom toolbar with map tooltip 2017-08-16 22:27:20 +02:00
Tomas Dittmann
d266ab5f91 Fix #6133: Construction rights not shown after selecting buy mode
tool_set() cancels the previous tool, so it has to be called first or it will cancel the _landRightsMode that was meant to be activated.
2017-08-16 10:22:27 +02:00
Michał Janiszewski
d698ad1100 Convert NULL -> nullptr in C++ 2017-08-15 11:51:56 +02:00
Michał Janiszewski
44c8c84b7c Convert integers acting as bools to bools (#6177)
Also fixes MSVC2015 according to AppVeyor
2017-08-15 09:03:10 +01:00
Marijn van der Werf
294cef3c9b Move additional windows to UI project 2017-08-14 23:53:28 +02:00
Marijn van der Werf
247fdc2f5d Fix formatting of C includes 2017-08-10 13:42:27 +02:00
Michał Janiszewski
38f4f8be79 Fix missing includes 2017-08-10 13:42:27 +02:00
Michał Janiszewski
872b3e2039 Update casing of header file 2017-08-10 13:42:27 +02:00
Marijn van der Werf
4d90940d21 Move windows to UI project 2017-08-10 13:42:27 +02:00
Ted John
f3ef92edcb Fix MSVC build errors and warnings 2017-08-10 13:42:27 +02:00
Marijn van der Werf
a53a7ab706 Convert remaining dialogs 2017-08-10 13:42:27 +02:00
Kuriibo
59fabad37c Added new string for shortcut, validate_global_widx 2017-07-26 17:23:47 +01:00
Kuriibo
d0db59e196 Keyboard Shortcut for Scenery Remover - #5835
Added a hotkey for the "clear scenery" window. By default, the hotkey is the "b" key (b/c bulldozer).
2017-07-26 17:23:47 +01:00
wolfreak99
8364d8d3d8 Implement load game shortcut 2017-06-24 19:01:00 +02:00
Ted John
cbd53f920c Create IWindowManager to open window from libopenrct2 2017-06-11 17:23:51 +01:00
Ted John
dfa1b47a4f Move keyboard shortcut code to libopenrct2ui. 2017-06-11 16:52:15 +01:00