Michael Steenbeek
e1eadff208
Formatting fixes
2017-12-05 09:10:28 +01:00
Michael Steenbeek
c9354a2c83
Fix alignment and loop variable declaration
2017-12-05 09:10:28 +01:00
Michael Steenbeek
ce0147b536
Fix signed/unsigned comparisons
2017-12-05 09:10:28 +01:00
Michael Steenbeek
00eb9bb949
Remove unused functions and undefined symbols from Game.cpp/h
2017-12-05 09:10:27 +01:00
Michael Steenbeek
67f64c35c5
Style fixes
2017-12-05 09:10:27 +01:00
Michael Steenbeek
4d1fc38f8d
Replace NULL with nullptr
2017-12-05 09:10:27 +01:00
Michael Steenbeek
e23bb8c243
Update formatting of Game.cpp and Game.h
2017-12-05 09:10:27 +01:00
Michael Steenbeek
60d8865efb
Compile game.c and game.h as C++
2017-12-05 09:10:27 +01:00
Ted John
3de8e0d37e
Merge pull request #6772 from IntelOrca/remove-rct2-interop-2
...
Remove RCT2 interop
2017-12-04 20:10:35 +00:00
Ted John
e879df31e8
Fix testpaint code issues
2017-12-04 19:49:12 +00:00
Michael Steenbeek
078c2d22c1
Make use of ride preview images clearer and more future-proof
2017-12-04 20:11:38 +01:00
Aaron van Geffen
db5b72c360
Fix #6782 : Steam overlay checkbox widget not displayed correctly.
2017-12-04 20:10:29 +01:00
Michael Steenbeek
407f1ad148
Create scenery_small_entry_has_flag()
2017-12-04 20:09:38 +01:00
Ted John
ebf43c2529
Fix testpaint
2017-12-04 19:04:07 +00:00
Ted John
99d7aaa2d6
Remove RCT2 interop
2017-12-04 19:04:06 +00:00
Michael Steenbeek
caab169968
Allow building on-ride photo segments on Splash Boats
2017-12-04 19:04:14 +01:00
Ted John
9b5b671673
Fix #6776 : Screenshots do not get stored in screenshot folder
2017-12-04 17:46:56 +00:00
Michael Steenbeek
b9a6382557
Remove unused tutorial and guest number strings
2017-12-04 11:27:37 +01:00
Michael Steenbeek
273edee634
Turn construction marker into a define
2017-12-04 11:26:53 +01:00
Aaron van Geffen
1ef73997b5
Removed interface to window limit setting.
2017-12-04 11:26:53 +01:00
Aaron van Geffen
c000263bbb
Remove construction marker colour option.
2017-12-04 11:26:53 +01:00
Aaron van Geffen
38d45a102b
Remove interface to option for handymen mowing by default.
2017-12-04 11:26:53 +01:00
Michael Steenbeek
c83b2e31cc
Replace magic number check for food and drink items with a function call
2017-12-04 10:40:41 +01:00
Michael Steenbeek
b0c784ed71
Fix # 6775: New Campaign window only shows 40 rides
2017-12-04 08:35:33 +01:00
Aaron van Geffen
837b177d9d
Simplify UI scaling display quality options ( #6764 )
...
Simplify UI scaling display quality options.
This removes three options:
* 'Use NN scaling at integer scales', as NN is decidedly preferable at integer scales.
* Anisotropic scaling, as it produces results very similar (if not equal) to linear scaling.
* NN as a selectable option in the dropdown - NN is forced on integer scales and unavailable for non-integer scales.
2017-12-03 22:35:16 +01:00
Ted John
107461bbe8
Reintroduce XDG_CONFIG_HOME
...
Accidentally removed resolving the user data path by XDG_CONFIG_HOME environment variable
2017-12-03 19:22:35 +00:00
TELK
349d19e834
Check rct_window is NULL
2017-12-03 18:08:40 +01:00
TELK
b7ca7d25ee
Fix #6625 : Not to try to open a ride window when it crashes
2017-12-03 18:08:40 +01:00
Ted John
33d0fa9b8c
Merge pull request #6748 from IntelOrca/fix/2410
...
Refactor logic for resolving base paths
2017-12-02 19:08:43 +00:00
Michał Janiszewski
079d223663
Actually fix RCT2 builds
2017-12-02 19:46:02 +01:00
Ted John
64f129c616
Fix RCT2 builds
2017-12-02 18:03:54 +00:00
Ted John
6ef5154b02
Fix #6761 : An assertion failed - Invalid Font index 65675
...
Special font bases were not converted in font_sprite_get_codepoint_width.
Assert converted to safe warning.
2017-12-02 11:47:24 +00:00
Michał Janiszewski
0920e58f98
Remove ADVERTISE_STATUS_ prefix
2017-12-02 09:03:59 +01:00
Michał Janiszewski
8e57c7d05d
Make ADVERTISE_STATUS enum class
2017-12-02 09:03:59 +01:00
Michał Janiszewski
053a2540f3
Fix building with HTTP disabled, but network enabled
2017-12-02 09:03:59 +01:00
Ted John
11fac1bbf5
Change back to current directory structure
2017-12-01 21:09:52 +00:00
Michael Steenbeek
8a62229a5b
Fix build on Xcode
2017-12-01 21:09:52 +00:00
Ted John
205fdaefa7
Split up Platform2 by OS
2017-12-01 21:09:52 +00:00
Ted John
bbc389d18e
Fix remaining code issues
2017-12-01 21:09:52 +00:00
Ted John
ea356cd2b9
Fix mingw
2017-12-01 21:09:52 +00:00
Ted John
679aae801d
Fix GetFolderPath for Windows
2017-12-01 21:09:52 +00:00
Ted John
66a6aa95f6
Redirect platform_get_user_directory to IPlatformEnvironment
...
- Remove old code for getting user directory, redirect to IPlatformEnvironment.
- Fix config loading so that it uses path straight from IPlatformEnvironment.
- Add more special folder implementation in Platform2.
2017-12-01 21:09:52 +00:00
Ted John
dcb92a466d
Add new base path for user data and config
...
Refactor more path resolution to Platform2.cpp
2017-12-01 21:09:45 +00:00
Ted John
f52544d607
Fix #6739 : Park name isn't displayed
...
Fix wrong type, down cast introduced by mistake in 585fc1afce
2017-12-01 20:25:41 +00:00
Ted John
1f456d3e8e
Merge pull request #6638 from janisozaur/font-guard
...
Guard access to font
2017-12-01 20:13:58 +00:00
Stefan Winkler
516c5737be
Set branch/sha1 defines only for specific files
2017-12-01 21:05:44 +01:00
Michael Steenbeek
63f7820b25
Fix #1185 : Close button colour of prompt windows does not match
2017-12-01 17:36:30 +01:00
Michael Steenbeek
57a2612365
Fix scenery group assignment race conditions
...
When adding entries to scenery groups by hand, like we do for a lot of ToonTowner's stuff, it currently tries to get the loaded scenery group. If this happens not to be loaded at that time, this will fail.
Instead, hardcode the headers - that's how object .DATs do this anyway.
2017-12-01 11:54:25 +01:00
Michael Steenbeek
7b373e23ac
Fix #6756 : Raise maximum amount of scenery items per tab to 1024
2017-12-01 10:02:33 +01:00
Aaron van Geffen
1747253c42
Do not accept implicit font substitutions from FontConfig.
...
FontConfig implicitly falls back to any default font it is configured to handle.
In our implementation, this cannot account for supported character sets, leading
to unrendered characters (tofu) when trying to render e.g. CJK characters using a
Western (sans-)serif font. We therefore ignore substitutions FontConfig provides,
and instead rely on exact matches on the fonts predefined for each font family.
2017-11-30 23:35:02 +01:00
Tomas Dittmann
1332004640
switch returnvalue from 0 to `false`.
...
switch const variable to `#define`
2017-11-30 23:26:15 +01:00
Tomas Dittmann
60b457d13f
Prevent writing to invalid memory.
...
Switch magic number to constant `maxTrackElements`.
If the number of TrackElements becomes equal to maxTrackElements, cleanup the data and abort the export.
2017-11-30 23:26:15 +01:00
Michael Steenbeek
b0aaf13cec
Clean up and future-proof peep spawn import
2017-11-30 23:08:59 +01:00
Ted John
47a68e9e90
Add constant for maximum zoom level
2017-11-30 21:21:38 +00:00
Michael Steenbeek
251dad113c
Make ride_entry_get_first_non_null_ride_type() take a const ride entry
2017-11-29 12:15:33 +01:00
Michael Steenbeek
7feb0f8f7e
Fix #4760 : Correct guest entry points on loading scenario
2017-11-29 09:10:09 +01:00
Michael Steenbeek
32f91e3e45
Draw friction wheels instead of chain on LRC station
2017-11-29 09:08:27 +01:00
Michael Steenbeek
3f8556c85a
Fix #6294 : Refactor Editor::SelectedObjects
2017-11-28 13:38:54 +01:00
Michał Janiszewski
f46f2d6821
Fix g1 image ID check ( #6742 )
2017-11-27 22:03:54 +00:00
Michał Janiszewski
585fc1afce
Ensure variables in switch are properly scoped
2017-11-26 23:14:40 +01:00
Michał Janiszewski
9fcef9ed07
Only guard font access in RCT2-less builds
2017-11-26 21:48:54 +01:00
Michał Janiszewski
8097beeae1
Guard access to font
2017-11-26 21:38:50 +01:00
Michał Janiszewski
14f39e189d
Fix building
2017-11-26 21:24:57 +01:00
Michał Janiszewski
b7ecaf6ae0
Fix StaffList.cpp compilation
2017-11-26 20:36:03 +01:00
Michał Janiszewski
6943a45b19
Remove limits.h from common.h
2017-11-26 20:36:03 +01:00
Hielke Morsink
59cfc3459d
Add clear button
2017-11-26 13:44:45 +00:00
Hielke Morsink
c648a60502
Add search box to track list window
...
This adds a vector of indices used for the track designs array, which is
used instead of the window list index.
Some other things I've edited that are not directly related to this
commit:
- Orders widgets in logical order like how they appear on screen
- Adds some comments to existing code
2017-11-26 13:44:45 +00:00
Ted John
84305af7ab
Merge pull request #6715 from Broxzier/screenshot_climate
...
Add optional screenshot argument to set weather
2017-11-25 23:32:35 +00:00
Ted John
79a1755666
Merge pull request #6722 from duncanspumpkin/name_sprite_fields
...
Name known misc sprite fields
2017-11-25 23:31:00 +00:00
Michał Janiszewski
0a9ee59152
Change format to use 5-wide index
2017-11-25 16:42:12 +01:00
Michał Janiszewski
39bb4bcc41
Report indexing progress
2017-11-25 16:42:12 +01:00
duncanspumpkin
b3cf757ee1
Increment network version
2017-11-25 09:31:16 +00:00
duncanspumpkin
b6ce5ce4a5
Simplify fountain code. Name sprite fields. Fix warning
...
Fountain jumping code has been sped up slightly so that the code can be simplified and not require rolling over a unsigned int. Also removed setting direction of the fountain as the field was not used.
2017-11-25 09:30:38 +00:00
duncanspumpkin
464f5e858a
Remove unused fields
2017-11-25 09:30:36 +00:00
duncanspumpkin
6905b81216
Label unused vars as pad and remove where required
2017-11-25 09:30:35 +00:00
duncanspumpkin
993ca5a03d
Fix warning
2017-11-25 09:30:35 +00:00
duncanspumpkin
e7774a4012
Clean up balloon update code. See previous commit for more info
2017-11-25 09:30:34 +00:00
duncanspumpkin
8bf42ea4f9
Modify how steam updates to simplify code.
...
This will move steam in exactly the same way as the previous code but the
code is easier to understand. Note on first load of a save that was made
prior to this change there will be 1 tick of incorrect movement for steam. This is barrely noticeable.
2017-11-25 09:30:33 +00:00
duncanspumpkin
0afc0eba5e
Name known misc sprite fields.
2017-11-25 09:30:32 +00:00
Michael Steenbeek
1f4643b19c
Show TT's Glass Roofs in the Abstract Theming group
2017-11-24 13:56:11 +01:00
Michael Steenbeek
b5a4aa30cc
Add TT's tile roofs to R&W tab, add TT's wooden roofs to Mine theming
2017-11-24 13:17:25 +01:00
Michael Steenbeek
303447f647
Show TT's Pirate Roofs in the Pirates Theming group
2017-11-24 12:27:22 +01:00
Michael Steenbeek
c9ca5d55cd
Rename incorrectly named flag
2017-11-24 11:44:57 +01:00
Michael Steenbeek
bb569d35fb
Fix some CC base blocks
2017-11-24 11:44:57 +01:00
rwjuk
d920083503
Fix #6663 : Object load error window filename corruption
2017-11-24 07:53:49 +01:00
Marijn van der Werf
f19344aea6
Move tile inspector to UI module
2017-11-23 23:12:25 +01:00
Michael Steenbeek
d88c01de74
Split Steel Wild Mouse and Spinning Wild Mouse when using Ride Groups
...
Includes a little cleanup for the Ride Groups and a fix in the table with available pieces, which erroneously listed banked pieces as available.
2017-11-23 16:00:58 +01:00
Michael Steenbeek
1011d6172d
Clean up string IDs
2017-11-23 15:52:06 +01:00
Hielke Morsink
ce6d7415e5
Add ability to search object by filename
...
This commit increases the max length of the filter string from 40 to
MAX_PATH, so that entire paths can be pasted inside the search box.
2017-11-23 12:08:04 +01:00
Michał Janiszewski
65c21db2fc
Make GCC aware Object class is not final ( #6726 )
...
* GCC suddenly decided `Object` should be marked as `final`, however it is
used as a base class for more specific types that inherit from it.
* Also ignore -Wsuggest-final-methods for Object class
* Guard Object::GetName from being final
2017-11-23 10:14:28 +01:00
Ted John
323b8dd352
Partially fix #6129 : Guest List not updating after a ride rename
...
- Force refresh of ride list and guest list for both rename ride and demolish ride actions.
2017-11-23 09:40:39 +01:00
Ted John
aff7609b86
Name remaining wall entry flags
2017-11-22 22:53:13 +00:00
Ted John
53493d0977
Name only flag for banner objects
2017-11-22 22:06:56 +00:00
Ted John
ef65a5208b
Rename fields in rct_scenery_group_entry
2017-11-22 21:42:41 +00:00
Michael Steenbeek
430d95bd95
Fix vehicle name fallback
2017-11-22 18:15:07 +01:00
zyliwax
7bffc4ae33
Adding gridlines display toggle shortcut. ( #6313 )
...
This feature existed in the original RCT1/2 games but was not present in
the latest development commit.
The original shortcut for this key was '7', placing it between the
"Invisible people toggle" (6) shortcut and the "Height marks on land
toggle" (8). This commit preserves as much as possible, using
placeholder comments that signify the relevant values which this
feature actually uses where this is not possible.
2017-11-22 12:02:23 +00:00
Ted John
5cf30b0745
Fix #6700 : Maze rendering issues
2017-11-22 01:08:48 +00:00
Hielke Morsink
a5111d9feb
Small fixes
...
- Including C++ stdlib version and using std:: for its functions
- Added new line after printing the IOexception
- Properly clean up after quiting when weather has an invalid value
2017-11-22 00:46:29 +01:00
Ted John
a98c936316
Fix #5636 : Pausing the game shows mute button as active
2017-11-21 23:23:43 +00:00
Michael Steenbeek
c1400a12eb
Allow separate ride and vehicle names per ride entry
2017-11-21 18:55:42 +01:00
Michael Steenbeek
76dc490fca
Clip available vehicles string in New Ride window
2017-11-21 18:28:21 +01:00
Hielke Morsink
34bce9892d
Turn weather setting into command line option
...
Inside the HandleScreenshot function, the argc will be reduced to the
number of arguments minus the options. This way the function doesn't
have to deal with extra optional arguments.
2017-11-21 18:18:42 +01:00
Michael Steenbeek
2a01c22e8c
Raise vehicle tab window height to avoid text clipping
2017-11-21 15:10:35 +01:00
Hielke Morsink
9452457bf9
Add optional screenshot argument to set weather
2017-11-21 00:29:24 +01:00
Michael Steenbeek
adae6041f3
Show list of available vehicles in New Ride window
2017-11-20 19:42:29 +01:00
Hielke Morsink
b3f9fb5299
Invalidate ride window when opening/closing all
...
The ride window was not invalidated, resulting in old text being still
visible inside the list. This was especially noticable when the game was
paused.
2017-11-20 18:28:22 +01:00
Ted John
8c53b6a70b
Fix #6681 : Tons of visual glitches when zooming out
...
Regression from #6574 . Restoring the backup of SPR_TEMP was removed which was necessary as it is the sprite for grass tile zoomed out. Instead make SPR_TEMP a special sprite ID which is not used for anything else apart from temporary sprite drawing.
2017-11-20 13:48:00 +00:00
Michael Steenbeek
dd8464f907
Refactor small, large and wall scenery
2017-11-20 14:40:56 +01:00
Michael Steenbeek
1d3f6b1634
Reformat Particle.cpp
2017-11-20 14:27:32 +01:00
Michael Steenbeek
97683a38d6
Reformat TileInspector.cpp
2017-11-20 14:27:32 +01:00
Michael Steenbeek
459682721d
Reformat MoneyEffect.cpp
2017-11-20 14:27:32 +01:00
Michael Steenbeek
a050c6944f
Compile money_effect.c as C++
2017-11-20 14:27:32 +01:00
Michael Steenbeek
ec0f672e71
Compile particle.c as C++
2017-11-20 14:27:32 +01:00
Michael Steenbeek
005ce63a0f
Compile tile_inspector.c as C++
2017-11-20 14:27:32 +01:00
Michael Steenbeek
ed05d45072
Clean up ride groups and related functions
2017-11-20 13:40:03 +01:00
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