cd39c30989
Tooltip 2 ( #13159 )
...
* Use ScreenCoords for tooltip
* Remove temporary variables
* Small refactor
* Fix #13151 . Not passing tooltip arguments correctly for ride window
* Fix Server List window version tooltip
* Fix cheats tooltip event
* Add static to function decl
* Remove unreachable break statements in Ride.cpp
* Apply review suggestions
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-10-17 09:10:08 +01:00
af26a2cef0
Improve park cheats tab layout ( #13186 )
...
* Remove 'Park parameters…' button
The scenario options are already accessible through the cheats menu
* Split off Objective group from General group
* Split off new Maintenance group from Staff group
* Shrink 'Force park rating' spinner to make room for label
* Change label 'Force weather' to 'Change weather to'
* Change label "Plants don't age" to 'Disable plants withering'
* Change some strings for consistent capitalisation
2020-10-16 21:52:27 +02:00
25ce8b3f6e
Fix #7443 : Construction arrows pulse at irregular intervals.
2020-10-15 19:44:10 +01:00
26720eb345
Fix #5178 : Lighting effects cannot be disabled in software mode ( #13206 )
...
Lighting effect are now automatically turned off when software renderer is selected.
2020-10-15 17:05:39 +02:00
645289f4ec
Rename GameActionResult and use GameActions namespace instead ( #13184 )
2020-10-14 22:04:39 -03:00
711dd00cde
Close #13000 : Refactor ObjectFactory to use unique_ptr
...
Employs the smart pointer unique_ptr for safer memory management.
Classes involved:
- ObjectRepository
- ObjectManager
2020-10-14 21:56:48 +02:00
0c283ba3e7
Ride window: position graph buttons properly
2020-10-14 17:51:58 +02:00
0c195d14b9
Close #8848 Refactor TimeInPark ( #13146 )
...
Split TimeInPark into a union: ParkEntryTime for guests, HireDate for staff
2020-10-12 21:36:38 -03:00
a5a65fe974
Fix #13167 : Broken dropdown menu in rendering engine options ( #13169 )
2020-10-11 23:06:35 +02:00
eb2f40f35c
Fix typo in WC_EDITOR_OBJECTIVE_OPTIONS
2020-10-11 19:28:25 +02:00
16ca892449
Add Objective Options to Cheats menu
2020-10-11 19:28:25 +02:00
cba1d48226
Close #12408 : Refactor CURSOR_ID to use strong enum
2020-10-11 18:01:14 +02:00
d7b9a99a0f
Entrance/exit construction state fixes in ride and maze construction ( #13098 )
...
* Fix #1324 : track selection visible when placing entrance or exit
* Improve maze construction window UX in entrance/exit mode
- Arrows are disabled when entrance and exit are being placed
- Clicking a construction mode will disable the entrance and exit mode
- Previous state restored when leaving entrance/exit construction mode
- Fix entrance/exit buttons not changing when the mode switches after placing the first entrance/exit
Co-authored-by: Simon Jarrett <simonjjarrett@gmail.com>
2020-10-11 12:22:41 +01:00
9681ea4cea
Add "Hybrid Coaster" ride type ( #12110 )
...
* Add "Hybrid coaster" ride type
* Add turns
* Add diagonal slopes
* Add bank transitions
* Add diagonal bank transitions
* Add banked turns
* Add sloped turns
* Add sloped bank transitions
* Add sloped banked turns
* Add s bends
* Add helices
* Add barrel rolls
* Add half loops
* Start changing supports to wooden
* Switch diagonals and banked turns to wooden supports
* Finish switching supports to wooden
* Alter default supports for small turns and steep turns
* Split track sprites that were glitching
* Fix incorrect sprite indices on small helices
* Add supports for large flat to steep pieces
* Fix bug with b supports
* Add supports for quarter loops
* Finalize set of track elements
* Fix strange colors when track piece is highlighted
* Update sprites.json
* Add support for corkscrews
* Fix incorrect remap colors and default supports
* Add slope to banked turn transitions
* Add support for preview image in color selection window
* Fix static glitches
* Correct Z offset
* Set segment heights (and fix more static glitches)
* Improve sloped curve supports
* Fix slope to banked turn transitions
* Fix dynamic glitches
* Fix boosters
* Remove corkscrews
* Set ride data and implement ride rating function
* Fix glitches on steep turns and gentle to steep
* Format code
* Add sprites
* Add track color preview image
* Fix formatting
* Add files to MSVC project
* Fix Testpaint
* Revert removal of RIDE_TYPE_50 from GetClassification
* Introduce constant instead of hard coded number
* Fix stray change
* Improve legibility of ride_ratings_calculate_hybrid_coaster()
* Fix comments on byte_97B23C
* Fix two other stray changes
* Fix Xcode project
* Adjust bounding boxes to make clipping behaviour more consistent
* Fix two glitches on medium and large turns
* Address comments from DuncansPumpkin
* Fix incorrect ride ID
* Fix steep turn sprites
* Run PNG images through OptiPNG
* Update changelog
* Fix namespace error
* Use arrays for supports to handle additional elements
* Rename functions to TitleCase and add namespace
* Increment network version
Co-authored-by: Edward Calver <hx010973@reading.ac.uk>
Co-authored-by: tylerleamon <59478575+tylerleamon@users.noreply.github.com>
Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2020-10-10 20:27:12 +01:00
f28907a87d
Rework tooltip to be more logical ( #13137 )
2020-10-10 10:49:56 -03:00
61c8cbf88b
Fix #13118 : Closing construction window resets ride viewport ( #13123 )
2020-10-10 10:01:28 -03:00
84c9ff833a
Move formatter to separate file. Rework GetMeasurement ( #13131 )
...
* Move formatter to seperate file. Rework GetMeasurement
* Add Formatter source files to Xcode project
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2020-10-09 08:02:07 -03:00
32c2b7d449
Merge pull request #13122 from vjavs/strong-enum/PeepSpriteType
...
Refactor PeepSpriteType to use strong enum
2020-10-08 23:48:45 -03:00
1cf0f91199
Fix #4041 : Garbled park option on scenario editor with custom theme ( #13126 )
...
* Fix #4041 : Garbled park option on scenario editor with custom theme
* Remove duplicate string draw
2020-10-08 14:35:25 +01:00
119bacdd44
Fix #13083 : Dialog cropped for conflicting track design rename ( #13124 )
...
Change description drawing from gfx_draw_string_centred to gfx_draw_string_centred_wrapped.
2020-10-07 23:17:52 -03:00
80718f1774
Use helper function GetPeepAnimation
...
It's intended to retrieve a rct_peep_animation_entry from the global
array g_peep_animation_entries, given PeepSpriteType and
PeepActionSpriteType as parameters.
2020-10-07 17:34:25 -03:00
4d28901cb0
Refactor PeepSpriteType to use strong enum
...
Issue: 12396
2020-10-07 17:34:21 -03:00
61b510db66
Merge pull request #13073 from ZehMatt/refactor/audio-cleanup
...
Minor cleanup around audio code
2020-10-07 21:18:59 +03:00
7045fd9e9f
Minor cleanup
2020-10-07 01:10:53 +03:00
091145037e
Move the audio code into OpenRCT2 namespace
2020-10-07 00:34:42 +03:00
b93024039a
Remove redundant sub-expression involving or bitwise
...
Reported by PVS-Studio (Warning: V501).
Fix 2/7.
Issue: 12523
2020-10-06 18:21:11 -03:00
86b1c0dbe1
Minor cleanup around audio code
2020-10-06 23:31:51 +03:00
e53cde1d5d
Fix #6086 : Cannot install existing track design with another name ( #13082 )
2020-10-06 08:27:38 -03:00
eb3f3edc1b
Use RemoveViewport helper function ( #13104 )
2020-10-06 10:27:56 +01:00
bd8c633ea3
Close #12394 : Refactor PeepNauseaTolerance to use strong enum ( #13106 )
2020-10-05 22:13:44 -03:00
fe54eee07c
Tab-specific event functions for Options window ( #13058 )
...
* Options window: move event lists and open function.
* Options: split off display tab events; add event lists for each tab
* Options: split off rendering tab events
* Options: split off culture tab events
* Options: split off audio tab events
* Options: split off control/interface tab events
* Options: split off misc tab events
* Options: split off advanced tab events; remove old event functions
* Reduce code duplication with common mouseup event
2020-10-04 17:08:10 +02:00
f4b588256d
Merge pull request #13066 from tupaschoal/fix-5904
...
Light Tile Inspector Improvements
2020-10-03 15:16:10 -03:00
6a76547c5b
Close #12412 : Refactor PROMPT_MODE to use strong enum ( #13076 )
2020-10-02 23:04:59 -03:00
4c26fb09b3
Close #12435 : Refactor FILEDIALOG_TYPE to use strong enum ( #13072 )
...
* Close #12435 : Refactor FILEDIALOG_TYPE to use strong enum
2020-10-02 22:43:06 -03:00
8800c32e52
Close #12404 : Refactor DRAWING_ENGINE to use strong enum ( #13070 )
2020-10-02 22:41:30 -03:00
09bb66848c
Change windowTileInspectorTile to TileCoordsXY type
2020-10-02 01:45:08 -03:00
657106d4c6
Close #12424 : Refactor NetworkStatisticsGroup to use strong enum ( #13056 )
2020-10-01 22:07:48 -03:00
29955f28e0
Merge pull request #12976 from mwnciau/Refactor-TRACK_ELEM-enum
...
Refactor TRACK_ELEM_* enum
2020-10-01 22:05:44 -03:00
52209af94d
Rename TRACK_ELEM_* enums to TrackElemType::*
...
- Replace enum in Track.h with namespace and constexpr
- Find and replace all instances of TRACK_ELEM_* enums
2020-10-01 19:57:52 +01:00
55b4c4c6f1
Fix #13046 : Simplify block sectioned comparisons ( #13049 )
2020-10-01 09:06:28 -03:00
afbc983a94
Fix #13050 : Mistake during refactor removed drawing cached track count ( #13051 )
2020-10-01 09:57:46 +02:00
2063aea5ef
Remove common format formatter where possible ( #13034 )
...
* Remove common format formatter where possible
Eventually should have it limited to tooltips, window titles and widget args
* Remove remaining paint functions using common
* Remove misuse of gCommonFormatArgs
2020-09-30 22:42:04 +01:00
b92328ce34
Merge pull request #13004 from vjavs/strong-enum/PeepActionSpriteType
...
Refactor PeepActionSpriteType to use strong enum
2020-09-29 23:38:23 -03:00
30307ec42d
Merge pull request #13030 from ZehMatt/fix-4617-2
...
Fix #4617 : Crash when rotating with invalid viewport open
2020-09-30 00:53:32 +03:00
005e1e0e1f
Final cleanup
...
Co-authored-by: Gabriel Guedes <gabriel.guedesaz@gmail.com>
2020-09-29 23:23:51 +03:00
f765ed2f94
Use unique_ptr for TitleSequenceParkHandle Stream
...
Co-authored-by: Gabriel Guedes <gabriel.guedesaz@gmail.com>
2020-09-29 23:23:28 +03:00
e3a4d6a245
Use std::string for TitleSequenceParkHandle HintPath
...
Co-authored-by: Gabriel Guedes <gabriel.guedesaz@gmail.com>
2020-09-29 23:23:01 +03:00
17bff41e82
Use std::unique_ptr for TitleSequenceParkHandle
...
Co-authored-by: Gabriel Guedes <gabriel.guedesaz@gmail.com>
2020-09-29 23:22:44 +03:00
464545b907
Cleanup remnants
...
Co-authored-by: Gabriel Guedes <gabriel.guedesaz@gmail.com>
2020-09-29 23:22:35 +03:00
612249bd74
Use vector for TitleSequence commands
...
Co-authored-by: Gabriel Guedes <gabriel.guedesaz@gmail.com>
2020-09-29 23:21:58 +03:00
7245f23422
Use vector for TitleSequence saves
...
Co-authored-by: Gabriel Guedes <gabriel.guedesaz@gmail.com>
2020-09-29 23:21:42 +03:00
ccb6eb06f8
Use unique_ptr for TitleSequence instances
...
Co-authored-by: Gabriel Guedes <gabriel.guedesaz@gmail.com>
2020-09-29 23:21:27 +03:00
d6c2ec898d
Fix #4617 : Crash when rotating with invalid viewport open
2020-09-29 21:44:59 +03:00
ca8fa55fdb
Use EnumValue to get the underlying value of an enum
...
Applied to objects of the enum class PeepActionSpriteType when they are
used as arrays subscripts.
2020-09-29 11:15:07 -03:00
f8dd0a57aa
Refactor PeepActionSpriteType to use strong enum
2020-09-29 11:15:04 -03:00
3c8adb1fc1
Remove gMapTooltip format args global ( #12971 )
...
Fix mistake
2020-09-28 21:45:28 -03:00
d1cd2e08b5
Close #12388 , refactor PeepState to use strong enum ( #12927 )
...
* Close #12388 , refactor:PeepState to use strong enum
* refactor: refactored file PlayTests.cpp
* refactor: change PEEP_STATE_ to PeepState:: and camel case after merging
chore: code reformatting
2020-09-28 15:51:49 -03:00
d27e14f45b
Compact, statically initialized syntax for event lists ( #12973 )
2020-09-28 20:36:15 +02:00
065da23b3b
Close #12437 , refactor: RIDE_MODE_* to strong enums ( #12833 )
...
* partial refactor: RIDE_MODE_* to strong enums
* Close #12437 , refactor: RIDE_MODE_* to strong enums
* chore: code formatting
* refactor: RideMode, change enum names to CamelCase
and resolve casting order.
* chore: refactor due to code formatting
* Close #12437 , refactor: RIDE_MODE_* to strong enums
Resolved comments
* chore: Formatting correction.
* Use EnumsToFlags constexpr
* refactor: resolved comments
added newline at the end of file
* refactor: Change case stack to default in Switch
Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2020-09-28 14:09:59 +01:00
8f5ee758ee
Fix #3200 : Close Construction window upon selecting vehicle page ( #13022 )
2020-09-28 07:37:22 -03:00
4ec10837a6
Remove Formatter::Common where not required ( #12972 )
...
* Remove Formatter::Common where not required
* Remove common from Guest window where possible
2020-09-27 21:09:08 -03:00
958f3824c9
Fix #12969 : Crash opening ride window with invalid mechanic assigned
2020-09-27 13:40:40 +03:00
62b13e68bc
Fix #13005 : Last player action is not truncated ( #13007 )
2020-09-27 11:41:28 +02:00
4a79e9305f
Replace gfx_draw_string_right() with DrawTextBasic ( #12966 )
2020-09-18 21:39:00 -03:00
77e22851cc
Merge pull request #12925 from richard-fine/dropdown-menus-static-data
...
RFC: Dropdown menus static data
2020-09-18 23:37:26 +02:00
da82144bfb
Fix #12944 . Mistake from refactor meant formatter optimised away ( #12961 )
...
Not sure why it should get optimised away but this will fix the crashes.
2020-09-18 09:25:17 +01:00
b3b9a348c5
Apply review suggestions
2020-09-17 22:16:05 +03:00
38e03ae45d
Use the Formatter for News items
2020-09-17 22:14:36 +03:00
ccde06ab0f
Explicitly pass formatter arguments to ShowError and family
2020-09-17 22:14:36 +03:00
2639349925
Move storage into Formatter class and refactor usage
2020-09-17 22:14:36 +03:00
1982e8491b
Merge pull request #12667 from mwnciau/json-refactor
...
Migrate JSON library to JSON for Modern C++
2020-09-17 21:11:06 +02:00
2c92c652e2
Refactor ObjectLoadError to use new JSON library
2020-09-16 20:18:54 +01:00
af591c834b
Part of #12097 : Use ScreenRect on gfx_fill_rect_inset (1) ( #12938 )
...
* Part of #12097 : Use ScreenRect on gfx_fill_rect_inset (1)
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-09-16 00:02:22 -03:00
3acbb92074
Merge pull request #12922 from Gymnasiast/LetItSnow2
2020-09-15 18:11:45 +02:00
c1729c8a87
Merge pull request #12858 from ju-pinheiro/network-strong-enums
...
NETWORK_PERMISSION and NETWORK_AUTH replaced by strong enums
2020-09-15 08:07:19 -03:00
c9de4f49fe
Add snow as a weather type
...
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2020-09-14 21:58:00 +02:00
4f31ddaca4
Make menu data declarations local to the functions using them
2020-09-13 16:30:17 -04:00
a51d8e4deb
Convert cheats menu to use new constexpr menu specification
2020-09-13 16:16:05 -04:00
ce99928b81
Convert view menu to use new constexpr menu specification
2020-09-13 16:15:53 -04:00
d21da12f9f
Fix 11414: ‘Possible misuse of comma operator’ warnings ( #12919 )
...
Fix the ‘possible misuse of comma operator’ warnings reported by XCode - the two original ones reported in #11414 , plus one more in Util.cpp.
2020-09-13 17:43:59 +01:00
917fb77f0e
Revert regressed warning on window_install_track_paint
2020-09-10 21:19:53 -03:00
c2f42cd908
Fix #12901 : Guest thoughts show up as guest actions or names
2020-09-10 21:18:42 -03:00
2f3d455b3a
Merge pull request #12899 from Gymnasiast/refactor/c-style-casts
...
Remove most remaining C-style casts
2020-09-10 20:49:15 -03:00
c0e551056f
Fix #12900 : Garbled/distorted date lines in file browser ( #12902 )
...
* Fix #12900 : Garbled/distorted date lines in file browser
2020-09-10 20:47:39 -03:00
20a8bbc322
Close #12420 : Refactor NETWORK_PERMISSION to use strong enum
...
First approach, instead of a bigger refactor to avoid the need of "static_cast".
2020-09-10 19:32:27 -03:00
c83ddefe47
Convert remaining C-style casts to C++-style ones
2020-09-10 21:36:20 +02:00
4afbbed9bd
Fix #12881 : Guests' favourite rides not listed in the guest window
2020-09-10 19:11:17 +02:00
d140dd72c6
Remove const void* overload from DrawTextEllipsised()
2020-09-10 18:13:13 +02:00
b788a099b5
Replace gfx_draw_string_clipped() calls with DrawTextEllipsised
2020-09-10 18:13:13 +02:00
6e22eade67
Create Objective struct and use it for global objective
2020-09-09 15:38:03 +02:00
fe71ce437d
Close #12434 : Refactor ENTERTAINER_COSTUME to use strong enum ( #12865 )
2020-09-08 16:29:18 -03:00
22f29bf192
Close #12414 : Refactor GUEST_LIST_FILTER_TYPE to use strong enum ( #12830 )
2020-09-02 12:50:16 -03:00
5f3fe62f83
Close #12432 : Refactor STAFF_MODE to use strong enum ( #12752 )
...
* Refactor STAFF_MODE to use strong enum
Closes #12432
* Change type of gStaffModes to StaffMode
2020-09-02 12:48:40 -03:00
ae81ed63cc
Remove unused constant TAB_HEIGHT in Cheats.cpp ( #12838 )
2020-09-01 22:58:06 +02:00
55722a7ad4
Remove commented-out code ( #12834 )
2020-09-01 15:33:52 -03:00
e9803fc4b5
Fix #12820 : Title menu buttons not invalidating properly ( #12821 )
...
This introduces constants for the title menu buttons to ensure this does not happen again.
2020-08-30 23:30:02 +02:00
5825dedd81
Rename TitleScenarioSelect to ScenarioSelect ( #12822 )
...
The scenario select window is not only available through the title screen.
2020-08-30 20:22:20 +02:00
731a93dc39
Create WindowColour enum for widget definition calls ( #12722 )
...
* Make MakeWidget* functions take enum colour
* Make windows A-D use WindowColour enum
* Make windows E-G use WindowColour enum
* Make windows I-M use WindowColour enum
* Make windows N-P use WindowColour enum
* Make windows R-S use WindowColour enum
* Make windows T use WindowColour enum
* Make windows V-W use WindowColour enum
2020-08-28 23:31:31 -03:00
411f242cfd
Close #12431 Refactor VirtualFloorStyles to use strong enum ( #12790 )
2020-08-27 21:06:39 -03:00
db8efe20d0
Merge pull request #12785 from Gymnasiast/refactor/text-drawing
...
Start removal of gfx_draw_string_*()
2020-08-26 22:51:39 +02:00
Duncan