mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
13,208 Commits 8 Branches 40 Tags 362 MiB
Commit Graph

10064 Commits

Author SHA1 Message Date
Michael Steenbeek e53d76f7e1 Fix disconnected entrances when loading save 2017-10-25 23:13:54 +02:00
Robert Jordan 98043c284b Fix: Steam path locator Android build error 
Added `platform_get_steam_path` to android.c
 2017-10-25 18:37:26 +02:00
Ted John be4fe7b681 Rename total ride value to total ride value for money 2017-10-25 13:38:06 +02:00
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
Robert Jordan c9c0c07eca RCT2 Steam path locator: improve OS support 
Now looks for RCT2 install within OS-specific steam install directories.
Also checks the registry in Windows in case Steam has a custom install
path.
 2017-10-24 18:36:40 +02:00
Cody Jung c25a4490e4 Windows: Fix bad screenshots if park name has ":" 
Fixes issue #6481 where taking a screenshot of a park with a colon in
its name on Windows was causing the screenshot data to get written as an
alternate data stream.

This patch replaces any colons with hyphens in screenshot filenames on
Windows.
 2017-10-24 14:52:40 +02:00
Michael Steenbeek 6757633965 Fix formatting and a refactor mistake 2017-10-24 10:11:48 +02:00
Michael Steenbeek 887ec16b53 Split off ride_get_rotated_coords() 2017-10-24 10:11:48 +02:00
Michael Steenbeek c77c15e4de Initialise more variables to keep AppVeyor happy 2017-10-24 10:11:48 +02:00
Michael Steenbeek e4132c9030 Initialse foundTrack 2017-10-24 10:11:48 +02:00
Michael Steenbeek 1b78f87177 Remove goto from ride_get_entrance_or_exit_position_from_screen_position() 2017-10-24 10:11:48 +02:00
Michael Steenbeek 2742bd8db4 Remove goto from ride_music_update_final() 2017-10-24 10:11:48 +02:00
Michael Steenbeek 2fd33c4c61 Remove goto in ride_get_track_length() 2017-10-24 10:11:48 +02:00
Michael Steenbeek cabd65f3e7 Remove ride_music_params_update gotos 2017-10-24 10:11:48 +02:00
Robert Jordan 0e354e18af Improve #6125: Place path in park entrances (#6479) 
Can now update park entrance path by placing path over the middle tile.
Updating the path costs money just like normally replacing a path.

Updating the path type can only be done in sandbox mode or in the
scenario editor.
 2017-10-24 09:50:33 +02:00
Cody Jung 4bbb0b3b37 Fix #6251: Splash Boats flat-to-25 tunnel drawn incorrectly 
Fixes Splash Boats 25deg-down-to-flat tunnel rendering. This is based on
flat-to-25deg-up (but opposite).

Wrap Splash Boats fix in an ifdef for TestPaint.
 2017-10-24 09:45:49 +02:00
Michael Steenbeek 962e479437 Remove unused function 2017-10-24 09:40:58 +02:00
Michael Steenbeek b9e4d06d07 Compile cable_lift.c as C++ 2017-10-24 09:39:40 +02:00
blackhand1001 e4caeb7ef9 Use constants for energy bars in Peep window 2017-10-24 09:19:17 +02:00
Michael Steenbeek ce4899c60c Compile station.c as C++ 2017-10-23 14:47:12 +02:00
zaxcav f5ff867599 Fix #6261: Broken pathfinding after removing park entrances with the tile inspector 
Check the gParkEntrance locations after loading from file and clear those locations for which there is no longer a park entrance map element.
Resolves path finding problems in parks caused, for example, be deleting a park entrance using the tile inspector.

Fixes #6261, #6344, #6520.
 2017-10-22 23:22:46 +02:00
Michał Janiszewski 81ba7e774f Don't trigger assert on invalid TopSpin paint 2017-10-22 22:30:16 +02:00
Aaron van Geffen 0a6e780fe6 Add extra padding to the listings in the ride window. 2017-10-22 22:00:49 +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 ac8eaaee62 Add extra padding to dropdowns and menus. 2017-10-22 22:00:49 +02:00
Michał Janiszewski cda5d377ca Validate draw calls for vehicles 2017-10-22 21:50:44 +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 9984fcac88 Set default TTF font heights to more sensible values. 2017-10-22 21:47:17 +02:00
Ted John 1f605db54b Extract RLE repeat to its own method 2017-10-22 16:21:13 +02:00
Ted John a737848e8e Remove old C decoding functions and fix tests 2017-10-22 16:21:13 +02:00
Ted John 8d1710d798 Fix #6460: Crash when reading corrupt object files 
- Move sawyer coding functions to SawyerChunkReader.
- Replace assertions with exceptions to prevent crash on invalid chunks.
 2017-10-22 16:21:13 +02:00
TELK 1043be5bd5 Fix Twitch config not being read correctly 2017-10-21 09:42:41 +02:00
Liam Parker b2a781dc1d Fix #6518: Correctly load guest left park from config 
OpenRCT2 was reading a "guest_entered_left_park" value for the notification setting.

The value is saved as "guest_left_park" however. Mistake made during refactor.
 2017-10-19 21:58:49 +01:00
Aaron van Geffen 9f67fafc43 Add theme support for console background colour. 2017-10-19 21:26:53 +02:00
Aaron van Geffen a0fb2a6d7c Fix game console overflowing when using TTF for rendering. 2017-10-19 21:26:53 +02:00
Michał Janiszewski 35644a66e0 Fix android build 2017-10-19 10:48:25 +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
Marijn van der Werf bcb6b83a7d Fix #6514: Groupbox titles break format arguments 2017-10-18 21:55:20 +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
Michael Steenbeek ac7652f61d Create define for MONEY16_UNDEFINED 2017-10-18 08:06:16 +02:00
Michael Steenbeek 79365b7a91 Merge pull request #6075 from marijnvdwerf/ui/text-paint 
Refactor text painting
 2017-10-18 07:49:13 +02:00
Christian F. Coors e5ce3859a3 Fix Intent pointers/strings 2017-10-17 22:31:05 +02:00
Marijn van der Werf fcfa4ffcc2 Apply requested changes 2017-10-17 22:24:34 +02:00
Michael Steenbeek 221e42b56e Merge pull request #6505 from Gymnasiast/refactor/track-c 
Compile track.c as C++, fix preview Z offsets
 2017-10-17 19:51:15 +02:00
Michael Steenbeek 08929b8b19 Fix missed -1 pointer comparisons 2017-10-17 17:05:57 +02:00
Michael Steenbeek a23a40b447 Fix alignment and include order 2017-10-17 16:16:20 +02:00
Michael Steenbeek 0cb1e57cc6 Fix preview Z offset table entries 2017-10-17 13:59:57 +02:00
Michael Steenbeek a1621e4eb1 Track.cpp and Track.h: fix formatting 2017-10-17 13:55:53 +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
Michał Janiszewski 6695a4ce13 Fix #6497: Boat hire boats do not return to station 
Credit goes to @duncanspumpkin
 2017-10-17 10:17:39 +02:00
Arnav Borborah 8271da85a2 Fix arguments to main() 2017-10-17 00:04:40 +02:00
Michael Steenbeek 6a66ef8668 Merge pull request #6442 from janisozaur/vehicle-cpp 
Compile vehicle.c as C++
 2017-10-16 17:15:43 +02:00
Michał Janiszewski 9ca73ffde2 Compact the switch statement 2017-10-16 10:42:40 +02:00
Michał Janiszewski 5843d72ece Add comment explaining commented out code 
[ci skip]
 2017-10-16 10:19:47 +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
Aaron van Geffen 08f7aba817 Rename 'blend' function to 'blendColours'. 2017-10-15 22:31:11 +02:00
Aaron van Geffen 551fdabc7f Make the hinting threshold configurable per font. 
This addresses the issue that tofu would not show up in Arial on macOS if the
threshold was set to 60. It being the fallback font, it is important that they
do, which requires lowering to at most 43.

However, it is even more important that the threshold is left at 60 for kanji
in e.g. Japanese to render properly.

Hence, for the moment, Arial is the only font now using a hinting threshold
of 40, for now.
 2017-10-15 22:31:11 +02:00
Aaron van Geffen 899c859948 Use light hinting mode iff hinting is enabled. 
This makes use of TTF_SetFontHinting, which was ported from SDL_ttf for the occasion.
 2017-10-15 22:31:11 +02:00
Marijn van der Werf 4213a66069 Improve colour blending 2017-10-15 22:31:11 +02:00
Aaron van Geffen 579c578777 Address regression: do not blend to remappable colour areas. 2017-10-15 22:31:11 +02:00
Aaron van Geffen 5e7f9c4762 Allow enabling/disabling hinting through console. 2017-10-15 22:31:11 +02:00
Aaron van Geffen d4c5218ba2 Move blending code to colour.c. 2017-10-15 22:31:11 +02:00
Marijn van der Werf d6349d0095 Calculate blended palette index 2017-10-15 22:31:11 +02:00
Aaron van Geffen 0ed3ef3704 Use ColourMapA where possible. 2017-10-15 22:31:11 +02:00
Aaron van Geffen 4b7ebcb51c Handle two rare cases: for red losses in finance window, and text in theme window. 2017-10-15 22:31:11 +02:00
Aaron van Geffen fec0568b29 Shade black backgrounds differently (e.g. IME) 2017-10-15 22:31:11 +02:00
Aaron van Geffen f2e795b4ef Handle hinted font rendering in scrolled texts, too. 2017-10-15 22:31:11 +02:00
Aaron van Geffen 346cfdf135 Account for colour intensity as well as outlined texts. 2017-10-15 22:31:11 +02:00
Aaron van Geffen 2dcf9c73e7 Make font hinting optional through config.ini. 2017-10-15 22:31:11 +02:00
Aaron van Geffen ea034e85fa Simulate font hinting when using TrueType fonts for better legibility. 2017-10-15 22:31:11 +02:00
Aaron van Geffen 3357d32ec4 Port TTF_RenderUTF8_Shaded and TTF_drawLine_Shaded from SDL_ttf. 2017-10-15 22:31:11 +02:00
Michał Janiszewski 49d58dde3e Review fixes 2017-10-15 22:07:47 +02:00
Michał Janiszewski a7be24b2b4 MSVC fixes 2017-10-15 22:07:47 +02:00
Michał Janiszewski d365407384 Apply formatting 2017-10-15 22:07:47 +02:00
Michał Janiszewski d9af76d5a1 Exclude parts of Vehicle.cpp from auto-formatting 2017-10-15 22:07:47 +02:00
Michał Janiszewski f27a7a5918 Compile vehicle.c as C++ 2017-10-15 22:07:47 +02:00
Gymnasiast 07cdc79bd7 Replace two missed -1 NULL pointers 2017-10-15 21:41: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
Ted John a65192b141 Do not use float 2017-10-14 23:38:51 +02:00
Ted John a8c9c758f4 Fix a couple of bugs 2017-10-14 23:38:51 +02:00
Ted John 55c420b738 Fix code style 2017-10-14 23:38:51 +02:00
Marijn van der Werf d596c0139f Combine text paint functions 2017-10-14 23:38:51 +02:00
Marijn van der Werf c01bcea391 Introduce more constants for text rendering 2017-10-14 23:38:50 +02:00
Krutonium fd459f0791 Add a visible notification for missing KDialog/Zenity 2017-10-14 22:16:51 +02:00
Robert Jordan 0313183d13 Fix #6318: Can't fire staff that are being placed 2017-10-14 22:14:45 +02:00
Mark van Renswoude ce73d3a8a5 Fix #6390: Crash when renaming rides in multiplayer 2017-10-14 14:21:06 +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
Robert Jordan 7d6bfa19ea Fix #6452: scenario text truncated when switching architectures 
`ScenarioFileIndex`'s `Serialize` and `Deserialize` now read and write each
individual value of a `scenario_index_entry` instead of the entire struct
at once. Thus the difference in pointer sizes of `highscore` on different
architecture builds will not cause issues with `scenarios.idx`.
 2017-10-13 10:00:42 +02:00
Michał Janiszewski 7dad101f70 Include stdbool.h in Guard.hpp 
C only has `bool` type when `stdbool.h` is included.
 2017-10-13 08:00:32 +02:00
Michael Steenbeek 202244eda6 Revert "Remember last used rotation for rides with no tracks." 
This reverts commit 7dc6e4e9c3.
This commit caused hacked rides (like rollercoasters set to Crooked House) to crash
 2017-10-12 23:24:51 +02:00
Tomas Dittmann 6d29fd5c77 Set null viewports to NULL, not -1 2017-10-12 21:43:39 +02:00
Tomas Dittmann 88742dce80 Ensure null objects are written as -1 to SV6 2017-10-12 21:23:54 +02:00
Michael Steenbeek 3a9dc3f491 Ensure that get_ride_entry returns NULL on invalid ride entries 2017-10-12 21:07:35 +02:00
ZehMatt 7dc6e4e9c3 Remember last used rotation for rides with no tracks. 2017-10-12 21:06:04 +02:00
Michael Steenbeek 3a2aeda398 Refactor expenditure table and history graph 2017-10-12 20:35:59 +02:00
Michael Steenbeek d342272dda Fix usage of RIDE_ID_NULL 2017-10-12 13:35:04 +02:00
Michał Janiszewski 8c885c92a4 Fix MinGW release builds 2017-10-12 12:45:00 +02:00
Robert Jordan 559a4c0953 Fix #6445: set favourite ride to N/A when importing from RCT1/AA 2017-10-12 12:40:57 +02:00
Michael Steenbeek 42d6a10952 Compile management as C++ 2017-10-11 21:38:26 +02:00
Michał Janiszewski 07f7928382 Indent namespace contents in KeyboardShortcut.cpp 2017-10-11 11:30:40 +02:00
Michael Steenbeek 34200848a9 Fix Xcode project; rename input.h 2017-10-11 11:30:38 +02:00
Michał Janiszewski 992721bdb7 Remove C sources from libopenrct2ui.vcxproj globs 2017-10-11 11:30:37 +02:00
Michał Janiszewski bc1d3c0cb2 Remove C sources from glob patterns for openrct2-ui 2017-10-11 11:30:37 +02:00
Michał Janiszewski 50fa761fa0 Apply C++ formatting to Input.cpp 2017-10-11 11:30:36 +02:00
Michał Janiszewski f04c871515 Compile input.c as C++ 2017-10-11 11:30:35 +02:00
Michał Janiszewski 83bb8721f8 Apply C++ formatting 2017-10-11 11:30:34 +02:00
Michał Janiszewski b55f966a87 Compile keyboard_shortcut as C++ 2017-10-11 11:30:33 +02:00
Daniel Trujillo Viedma 39ecd37d27 Fix fault in #6401: append extensions only when saving 2017-10-11 09:43:49 +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
Duncan f97068d0b6 Fix #6420: Demolishing rides refunds twice as much as the ride costs to build 2017-10-11 07:58:49 +02:00
LRFLEW 0868902f11 Rework OpenGL API declarations 2017-10-10 22:26:35 +02:00
Michael Steenbeek 64da0e8f8d Fix some formatting in peep.c 
JENKINS!!
 2017-10-10 15:17:39 +02:00
Michał Janiszewski 89fb6b2144 Fix android builds 
[ci skip]
 2017-10-10 14:53:33 +02:00
Michał Janiszewski 16bd2c6439 Fix #6430: endless vomiting 
Mistake during refactor
 2017-10-10 14:02:50 +02:00
duncanspumpkin 665aac7394 Fix #6413: Draw Maze previews correctly. 
Mistake made during refactoring. Apply flag was not being passed to the game command and this meant that only the query to check if a maze element could be placed was called.
 2017-10-10 12:43:54 +02:00
Michael Steenbeek 6621faf27a Fix #6196: Guest's energy underflows and never decreases 
Issue caused by using max where min was intended.
This also reverts an earlier change in capping the energy target, since it seems to max out at 255, unlike energy itself.
 2017-10-10 10:06:56 +02:00
Daniel Trujillo Viedma 9dc04ed07a Fix #3510: Auto append file extension when not specified on save 2017-10-10 09:55:40 +02:00
Michael Steenbeek 5cc5761a25 Fix #6414: raise maximum launch speed of the Corkscrew to 96 km/h 2017-10-10 09:53:36 +02:00
Michael Steenbeek 3c8184dfa1 Handle Polish in the RCT2-to-Unicode conversion 
Also removed the misidentified A_MINUSCULE and CENT.
 2017-10-10 09:22:38 +02:00
Michael Steenbeek 71686e88b5 Render Polish with the sprite font 
Fixes the sprite lookup table for the Polish characters.
Switches the font settings for Polish from TTF to sprite.
 2017-10-10 09:22:38 +02:00
Michał Janiszewski c4538496c5 Make sure variables are either static or declared externally 2017-10-09 22:59:40 +02:00
Michał Janiszewski b05bdf28fc Fix compilation with older clang 
Older clang would expand the macros and spot that clamping unsigned
values to [0, MAX] is a tautological operation and produce an error.

As these are tautological operations, no network version change should
be needed.
 2017-10-09 17:34:37 +02:00
Duncan 6e1521caec Reintroduce error messages when trying to open invalid rides (#6381) 
* Reintroduce error messages when trying to open invalid rides

Mistake made during action refactor. I've added the ability to specify the error title and error args as well in the result constructor. In addition the set status will now perform a query to check if it is valid preventing error messages hitting the server.

* Bring error message setting into the function

This prevents any other function corrupting the message args. Looking at you update ride window.

* Increment network version for error message fix on set status

* Reintroduce the error title to set ride name

* Try not to introduce bugs due to inverting logic
 2017-10-09 15:50:49 +01:00
Michael Steenbeek 9effe3a599 Merge pull request #6417 from janisozaur/rides-as-cpp 
Compile rides as C++
 2017-10-09 15:56:38 +02:00
Michael Steenbeek e25d6b807d Fix refactor error in MiniGolf.cpp 2017-10-09 15:33:34 +02:00
Michael Steenbeek 2fd4d39456 Fix compilation in Visual Studio 2017-10-09 15:24:51 +02:00
Michael Steenbeek f9c2d16eb0 Rename ride paint header files 2017-10-09 15:24:24 +02:00
Michał Janiszewski 7bdcc3345f Rename files to C++ convention 2017-10-09 15:24:22 +02:00
Michał Janiszewski a9dafef0f4 Apply C++ formatting 2017-10-09 15:24:21 +02:00
Michał Janiszewski a8c8f726ee Compile ride drawing code as C++ 2017-10-09 15:24:20 +02:00
Aaron van Geffen bfc999aac9 Order language list by native name 2017-10-09 10:53:09 +02:00
duncanspumpkin 79f34c6fa3 Add remove park fences console command 2017-10-09 10:49:06 +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
Christian F. Coors f98a240c5a Fix Intent string retrieval 2017-10-07 21:53:00 +02:00
Christian F. Coors 84086a2465 Fix http_request_t 2017-10-07 20:15:39 +02:00
ZehMatt 6fd2eb91a2 Fix demolishing rides causing errors. 2017-10-07 20:15:01 +02:00
ZehMatt 19f9a9b755 Fix #6394: RideCreateAction not working with empty colour presets. 2017-10-07 20:13:05 +02:00
Aaron van Geffen 86031410c6 Clear IME buffer after committing composed text. 2017-10-07 20:12:05 +02:00
Christian F. Coors 72b3896fec Fix strings in Intent 2017-10-07 19:21:56 +02:00
Michael Steenbeek 31e1ad43a8 Compile finance.c as C++, clean up 2017-10-07 16:28:35 +02:00
Michael Steenbeek 25b72260d7 Compile research.cpp as C++, small refactor 2017-10-06 21:41:50 +02:00
Michał Janiszewski 10def2a31b Provide default values to fix mingw build 2017-10-06 13:42:37 +02:00
Michael Steenbeek 7cb464af6e Clean up animated object limit and import 2017-10-06 11:33:55 +02:00
Aaron van Geffen 0217734c4e Fix #6383: macOS deprecation errors when compiling. 2017-10-06 11:23:16 +02:00
Michael Steenbeek 4224193d68 Clean up ride groups 2017-10-06 10:29:24 +02:00
Christian F. Coors ecc6bf5120 Fix scrolling with mouse wheel 2017-10-06 10:17:43 +02:00
Michał Janiszewski 07dbdfbd34 Make GameActionResult destructor virtual to ensure proper teardown 2017-10-06 07:31:40 +02:00
ζeh Matt 0423397c34 Fix #6376: RideCreateAction::Query ignores valid secondary colour input 2017-10-05 20:46:50 +02:00
Michael Steenbeek f2195b4300 Use constants and proper formatting in colour.[ch] 2017-10-05 15:55:57 +02:00
Aaron van Geffen af3fa4b0ff Options window: fix background colour for some dropdowns 2017-10-05 14:11:37 +02:00
Michał Janiszewski 1089bd2d56 Increase network version 2017-10-05 10:42:44 +02:00
Oli414 d39c80da42 Fix code style. Fix error text 2017-10-05 10:42:44 +02:00
Oli414 59eae9defa Add missing include 2017-10-05 10:42:44 +02:00
Olivier Wervers 4bdfb31fcb Remove changes from libopenrct2.vcxproj 2017-10-05 10:42:44 +02:00
Oli414 857faec100 Tabs to spaces 2017-10-05 10:42:44 +02:00
Oli414 0760ea6aa8 Renamed duplicate region 2017-10-05 10:42:44 +02:00
Oli414 8fa82493cb Move set_staff_name game command functionality to game action 2017-10-05 10:42:44 +02:00
Oli414 14f59c3d9b Move set_guest_name game command functionality to game action 2017-10-05 10:42:44 +02:00
ZehMatt 3f93af11d6 Fix game actions executing wrong callbacks. 2017-10-05 10:42:44 +02:00
Michał Janiszewski 9ff0e22aee Whitespace fixes 2017-10-05 10:42:44 +02:00
ZehMatt d8d7d97f74 Fix references on deprecated GAME_COMMAND_DEMOLISH_RIDE 2017-10-05 10:42:44 +02:00
Michał Janiszewski aba3c270bb Game actions fixes 2017-10-05 10:42:44 +02:00
Michał Janiszewski 540f306809 Provide default values for various scalar fields 2017-10-05 10:42:44 +02:00
Michał Janiszewski 4841e2c6f3 Improve verifying validty of new game action 2017-10-05 10:42:44 +02:00
ZehMatt 1dd5d3a3f5 Verify there is an empty slot for a new ride 2017-10-05 10:42:44 +02:00
Michał Janiszewski fe636b5ef4 Rebase fixes 2017-10-05 10:42:44 +02:00
Michał Janiszewski 23bfb9b306 Remove superfluous move 2017-10-05 10:42:44 +02:00
Michał Janiszewski b70dd97234 Fix rebase errors 2017-10-05 10:42:44 +02:00
Michał Janiszewski 05e7ef7791 Add missed forward declarations 2017-10-05 10:42:44 +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
ZehMatt 995c0d0a6b Refactor SetParkEntranceFeeAction to use constructor for parameters. 
Add RideSetNameAction.
Support of string serialisation.
 2017-10-05 10:42:44 +02:00
ZehMatt ce54b41aba Fix single player pre-designed rides not working. 
Move ride_create_command into GameActionCompat
Refactor GameActions to return the GA_FLAGS instead of using the const value.
Refactor passing params to GameActions over constructor.
 2017-10-05 10:42:44 +02:00
ZehMatt 89c020d3fe RideCreateAction takes the colours now as input. 
Add ride_get_entry_index, same code is used at multiple spots.
Rename variable 'rei' to 'rideEntryIndex'
 2017-10-05 10:42:44 +02:00
ZehMatt e78e972de5 Moved some of RideCreateAction checks into the Query member. 2017-10-05 10:42:44 +02:00
Michał Janiszewski cb7c0d1df4 Use std::move for RideCreateAction::Execute 
Fixes compilation with ICC and Xcode 8
 2017-10-05 10:42:44 +02:00
Michał Janiszewski bdf8c001e4 Remove unused function 2017-10-05 10:42:44 +02:00
Michał Janiszewski 6ddac382be Fix copyright dates 2017-10-05 10:42:44 +02:00
Michał Janiszewski 5e523c723f Lift -Wsuggest-final-X for game actions 2017-10-05 10:42:44 +02:00
Ted John d97123073c Backport fixes to ride_create 2017-10-05 10:42:44 +02:00
Ted John 4e765a81b1 Tabs to spaces 
[ci skip]
 2017-10-05 10:42:44 +02:00
Ted John ed133df13f Fix build errors 2017-10-05 10:42:43 +02:00
Ted John 4ac8f1dc35 Make the game action callback type safe 2017-10-05 10:42:43 +02:00
Ted John aa30859ab7 Merge IGameAction into GameAction 2017-10-05 10:42:43 +02:00
Ted John 2b57d36174 Tabs to spaces 2017-10-05 10:42:43 +02:00
Ted John 02b77af646 More styling fixes 2017-10-05 10:42:43 +02:00
Ted John ac1e889014 Tabs to spaces 2017-10-05 10:42:43 +02:00
Ted John 675b1b8cf4 Do style fixes 2017-10-05 10:42:43 +02:00
Ted John b068331db2 Move contents of IGameAction.h into GameAction.h 2017-10-05 10:42:43 +02:00
Ted John 84f55c75aa Revert change to libopenrct2.vcxproj 2017-10-05 10:42:43 +02:00
ZehMatt 072ecadd48 Fix leaking memory creating game actions. 
Specialized class use for game action results.
 2017-10-05 10:42:43 +02:00
ZehMatt 97504b45ae Add network stubs for no network builds. 2017-10-05 10:42:43 +02:00
ZehMatt 5283804b37 Remove unnecessary type conversation. 
Add override attributes.
Changed GameActionResult data storage to union, happy compilers.
 2017-10-05 10:42:43 +02:00
ZehMatt c73665a003 Add deprecation warnings in old game_command functions. 
Removed line that didn't belong there.
 2017-10-05 10:42:43 +02:00
ZehMatt 22750a95e4 Fix using rct_xy8 incorrect. 2017-10-05 10:42:43 +02:00
ZehM4tt f29dc3ff34 Fixed base class serialise not being called. 
Implemented RideSetStatus game action.
 2017-10-05 10:42:43 +02:00
ZehM4tt 3657122b3b Moved ride create command to new game action system. 2017-10-05 10:42:43 +02:00
ZehM4tt fbd793083c Put action files in headers instead of cpps. 
Added callbacks for GameActions and network support for them.
Refactored GameAction registration due static library issues.
Moved all C functions into a single file.
 2017-10-05 10:42:43 +02:00
ZehM4tt 1b2a61c6ba Separated out byte swapping into its own header. 
Simplified data serialisation of game actions.
Moved the flags away from parameters.
GameAction base now serialises mandatory data such as flags and player.
Split some functions from network in order to move command processing to the end of tick.
 2017-10-05 10:42:43 +02:00
Michał Janiszewski 60e72e6dbc Mark GameAction methods as overriding 2017-10-05 10:42:43 +02:00
Michał Janiszewski 2aa7924b30 Add required virtual destructor to IGameAction 2017-10-05 10:42:43 +02:00
ZehM4tt f20a6863cd Simplified registration of game actions and avoid duplicate code. 2017-10-05 10:42:43 +02:00
duncanspumpkin 149a854c51 Make changes to match @ZehMatt code 2017-10-05 10:42:39 +02:00
duncanspumpkin a7d1cbee9e Add deep copy to GameCommand 2017-10-05 10:42:39 +02:00
Michał Janiszewski 634683d891 Mark GameActions::Register as static 2017-10-05 10:42:39 +02:00
duncanspumpkin fd00096b3b Fix tabs spaces 2017-10-05 10:42:39 +02:00
duncanspumpkin 205a1c9e12 Depreciate game command. Fix error messages 2017-10-05 10:42:39 +02:00
Michał Janiszewski 5103113740 Mark Factory variables as maybe_unused 2017-10-05 10:42:38 +02:00
duncanspumpkin 1d3076a2af Initial attempt at getting place entrance into game action 2017-10-05 10:42:38 +02:00
duncanspumpkin 8adcbd6e35 Fix warning 2017-10-05 10:42:38 +02:00
duncanspumpkin feef3d98da Refactor packet handling 2017-10-05 10:42:38 +02:00
Duncan f8241b7bb0 Fix no network builds 2017-10-05 10:42:38 +02:00
duncanspumpkin df5ea16026 Change function declarations. Move network code into network 2017-10-05 10:42:38 +02:00
Ted John 8f362cef8c Fix spaces / tabs for network.h and network.cpp 2017-10-05 10:42:38 +02:00
Ted John fae45d6989 Fix warning 2017-10-05 10:42:38 +02:00
duncanspumpkin 254041985f Make servers work 2017-10-05 10:42:38 +02:00
duncanspumpkin ae24ded8bf Make client work 2017-10-05 10:42:38 +02:00
duncanspumpkin 351b0df76b Initial try at adding networking 2017-10-05 10:42:38 +02:00
duncanspumpkin e7c66bb208 Start adding network code 2017-10-05 10:42:38 +02:00
Ted John c483c319fc Make dummy global static 2017-10-05 10:42:38 +02:00
Ted John bb4a482bfc Start writing new game action execution 2017-10-05 10:42:38 +02:00
Ted John 33397005b0 Add tag and flags to game action 2017-10-05 10:42:38 +02:00
Ted John c89a00badd Write initial new game action infrastructure 2017-10-05 10:42:38 +02:00
Olivier Wervers a75d727685 Implement #5826: Add command to show map data counts and limits 2017-10-05 10:00:32 +02:00
ZehMatt 5aa8ae5c6e Fix viewport coordinates being set too late. 
Fix headless always sending 0,0 viewport coordinates.
 2017-10-05 09:57:08 +02:00
Jeroen D Stout e2523a3d8d Make sprite export start at 0 to correspond with in-game sprite id 2017-10-04 19:49:25 +02:00
Michael Steenbeek 05b274a239 Fix #5609: Vehicle switching may cause '0 cars per train' to be set 2017-10-04 19:42:44 +02:00
Michael Steenbeek 055ecccf36 Clean up more track flags 2017-10-04 17:14:53 +02:00
Olivier Wervers d47f758b0e Fix #6118, #6245, #6366: Tracked animated vehicles not animating 2017-10-04 14:51:48 +02:00
Tyler Ruckinger d33803b5d0 Ensure title sequence user data path exists 2017-10-03 09:32:11 +02:00
Gymnasiast e6faf6b7c4 Fix #6201, #6250: custom RCT1 scenarios cause empty scenario list entry 
The scenario repository did not correctly handle custom RCT1 scenarios.
They were not listed, but if they existed, an empty entry would appear in the scenario list.
This fixes both issues, and also prints a warning message, should this ever happen again.
 2017-10-03 07:48:02 +02:00
ZehMatt 5f076e8103 Compile paint code as cpp. 
Style fixes.
 2017-10-02 21:42:11 +02:00