Michael Steenbeek
bf69b2e682
Make terminology use more consistent
2017-11-20 11:20:04 +01:00
Ted John
38024bbd0d
Merge pull request #6699 from IntelOrca/refactor/available-entertainers
...
Refactor entertainer invented logic
2017-11-19 23:46:54 +00:00
Michael Steenbeek
e3ab7e723d
Fix #6701 : assertion on string ID -2 and name it
2017-11-19 22:22:04 +01:00
Ted John
110730015b
Rename scenery set to scenery group
2017-11-19 20:40:55 +00:00
Ted John
3251af4f30
Refactor entertainer invented logic
...
Remove hard dependency on scenery window by calling a new is scenery set invented function. I don't think this the performance is any worse as it called init_scenery anyway for every call to get_available_entertainers.
2017-11-19 16:06:10 +00:00
Michael Steenbeek
03299b9a64
Assert string number is not -2
2017-11-19 16:47:35 +01:00
Marijn van der Werf
67ebf40f83
Move main editor window to UI project
2017-11-18 21:07:21 +01:00
Marijn van der Werf
dceb403ca9
Move editor bottom toolbar to UI module
2017-11-18 21:07:21 +01:00
Marijn van der Werf
8b7322ad6e
Move bottom toolbar to UI module
2017-11-18 21:07:21 +01:00
Marijn van der Werf
3d7867791d
Move scenery window to UI module
2017-11-18 21:07:21 +01:00
platipo
789b47b7bb
Refactor slope flags and path type flag
2017-11-18 12:58:27 +01:00
Ted John
06cd6a958e
Fix #6274 : Demolishing launched freefall track piece removes entrance and exit
...
Regression caused by multiple refactor commits. Track type and sequence was being retrieved from the entrance element instead of the track element in sub_6CB945.
Also fixes #6690 .
2017-11-18 00:04:40 +00:00
Michael Steenbeek
81ee4793df
Fix #6688 : reverser elements not correctly registered
...
Issue caused by using tile_element_get_type() where track_element_get_type was intended.
2017-11-17 23:44:05 +01:00
Michael Steenbeek
8027af56b6
Fix multi-dim coasters freezing and crashing
2017-11-17 23:23:45 +01:00
Michael Steenbeek
bb483b0c5f
Replace direct access to large scenery colour with helper functions
2017-11-17 22:54:54 +01:00
Enrico Paganin
8ffe7d5b43
Refactor maze flags
2017-11-17 17:03:57 +01:00
Enrico Paganin
27b420374e
Refactor path flags
2017-11-17 17:03:57 +01:00
Enrico Paganin
c2bf44ab1b
Refactor scenery flags
...
Every SCENERY_GHOST_FLAG_X is connected with its respective
SCENERY_TYPE_xxx flag
2017-11-17 17:03:57 +01:00
Enrico Paganin
94bdfb0e43
Refactor marketing.h flag
2017-11-17 17:03:57 +01:00
Enrico Paganin
95e75c4575
Refactor colour.h flags
2017-11-17 17:03:57 +01:00
Michael Steenbeek
e23c10863e
Fix tile element type confusion
2017-11-17 14:20:49 +01:00
Michael Steenbeek
470c9993fa
Fix calling wrong function
2017-11-17 13:10:58 +01:00
Michael Steenbeek
3bd68947b9
Create functions for getting large scenery type and sequence
2017-11-17 12:56:08 +01:00
Michael Steenbeek
9a4021996f
Remove unnecessary comment
...
[ci skip]
2017-11-17 12:54:47 +01:00
Michael Steenbeek
e12de39407
Fix include
2017-11-17 12:54:47 +01:00
Michael Steenbeek
dd6257af1e
Tackle the two residual usages of the colour property
2017-11-17 12:54:47 +01:00
Michael Steenbeek
3cf8da184d
Create tile_element_get_ride_index()
2017-11-17 12:54:47 +01:00
Michael Steenbeek
60d5d5ca1e
Cleanup
2017-11-17 12:54:47 +01:00
Michael Steenbeek
f448d16707
Add methods for getting and setting track element type
2017-11-17 12:54:47 +01:00
Michael Steenbeek
953d6840f4
Fix some missed occurrences
2017-11-17 12:54:47 +01:00
Michael Steenbeek
ab3f42f1f9
Add getters and setters for ride index and maze entry
2017-11-17 12:54:47 +01:00
Michael Steenbeek
74209c7282
Move track tile element functions to Track.cpp
2017-11-17 12:54:47 +01:00
Aaron van Geffen
13f99e495e
Reduce console verbosity for TTF loading.
2017-11-17 10:31:26 +01:00
Michael Steenbeek
a292917e50
Compile mapgen.c as C++
2017-11-17 10:22:54 +01:00
TELK
d6131ed062
Fix #6547 : logging does not work if server contains CJK characters ( #6565 )
2017-11-16 23:02:37 +00:00
Mike Slone
aca7048377
Fix #6293 : Screenshot sound not played when the game is paused ( #6429 )
...
Stop all sounds when pausing the game, but allow new sounds to play.
This allows interface sounds to function while paused, which fixes #6293 .
2017-11-16 23:02:16 +00:00
Ted John
271f15328b
Merge pull request #6329 from JeroenDStout/railway-crossings-fix-clip
...
Fix railway/path clipping when on same height
2017-11-16 23:00:40 +00:00
Michał Janiszewski
63e246938f
Make sure PORTABLE option is honoured globally
2017-11-16 23:08:03 +01:00
Ted John
f36cffc98a
Fix running headless instances
...
colours_init_maps was not blocked when running in headless mode.
2017-11-16 21:53:34 +00:00
Ted John
d649a3e8b4
Merge pull request #6631 from sajattack/develop
...
replace flock with fcntl for better os compatibility
2017-11-16 20:28:24 +00:00
Ted John
f7c7a5bace
Fix build
2017-11-16 19:11:10 +00:00
Ted John
6b5ad0cf73
Fix alignment in sprites.h
2017-11-16 19:06:19 +00:00
Jeroen D Stout
deb37a8de8
Add missing 3-tile turn piece
2017-11-16 19:04:08 +00:00
Jeroen D Stout
0c1265aba3
Add sprites to sprite index
2017-11-16 19:04:08 +00:00
Jeroen D Stout
f8b4ee2602
Add gravel / grooved track painting behaviour to miniature railway
2017-11-16 19:04:08 +00:00
Jeroen D Stout
c6d548cc36
Increase bouding box z of peeps
2017-11-16 19:03:14 +00:00
Jeroen D Stout
b207826e56
Increase bounding box z of litter
2017-11-16 19:03:14 +00:00
Jeroen D Stout
afab2bd51f
Change path bounding box when intersecting with track
2017-11-16 19:03:14 +00:00
Jeroen D Stout
3410330bb2
Add paint session memory for tracks and paths
2017-11-16 19:02:28 +00:00
Ted John
b5137b0e37
Merge pull request #6574 from IntelOrca/protect-g1-access
...
Refactor g1 access
2017-11-16 18:51:32 +00:00
Michał Janiszewski
8ec5f3ae82
Move FORCE32 option to top-level CMakeLists.txt
2017-11-15 22:32:51 +01:00
Michał Janiszewski
8f3434d084
Add discord-rpc support to Linux
2017-11-15 22:32:51 +01:00
Christian F. Coors
58e8ef5de4
Fix build in clang
2017-11-14 21:01:11 +01:00
Michael Steenbeek
5409dedb7e
Remove unused C transfer functions in Tables.cpp
2017-11-14 11:55:53 +01:00
Michael Steenbeek
a663ab6cd2
Add extra NULL checks
2017-11-13 21:14:39 +01:00
Michael Steenbeek
2ebac91a2e
Add method to look up source game
2017-11-13 21:14:39 +01:00
Michael Steenbeek
11f2d60041
Automatically add all path bits and signs to the designated group
2017-11-13 21:14:39 +01:00
Michael Steenbeek
8d7d53de29
Correct Steel twister capacity
2017-11-13 20:37:13 +01:00
Michael Steenbeek
f073ec33fa
Fix #6646 : Max cars/train increase for RCT1 parity
2017-11-13 17:37:39 +01:00
Michael Steenbeek
c95a9e4c9b
Fix typo in 'separator'
2017-11-13 16:25:31 +01:00
Michael Steenbeek
9d686db86c
Fix typo in 'tolerance'
2017-11-13 16:23:19 +01:00
Michael Steenbeek
5eed8cecd4
Fix typo in 'multiplier'
2017-11-13 16:22:36 +01:00
Cody Jung
3bb9d41908
Fix #6657 : Reset tracking icon status when opening guest list
...
The guest tracking icon is hidden on the guest list if it's in
PAGE_SUMMARISED mode. Closing then reopening the window reset it back to
INDIVIDUAL mode but did not restore the icon state.
2017-11-13 10:36:16 +01:00
Michał Janiszewski
7f6471e896
Collapse identical branches
2017-11-13 10:31:48 +01:00
Michael Steenbeek
263b7537d7
Fix crash when removing scenery groups
2017-11-13 10:30:34 +01:00
Ted John
3fbdf117cd
Merge pull request #6651 from IntelOrca/discord-integration
...
Close #6639 : Integrate Discord Rich Presence
2017-11-12 21:09:28 +00:00
Ted John
36ffb1d3cb
Use initialiser instead of memset zero
2017-11-12 20:31:29 +00:00
kitsunenokenja
04f0048430
Add missing header include for std::ceil call ( #6655 )
...
OpenGLDrawingEngine::ConfigureCanvas calls std::ceil which is defined by
the cmath include. Adding the include directive resolves a compilation
failure to due std::ceil being otherwise undefined.
2017-11-12 14:02:30 +00:00
Ted John
4722f0fe94
Make DiscordService final
2017-11-11 23:56:24 +00:00
Ted John
324058a640
Delay presence refresh to 5s interval
2017-11-11 23:48:04 +00:00
Ted John
83e80d9658
Implement basic discord status report
2017-11-11 23:48:04 +00:00
Marijn van der Werf
bd0bd9e038
Move top toolbar to UI module
2017-11-11 23:57:19 +01:00
Marijn van der Werf
c247bbcb82
Move ride construction window to UI module
2017-11-11 23:57:19 +01:00
Ted John
d3692dfb7a
Add Date class
...
To eventually replace passing around month ticks and date.c
2017-11-10 19:32:32 +01:00
Michał Janiszewski
2775f5f3e5
Guard title sequence in headless mode
2017-11-08 23:27:51 +01:00
Robert Jordan
4c3065619e
Fix #996 , #2254 , #2589 , #2875 : Viewport scrolling getting stuck or shaking
...
Shaking while at the edge of the map has been completely eliminated. In
order to do this, comparison with tile height was also removed which
fixed a few outlier cases.
The main cause was viewport axis were only being set if it's respective
isometric axis was at the boundary, instead of either isometric axis.
Viewport no longer gets stuck which was related to the shaking in the
end. (#2875 )
Refactored viewport_update_position. I moved
viewport_set_underground_flag above the bounds checking function since
it had no relation to it. (#996 , #2589 )
Scrolling on the map edge with arrow keys or mouse edge will now go the
same speed in both directions. (#2254 )
Added changelog entry.
2017-11-08 17:43:50 +01:00
duncanspumpkin
55aea7188b
Fix #6617 . Maze deletion no longer costs 0x800000 for certain mazes.
...
When a maze does not have a completely hollowed out hedge the game command would return 0x8000000 as it tries to remove an element that has already been deleted. As game actions no longer use 0x80000000 to indicate a failure this would get interpreted as the refund price and cause the issue.
Fix was to introduce checks when adding up the refund price. This was done rather than changing the game action so that it can be properly fixed when get_refund_price is converted into a game action
2017-11-08 16:03:41 +01:00
Michał Janiszewski
49dbdefe0f
Format shared.c
2017-11-08 08:45:05 +01:00
Michał Janiszewski
b69b0be610
Move strndup implementation to shared.c
2017-11-08 08:45:05 +01:00
Richard Jenkins
d6bd26cd83
Fix #5836 , #6301 : Track list freezes after deletion in Track Manager
2017-11-08 07:51:59 +01:00
Michał Janiszewski
cabed0cef5
Remove unused field
2017-11-08 06:53:17 +01:00
Robert Jordan
9ae4f7d1bc
Fix #6500 : Fail to load resources when no config
...
A simple fix of setting the environment paths before the repositories
are loaded.
Added a changelog entry
2017-11-07 21:03:58 +00:00
Paul
bf87489da8
make changes suggested in review
2017-11-07 00:15:22 -08:00
Paul
9325fffd9c
Update posix.c
2017-11-06 20:19:43 -08:00
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
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