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
Paul f202f19897
Update posix.c 2017-11-06 19:49:02 -08:00
Paul 62383f7cb5
fix indentation 2017-11-06 14:58:06 -08:00
Paul 8093b6369b
replace flock with fnctl for better compatibility 2017-11-06 14:53:59 -08:00
Philip Goto 19abb62586 Add Smooth NN scaling to OpenGL renderer 2017-11-06 23:05:21 +01:00
Philip Goto 360cd813b7 include cmath in HardwareDisplayDrawingEngine 2017-11-06 23:05:21 +01:00
Philip Goto 4dfcb32d85 Fix spelling errors in neighbour 2017-11-06 23:05:21 +01:00
Philip Goto 36bece4cf1 Destroy _scaledScreenTexture on destroying hardware engine 2017-11-06 23:05:21 +01:00
Philip Goto 6377ac7bfb Create enum for scale quality 2017-11-06 23:05:21 +01:00
Philip Goto b66df2d6db Add smooth nearest neighbor scaling 
This commit implements smooth nearest neighbor scaling, this scaling method looks sharper than linear scaling and not deformed like NN scaling.
 2017-11-06 23:05:21 +01:00
Michał Janiszewski 9bc9e20778 Stub interop for NO_RCT2 builds 2017-11-06 22:05:36 +01:00
ceeac a2ca87bde0 Fix failing link on Ubuntu due to missing libiconv 2017-11-06 21:53:36 +01:00
duncanspumpkin 7a099d90ce Rename ratings bonuses and name unknown bonuses 2017-11-06 12:19:34 +01:00
Michał Janiszewski 6bb4bdeda2 Minor formatting changes 2017-11-05 23:19:25 +01:00
Michał Janiszewski ce9e6e0d85 Allow for bit depth inspection when reading PNGs 2017-11-05 23:19:25 +01:00
Jeroen D Stout c7b829029c Correctly treat 1st index as transparent 2017-11-05 23:19:25 +01:00
Jeroen D Stout b1792658c8 Add "palette": "keep" option to import with an already correct palette 2017-11-05 23:19:25 +01:00
Jeroen D Stout 71cfe112f1 Make map generation automatically import expanded pngs 2017-11-05 23:19:25 +01:00
Jeroen D Stout 25015fb15d Add expand option to PngRead 2017-11-05 23:19:25 +01:00
Ted John eb98bfaa31 Log invalid g2 access 2017-11-05 21:17:35 +00:00
Ted John 48d1930a6c NULL -> nullptr 2017-11-05 21:12:46 +00:00
Ted John 498857a95d Do not bother backing up SPR_TEMP 2017-11-05 21:10:27 +00:00
Martin Müller 7089ec80fc Fix highscores for savegames 
When loading a savegame, its filename gets stored as gScenarioFileName.
However, that isn't necessarily the same name as the filename of the
corresponding scenario (or any, for that matter, due to the different
file extension). This broke highscores, so for savegames we have to
take the scenario filename stored in the file.
 2017-11-05 12:25:40 +01:00
Ted John 4a66e98bb5 Add more null checks to get element functions 2017-11-04 18:06:59 +00:00
Ted John 6341a1679c Fix #6618: Crash when loading Covey Cove 
Add null check for map_get_first_element_at in map_get_park_entrance_element_at
 2017-11-04 18:04:16 +00:00
Ted John 446f57e43b Fix NO-RCT2 builds 2017-11-03 22:24:04 +00:00
Ted John 4232be9fc2 Remove remaining external uses of g1element 2017-11-03 22:18:10 +00:00
Ted John 444a8c1602 Const protect get_g1_element 2017-11-03 22:18:10 +00:00
Ted John 5a05bd51e5 Use get_g1_element and add null checks 2017-11-03 22:18:10 +00:00
Robert Jordan 8da1cad3ab Enhance: Change title editor default selection 
Title editor sequence selection now defaults to current preset. This is
only after the first time the window is opened. Afterwards it keeps the
last selection.
 2017-11-03 21:34:37 +01:00
Robert Jordan a01471b535 Enhance #6530: Don't block land rights tool 
Land rights tool no longer cares if part of the available land is
unavailable for purchase. It will not even through an error when none of
the tiles are available. Just like other tools.

Added a changelog entry.

This increments the network version.
 2017-11-03 19:21:58 +01:00
Robert Jordan f4538c6557 Fix: Realign Park Viewport 
The viewport had a 1x1 spacing before the bottom right border was
reached.
 2017-11-03 07:53:25 +01:00
Marijn van der Werf 45b75692d9 Fix code style 2017-11-03 01:54:37 +01:00
Marijn van der Werf bbe46cb583 Sort affected includes 2017-11-03 01:54:37 +01:00
Marijn van der Werf 666809fb8b Move object load error window to UI module 2017-11-03 01:54:37 +01:00
Marijn van der Werf 59df233669 Move text input window to UI module 2017-11-03 01:54:37 +01:00
Marijn van der Werf de6b3b4ebf Sort includes in Guest.cpp 2017-11-03 01:54:37 +01:00
Marijn van der Werf 4a4f9648a7 Move network status window to UI module 2017-11-03 01:54:37 +01:00
Marijn van der Werf b85f9c3f68 Move maze construction window to UI module 2017-11-03 01:54:37 +01:00
Marijn van der Werf 1e335308cc Move map tooltip to ui module 2017-11-03 01:54:37 +01:00
Marijn van der Werf ee6c3cfc56 Move track design list window to UI module 2017-11-03 01:54:37 +01:00
Marijn van der Werf 61255e25a7 Move Ride window to UI module 2017-11-03 01:54:37 +01:00
Marijn van der Werf 427d639e69 Improve title screen options button appearance 2017-11-02 22:57:00 +01:00
Martin Müller 8422556bc1 Fix #6566 and #6573: Highscores don't get saved 
For some RCT2 parks the scenario name in the sv6 file is wrong, so take the real filename.
 2017-11-02 19:31:01 +01:00
Robert Jordan d79d2a7503 Fix numerous title sequence editor bugs 
* Change how current title sequence is handled. It can either be
previewing a title sequence, or playing the preset.
* LoadMM and LoadRCT1 now save when script is saved.
* No more infinite failing to load loops.
* No more crashing when attempting to display "no save selected" in
title editor.
* Title editor now gracefully fails to preview a title sequence and lets
the user know with a context error.
* When preset title sequence fails to load, the preset will forcibly be
changed to the first sequence to successfully load.

Added changelog entries for last two items.
 2017-11-02 18:36:37 +01:00
Michael Steenbeek 0b3da4b209 Create constants for music tunes 2017-11-02 17:31:31 +01:00
Christian F. Coors 06afeeda9a Apply some refactoring 2017-11-02 12:22:28 +01:00
Michael Steenbeek 386a399a51
Fix #6593: Can't hire entertainers when default scenery groups are deselected 2017-11-02 11:10:26 +01:00
Robert Jordan 88b487309d Refactor: Title Editor new lines 
[ci skip]
 2017-11-01 22:42:58 +00:00
Robert Jordan 9917a24a58 Remove < 0 check for size_t 2017-11-01 22:42:58 +00:00
Robert Jordan b715d83bfd Add missing size_t cast 2017-11-01 22:42:58 +00:00
Robert Jordan 61accf6e02 Fix another missing instance of size_t 2017-11-01 22:42:58 +00:00
Robert Jordan 0698154ba1 Refactor: Title sequences and switch to size_t 2017-11-01 22:42:58 +00:00
Michael Steenbeek 3d8ec4e393 Warn when loading incompatible RCTC saves 2017-11-01 20:23:06 +01:00
Robert Jordan 9425ed1aee Implement #6307: Display arrow on park entrance placement 2017-11-01 18:14:01 +01:00
rwjuk 3125956b77 Fix off-by-one error in placement of centred text 2017-10-31 21:04:42 +01:00
Michael Steenbeek af845beb61 Replace mapElement with tileElement 2017-10-31 19:59:06 +01:00
Michael Steenbeek ce8d9cc71b Rename map_element to tile_element 2017-10-31 19:59:06 +01:00
Michał Janiszewski fb74d12f31 Fix NULL checks in facility_paint_setup 2017-10-30 22:55:12 +01:00
Michał Janiszewski b12dad5bd9 Remove duplicate assignment in S4Importer.cpp 2017-10-30 22:51:35 +01:00
Michał Janiszewski ed5b655b09 Fix StringTable::Sort comparator 
Previously, it explicitly compared to -1, while _strcmpi can return
all integers.
 2017-10-30 22:46:57 +01:00
Michał Janiszewski 4d0a8143bc Remove redundant check in peep_update_answering 
The field `mechanic_status` is verified to be RIDE_MECHANIC_STATUS_HEADING
when entering the function
 2017-10-30 22:18:17 +01:00
Michał Janiszewski c7c0c15abf Update formatting for recent changes 2017-10-30 16:45:16 +01:00
Michał Janiszewski d3a30132a8 Fix check order that did not function properly 
The checks were done in https://github.com/OpenRCT2/OpenRCT2/pull/6576
but probably due to me later rearranging things, I got them wrong.
 2017-10-30 16:45:16 +01:00
Aaron van Geffen 765e3d9a4f Remove unnecessary ceil call 2017-10-30 16:31:03 +01:00
Michał Janiszewski 076be24bb9 Default-initialise fields in DrawRectShader 2017-10-30 16:21:49 +01:00
LRFLEW 778cb9d024 Rename CopyFramebufferShader to ApplyPaletteShader 2017-10-30 16:21:49 +01:00
LRFLEW 50600f6195 Move MaxTransparencyDepth 2017-10-30 16:21:49 +01:00
LRFLEW 7db8d0f00a OpenGL: Fix linear DPI scaling 2017-10-30 16:21:49 +01:00
LRFLEW aac1c59714 OpenGL: Add multi-pass transparency 2017-10-30 16:21:49 +01:00
LRFLEW d3d41ea724 OpenGL: Add single-pass transparency 2017-10-30 16:21:49 +01:00
LRFLEW 3d2d99817c OpenGL: Add Depth Buffer and Depth Test 2017-10-30 16:21:49 +01:00
LRFLEW 6bf2e0157b OpenGL: Improve Shaders 2017-10-30 16:21:49 +01:00
LRFLEW f105237a2e OpenGL: Delay Palette Mapping Until Final Framebuffer Copy to Screen 2017-10-30 16:21:49 +01:00
duncanspumpkin 85b257cc2e Fix #6503. GameActions correctly recorded. 
Mistake made during GameActions refactor.
 2017-10-30 12:09:40 +01:00
duncanspumpkin b96657c0cd Fix #6478. Rides can no longer be destroyed during pause mode. 
Mistake made during refactoring into GameAction
 2017-10-30 12:09:40 +01:00
Robert Jordan a3c64bb146 Feature: Preview title sequences in-game 
Title sequences can now be played back in-game, allowing for much easier
editing.

Improved title sequence playback in general. Clicking play while on a
different title sequence will play the new one. Clicking stop will make
the title screen go back to the config title sequence. And the closing
the title sequence window will also make the game go back to the config
title sequence, and reload the sequence if it was modified.

Changes made to title sequences in-game are now correctly loaded in the
title screen.

Starting a title sequence within the editor will now always reset it
even if it's the current playing sequence. (Not for playing in the
editor though).

Get Location in title sequence command editor now has 100% accuracy
compared to before
where it would usually get some offset value.

Added `get_map_coordinates_from_pos_window` which will allow getting the
viewport coordinates of a specific window even if the input coordinates
are under another window. This has use with getting 2D positions from
the main window without the other windows getting in the way.

Options window will now always specify the config title sequence in the
dropdown and not the current title sequence.

Made a global variable `gLoadKeepWindowsOpen`, in game.h to keep windows
open when loading a park. When loading a title sequence park in-game.
The sequence player will force-close all park-specific windows ahead of
time.

Skipping while testing title sequences no longer needs to reload the
park if the current playback position is already before the target
position and ahead of the load position.

Added changelog entry.
 2017-10-30 12:07:01 +01:00
Aaron van Geffen dd4f5ff93b Use 'STHeiti' for Chinese (Simplified) on macOS. 2017-10-30 12:06:05 +01:00
Aaron van Geffen 9cb25e6106 Use 'LiHei Pro' for Chinese (Traditional) on macOS. 2017-10-30 12:06:05 +01:00
Aaron van Geffen b393ce3f11 Introduce 'Nanum' as a macOS alternative for Gulim when using Korean. 2017-10-30 12:06:05 +01:00
Aaron van Geffen 744341af07 Introduce 'Arial Unicode MS' as a more compatible alternative to regular Arial. 2017-10-30 12:06:05 +01:00
Aaron van Geffen 58add28604 Introduce 'Hiragino Maru Gothic' for Japanese on macOS. 2017-10-30 12:06:05 +01:00
Aaron van Geffen 8c8a2317f6 Initial prototype for font families. 2017-10-30 12:06:05 +01:00
Michał Janiszewski 9815df5e04 Remove redundant checks for group 
It is enough to just check it once
 2017-10-30 12:04:23 +01:00
Michał Janiszewski 75685fa75d Fix #3781: Glitchy map causing crash 2017-10-30 12:03:34 +01:00
Michał Janiszewski 216836cd12 Remove unnecessary condition 
It is impossible for two positive integers, each <= 0x7fff, to form a
sum larger than 0xffff
 2017-10-30 10:53:28 +01:00
Gymnasiast bc3b579b92 Fix import of RCT1's inverted coaster train 2017-10-28 19:02:58 +02:00
Aaron van Geffen 25d5ff729a Increase padding and fix button alignment for load/save window 2017-10-28 09:32:31 +02:00
Michael Steenbeek 5035492f8c Fix #6535: Donut shop renders black spots that should be white 
Issue caused by a regression that also broke #1749 (rainbow path) and the pause button.
Reinstated the fix from 599c259603.
 2017-10-27 12:07:52 +02:00
Cody Jung cc82fceaef Fix #6199: Inverted hairpin coaster vehicle tab has vehicle too low 2017-10-27 11:25:18 +02:00
Ted John 017eb4df72 Refactor date update and checks to new functions 2017-10-27 11:23:10 +02:00
Robbin Voortman f0b8559341 Lower game actions verbosity 2017-10-27 11:14:37 +02:00
Aaron van Geffen f1c69ac4f7 Take font line height into account in News window. 2017-10-27 11:11:43 +02:00
Aaron van Geffen a058b39b90 Add extra padding to options in News Options screen. 2017-10-27 11:11:43 +02:00
Michał Janiszewski 27f2198cb5 Properly declare track data in C++ 2017-10-25 23:53:47 +02:00
Michał Janiszewski a70a1bc523 Compile track_data_old as C++ 2017-10-25 23:53:47 +02:00
Michał Janiszewski 2b505926c4 Format TrackData.h 2017-10-25 23:53:47 +02:00
Michał Janiszewski 90a14205c8 Compile track_data.c as C++ 2017-10-25 23:53:47 +02:00
Michael Steenbeek b232bdf3a3 Make some variables const 2017-10-25 23:13:54 +02:00
Michael Steenbeek 17fdf1511f Clear entrance/exit location if no entrance or exit is found 2017-10-25 23:13:54 +02:00
Michael Steenbeek e3b0409fbc Also fix disconnected exits 2017-10-25 23:13:54 +02:00
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