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
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
Michael Steenbeek
0fb5f186ee
Do not hardcode music length
2017-10-02 21:40:49 +02:00
Olivier Wervers
45944cb037
Fix #6202 : Avoid breaking occupied benches
2017-10-02 17:18:51 +02:00
Michael Steenbeek
ccefc98491
RCT1 theme: make Options and Shortcut windows brown
2017-10-02 11:45:28 +02:00
LRFLEW
11cdcea72b
Fix RCTC g1.dat rendering issues
2017-09-30 19:18:31 -05:00
Olivier Wervers
1de4b2650b
Fix #6229 : Scenery costs nothing in track designs
2017-09-30 00:11:14 +02:00
Michael Steenbeek
0c4d184a9a
Use constants for map elements and the scenery window
2017-09-29 20:25:17 +02:00
Olivier Wervers
f2c9fc58d5
Implement #1329 : Add remove-unused-objects command ( #6324 )
2017-09-29 16:32:30 +02:00
LRFLEW
e177811115
Add RCTC g1.dat support
2017-09-29 10:44:23 +02:00
Michael Steenbeek
b2968ce8b0
Fix #6320 : Crash when CSS1.DAT is absent
2017-09-29 10:43:47 +02:00
Michael Steenbeek
eea40edf0a
Use more constants
2017-09-29 10:06:05 +02:00
Michał Janiszewski
5ab9f938a7
Update files missed in the great extern "C" cleanup of 2017
2017-09-28 23:29:16 +02:00
Gymnasiast
6c9e73bff2
Allow loading objects from RCTC
...
These are technically same as those from RCT2, but with a .POB extension, rather than .DAT
2017-09-28 21:42:58 +02:00
Jeroen D Stout
71317c5f7a
Adapt to coding convention
2017-09-28 17:37:48 +02:00
Jeroen D Stout
35b9038807
Refactor adjacency distance constant + loop fix
2017-09-28 17:37:48 +02:00
Jeroen D Stout
3b7ec7daa1
Alllow check_for_adjacent_station to check farther
2017-09-28 17:37:48 +02:00
Jeroen D Stout
a6993bdb9f
Introduce constant for max adjacency distance
2017-09-28 17:37:48 +02:00
Jeroen D Stout
202bea59c8
Increased network stream version
2017-09-28 17:37:48 +02:00
Jeroen D Stout
b032aaacac
Deal with map size / multiple stations
2017-09-28 17:37:48 +02:00
Jeroen D Stout
015d95749c
Increase ride synchronisation range
2017-09-28 17:37:48 +02:00
Michael Steenbeek
950ab0062f
Unify "separate ride" and "separate ride name" flags
...
They're always set together, and only setting one will probably cause undefined behaviour. Deprecate the "separate ride name" flag and instead check the "separate ride" flag in all places.
2017-09-28 17:37:07 +02:00
Michael Steenbeek
289e154fe4
Fix #6315 : Not all researched items in S4 are available
2017-09-28 16:24:44 +02:00
ZehMatt
5187946bc9
Fix #6309 : Lightfx being enabled with incompatible drawing engine.
2017-09-28 08:01:25 +02:00
TELK
40b026a4f1
Switch to utf8_remove_formatting() in Twitch integration to support non-latin characters
2017-09-26 15:54:24 +02:00
Martin Müller
e38a77da2a
Set gScenarioFileName when loading an RCT1 park
...
This fixes bugs when completing an RCT1 scenario, where the highscore
would be saved for the wrong park because gScenarioFileName hasn't been updated on load.
2017-09-26 15:53:06 +02:00
ZehMatt
c238265834
Minor performance improvements
2017-09-26 15:52:04 +02:00
Marijn van der Werf
09517caa88
Fix #6300 : Saving track triggers assertion
2017-09-25 22:14:50 +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
8a47308786
Check whether intent data is set before accessing
2017-09-24 22:41:49 +02:00
Marijn van der Werf
efa87bf931
Try different opaque pointer
2017-09-24 22:41:49 +02:00
Marijn van der Werf
9d80f7efed
Apply recommended fixes
2017-09-24 22:41:49 +02:00
Marijn van der Werf
7795ec35dd
Add assertions to Intent
2017-09-24 22:41:49 +02:00
Marijn van der Werf
11787d4ce4
Allow opening guest list
2017-09-24 22:41:49 +02:00
Marijn van der Werf
34ee3df318
Refactor intent
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
227ee1f914
Add logging for missing window handling
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
162eea0924
[fixup] Cast pointer
2017-09-24 22:41:49 +02:00
Marijn van der Werf
7ede9a3f58
Add extra casts
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
59e1a8ac25
Trying to use intents
2017-09-24 22:41:49 +02:00
Marijn van der Werf
700a82e200
Make more data and functions static
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
Michał Janiszewski
cbeeea2a49
Remove workaround for mingw
...
We have udapted MinGW-64 in use, so the workaround should not be needed
anymore
2017-09-22 23:26:02 +02:00
Michael Steenbeek
1fd1d8c26b
Move editor to C++; add defines for object limits
2017-09-22 07:56:24 +02:00
Michael Steenbeek
5c2870c0e0
Name RCT2_LANGUAGE_ID_8 (Japanese)
2017-09-21 10:34:31 +02:00
Michael Steenbeek
c8d6cf12e3
Add experimental Arabic language support
2017-09-21 09:24:06 +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
6ab0f2f905
Name some rct_ride_entry_vehicle properties
2017-09-15 18:25:28 +02:00
Michael Steenbeek
c4a89e4192
Merge pull request #6269 from Gymnasiast/small-cleanup
...
Slightly refactor loading of vehicle entries
2017-09-14 15:17:04 +02:00
Michael Steenbeek
a4802983c2
Make var_02/_03 calculation methods private and static
2017-09-14 14:30:09 +02:00
Michael Steenbeek
4164d3aedd
Clarify comment
...
[ci skip]
2017-09-14 14:12:13 +02:00
Michael Steenbeek
8954303d99
Add comment about special_frames
...
[ci skip]
2017-09-14 14:10:35 +02:00
Michael Steenbeek
9cba5436e5
Split off frame calculations; don't set var_02 and _03
2017-09-14 14:07:55 +02:00
Michael Steenbeek
98e15f1cd9
Rewrite confusing if statement
2017-09-14 13:48:14 +02:00
Michael Steenbeek
735b96ac18
Bump network version for the 'Enable all drawable elements' cheat
2017-09-13 22:51:01 +02:00
Michael Steenbeek
d4cc97165c
Clean up brake speed in ride construction window, fix #6271
2017-09-13 21:57:36 +02:00
Ted John
8677793624
Fix #6267 : Ride count is 255 for clients that join a server
...
For S6 export and import, unused ride slots were not set to RIDE_TYPE_NULL.
2017-09-13 20:04:55 +01:00
Michael Steenbeek
597d40b25b
Add cheat to show all drawable track elements
2017-09-13 19:38:30 +02:00
Michael Steenbeek
671a7bcbe1
Improve and extend constant usage
2017-09-13 18:13:38 +02:00
Michael Steenbeek
8c33240c38
Slightly refactor loading of vehicle entries
2017-09-13 10:45:28 +02:00
Marijn van der Werf
dfbce1ad4c
Fix Cmake compilation on macOS 10.12.6
2017-09-12 21:19:56 +02:00
Ted John
3a9cafd2f0
Remove gTrackColours macro ( #6266 )
2017-09-12 19:48:18 +01:00
Gymnasiast
f174530ace
Add comment to the Ride struct about Testpaint
...
[ci skip]
2017-09-12 14:03:46 +02:00
Gymnasiast
3a65ef79a7
Use field-wise assignments for rides in S6Exporter
...
Also fixes some limit constant usage
2017-09-12 14:00:56 +02:00
Gymnasiast
654ee4c95e
Add missing pragma pack(pop)
2017-09-12 11:42:47 +02:00
Gymnasiast
a28509e24c
Split Ride and rct2_ride
2017-09-12 11:16:57 +02:00
Gymnasiast
179e4dd368
Do not disable ride modes in select-by-track-type mode
...
The idea of a ride group is to have the ride group determine stuff like this, not the vehicle itself
2017-09-12 10:40:19 +02:00
wolfreak99
e1f40352b6
Fix various currently loaded map marker issues
...
* create gCurrentLoadedPath for Load/Save dialog
* Clear gCurrentLoadedPath upon quitting game/loading titlescreen
* Mark loaded landscapes in load dialog
2017-09-12 08:09:54 +02:00
Gymnasiast
74961118bb
Add drawing routines for inverted helices on the Lay-down RC, fixes #4991
2017-09-11 21:05:40 +02:00
Chris Guillott
5944d5be4d
remove redundant line
2017-09-10 21:21:49 +02:00
Chris Guillott
5991c25919
trap getaddrinfo return codes
2017-09-10 21:21:49 +02:00
muemart
e5bfd241ea
Import staff patrol areas from RCT1 save files and fix #5445
2017-09-10 12:54:57 +02:00
Michał Janiszewski
45de7ebd22
Remove superfluous argument
2017-09-08 11:57:24 +02:00
Michał Janiszewski
a8ba58ab9a
Update wrong method name
2017-09-08 11:57:24 +02:00
Ted John
1eb3d07b3d
Reduce static access and call from anonymous function
2017-09-08 11:57:24 +02:00
Michał Janiszewski
100a63a743
Pass context object as argument, don't use singleton
2017-09-08 11:57:24 +02:00
Michał Janiszewski
23ec1d29e7
Don't report elevated process on Emscripten
2017-09-08 11:57:24 +02:00
Michał Janiszewski
56ab344603
Add Emscripten platform and architecture defines
2017-09-08 11:57:24 +02:00
Michał Janiszewski
7a0a344014
Don't use unavailable fts.h for Emscripten
2017-09-08 11:57:24 +02:00
Michał Janiszewski
2577e92860
Adapt Context to Emscripten
2017-09-08 11:57:24 +02:00
Michał Janiszewski
5b0636cf0d
Adapt Linux UiContext to Emscripten
2017-09-08 11:57:24 +02:00
Michał Janiszewski
a13c30795d
Add fcntl.h include to POSIX platform
...
Required for `open()`, etc.
2017-09-03 14:48:50 +02:00
Michał Janiszewski
5d3c58611a
Report path of failed directory creation
2017-09-03 14:48:50 +02:00
Ted John
11d0639d5e
Merge pull request #6244 from IntelOrca/paint/use-paint-session-tracks
...
Pass paint session to remaining functions
2017-09-03 10:19:18 +01:00
Duncan
04e217a04c
Remove unused global palette pointer ( #6247 )
...
Moved one use of the palette pointer into a parameter
2017-09-03 10:16:51 +01:00
Ted John
43c6f7fda0
Pass paint session to ps functions
2017-09-03 02:27:07 +01:00
Ted John
f6dbf560a2
Pass paint session to ps rotated helpers
2017-09-03 02:18:01 +01:00
Ted John
3880134b40
Change gTrackColours to use session
2017-09-03 02:01:29 +01:00
Ted John
f2b8cf181e
Pass paint session to remaining support functions
2017-09-03 01:56:56 +01:00
Ted John
1cc82d1cb5
Pass paint session to tunnel functions
2017-09-03 01:51:59 +01:00
Ted John
972a3bf111
Pass paint session to track_paint helpers
2017-09-03 01:42:08 +01:00
Ted John
dce007feaa
Pass paint session to support functions
2017-09-03 01:04:23 +01:00
Ted John
0f9784a423
Pass paint session to many specific track helpers
2017-09-03 00:34:33 +01:00
Ted John
90f4478f48
Pass paint session to all track functions
2017-09-03 00:19:17 +01:00
Ted John
f81ee49015
Pass paint session to remaining non-track called functions
2017-09-02 23:41:02 +01:00
Ted John
2980be0667
Pass paint session to more ps functions
2017-09-02 23:22:19 +01:00
Ted John
ae6c820662
Pass paint session to all vehicle paint functions
2017-09-02 23:13:10 +01:00
Ted John
6a9cd63874
Pass paint session to some vehicle paint functions
2017-09-02 23:05:58 +01:00
Ted John
3b9a86500a
Pass paint session to sprite_paint_setup
2017-09-02 22:56:15 +01:00
Ted John
a60a33e665
Pass paint session to track_paint
2017-09-02 22:47:07 +01:00
Ted John
6b3f3ddb70
Pass paint session to scenery_paint
2017-09-02 22:44:39 +01:00
Ted John
8456639b47
Pass paint session to entrance_paint
2017-09-02 22:43:45 +01:00
Ted John
1f6f83163a
Pass paint session to fence_paint
2017-09-02 22:41:36 +01:00
Ted John
00cde34b39
Pass paint session to scenery_multiple_paint
2017-09-02 22:40:19 +01:00
Ted John
5c8700d054
Pass paint session to banner_paint
2017-09-02 22:38:26 +01:00
Ted John
4c78827c45
Pass paint session to path_paint
2017-09-02 22:31:39 +01:00
Ted John
47521335fa
Pass paint session to surface_paint
2017-09-02 22:25:45 +01:00
Ted John
f9414d1d82
Pass paint session to viewport functions
2017-09-02 22:15:09 +01:00