6e5105ab3b
refactor: ObjectType to use strong enum
...
enum renaming complete
2020-11-11 16:07:01 +01:00
d963438c4f
Check if platform has a file picker
2020-11-08 14:06:42 +01:00
d8a7219c86
Use new identifier for default objects
2020-11-07 20:28:01 +01:00
58f099a644
Merge pull request #13286 from tupaschoal/research-refactor
...
Small research releated refactor
2020-11-07 20:18:18 +01:00
b8f56fd980
Merge pull request #13312 from Gymnasiast/refactor/ride-id-it
...
Use ride_id_t in more places
2020-11-07 13:03:29 -03:00
7d96dc9958
Move category names and invention strings to ResearchItem class
2020-11-07 11:14:55 -03:00
19ab8f1211
Use ResearchCategory Enum for ResearchItem
2020-11-07 11:14:55 -03:00
f0c1ea1d37
Split declarations and definitions to improve compile times when editing ( #13332 )
...
* Split FileStream declarations and definitions
* Split JobPool declarations and definitions
* Split StringBuilder declarations and definitions
* Split StringReader declarations and definitions
* Split ZoomLevel declarations and definitions
* Fix missing include in FileClassifier.cpp
* Remove pragma once from source files
* Fix missing include in StringBuilder.h
* Update Xcode project
* Fix compilation of tests
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2020-11-07 12:42:04 +00:00
a3aef90637
Replace loose usages of 0xFF
2020-11-07 12:58:32 +01:00
9e17081ee8
Use 16 bits for gTrackDesignSaveRideIndex throughout
2020-11-07 12:58:32 +01:00
d58a8d1184
Change tile_element_get_ride_index() to method
2020-11-07 12:58:32 +01:00
92a5f1aa24
Merge pull request #13310 from ju-pinheiro/sprite-identifier-strong-enum
...
Close #12450 : Refactor SPRITE_IDENTIFIER to use strong enum
2020-11-06 16:55:01 +01:00
2f4b1b9e3f
Close #13376 : Open custom window at specified tab
2020-11-05 17:43:23 +01:00
eea57f2bfe
Create calls for min/max cars per train
2020-11-05 17:42:02 +01:00
2015acd4c0
Refactor UI/Interface Window to Title Case ( #13367 )
2020-11-04 04:52:23 +00:00
88a6a085e4
Close #12455 : Refactor MOUSE_STATE to use strong enum ( #13361 )
...
* Close #12455 : Refactor MOUSE_STATE to use strong enum
refactor: MouseState to strong enum
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-11-03 18:41:19 -03:00
a5607da09d
Refactor Widget to TitleCase ( #13355 )
2020-11-03 18:29:22 -03:00
b0fd5f93d7
Refactor UI/Interface misc to TitleCase ( #13354 )
...
* Refactor LandTool to Namespace
* Refactor Theme to TitleCase
* Refactor ViewportInteraction to TitleCase
2020-11-03 10:59:00 +00:00
6cc3f2f4a8
Refactor Graph to TitleCase ( #13353 )
2020-11-03 08:21:20 +00:00
c2d309af38
Close #13346 : Change FootpathScenery to FootpathAddition ( #13350 )
2020-11-03 08:17:29 +00:00
68bd035f12
Refactor Dropdown to TitleCase ( #13352 )
...
* Refactor Dropdown Namespace
* Refactor Dropdown to TitleCase
2020-11-03 08:16:06 +00:00
1643c62939
Refactor UI/Input MouseInput to Title Case
2020-11-02 07:05:33 -07:00
34f362b86e
Refactor UI/Input KeyboardShortcuts to Title Case
2020-11-02 06:55:16 -07:00
06c0c1b982
Refactor UI/Input Input to Title Case
2020-11-02 06:55:16 -07:00
5893664785
Fix #13334 : Uninitialised variables in CustomTabDesc
2020-11-01 20:59:19 +01:00
dcabc8451e
Fix #13250 : Crash when opening parks with new ride types ( #13256 )
...
This only happens when a new ride type is added and the park is opened in the older version of the game where the ride type does not exist.
Reworked so that invalid rides are not loadable. Force reload of title if current scenario is corrupted.
2020-11-01 14:49:43 +01:00
3e7ff12a72
Fix #13292 : Impossible excitement rating requirements
...
Incorrect argument was used when drawing the minimum excitement rating in the Objective Selection window.
2020-10-28 23:55:29 +01:00
a31c958004
Adding missing SpriteIdentifier enumerations to switch statements
2020-10-27 18:52:56 -03:00
bb16ca075b
Close #12450 : Refactor SPRITE_IDENTIFIER to use strong enum
2020-10-27 13:26:27 -03:00
7b10fa57bb
Merge pull request #13280 from Broxzier/bugfix/filestream-file-nonexisting-folder
...
Fix crash when using a writable FileStream to a file in non-existing folder
2020-10-25 14:46:48 -03:00
894be65b6d
Closes #12415 : Refactor CURRENCY_TYPE to strong enum ( #13276 )
...
* closes #12415 CURRENCY_TYPE enum refactor
* reverses unintended change in Linux.cpp
* closes #12415 CurrencyType strong enum
2020-10-25 01:33:06 -03:00
2275585795
Undef Windows.h macros that cause conflicts
...
This caused errors on calls to Path::CreateDirectory in source files that include OpenGLAPI.h.
2020-10-24 17:39:16 +02:00
0aaac728b5
Change GL_TEXTURE_RECTANGLE to NPOT GL_TEXTURE_2D
...
This improves GLES compatiblity due to missing rectangle textures, but
NPOT 2D ones being universally available.
2020-10-24 17:28:05 +02:00
16b3a96e66
Change palette size to PoT square
2020-10-24 17:28:05 +02:00
171132fb6d
Add Execute and FindApp to Platform class
2020-10-22 21:17:28 +02:00
214f6992dd
Rename to TitleCase and name LastAttachedPS ( #13260 )
2020-10-22 18:13:54 +01:00
a017d3fa57
Fix #13215 : lingering arrows after ride construction ( #13245 )
...
Co-authored-by: Simon Jarrett <mwnciau@users.noreply.github.com>
2020-10-21 23:45:53 -03:00
c81bf7b501
Refactor variable names in window_guest_stats_bars_paint ( #13214 )
...
* Refactor variable names in window_guest_stats_bars_paint
Change the variables eax/ebp to timeInPark and barColor, respectively.
* Refactor guest stat UI calculations
Simplify guest stat calculations and move them to a new function NormalizeGuestStatValue.
2020-10-21 07:38:44 +01:00
9dcbf6d4e6
Close #4865 : Offer an option to disable inhibiting the monitor power ( #13243 )
...
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2020-10-20 22:02:44 +02:00
13fb0b43da
Refactor legacy GetSourceGame() to method
2020-10-17 22:45:12 +02:00
8a4df108ba
Close #12428 : Refactor OBJECT_SOURCE_GAME to use strong enum
2020-10-17 22:27:02 +02:00
a9316869fc
Fix #13158 : Cursors are drawn incorrectly in text input fields ( #13228 )
2020-10-17 22:24:24 +02:00
d287653cb5
Fix #4022 : Mac cursor offset on launch ( #13095 )
...
Update config when forcing windowed mode
2020-10-17 11:57:03 +02:00
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
250586cb45
Port some OpenLoco helper functions ( #13113 )
...
* Port some OpenLoco helper functions
Added a few helper functions from OpenLoco to make viewport code a bit simpler
2020-10-12 22:25:11 -03: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
197bb897bb
Fix #7748 . Move tooltip timeout reset to correct location ( #13132 )
...
* Fix #7748 . Move tooltip timeout reset to correct location
Mistake made in implementation
* Add changelog entry
2020-10-09 16:53:31 +01: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
4fb4feb83c
Fix missing error message on ride graph ( #13129 )
...
* Fix missing error message on ride graph
Mistake made during implementation meant that the ride graph would not show the error message when the ride had not left the station. Another mistake meant that the tertiary colour of the ride window was not set to green. The tertiary colour was only used by this error message though so was not noticed.
2020-10-08 15:22:23 -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
2524e9201a
Fixed console cursor rendering. ( #13025 )
...
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-10-07 21:45:57 -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
076544f490
Merge pull request #13084 from vjavs/PVS-Studio/Fixes
...
Make some PVS-Studio fixes
2020-10-07 08:24:59 -03:00
7441001c4e
Close #12407 : Refactor CHAT_INPUT to use strong enum ( #13116 )
2020-10-06 21:37:08 -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
22a1df32d7
Remove redundant assignment in CustomListView::MouseUp
...
Reported by PVS-Studio (Warning: V1048).
Fix 7/7.
Issue: 12523
2020-10-06 18:21:28 -03:00
579e008590
Refactor process_mouse_over()
...
- Remove unnecessary local variables and assignments
- Remove unreached if-statement branch
Reported by PVS-Studio (Warning: V587).
Fix 5/7.
Issue: 12523
2020-10-06 18:21:24 -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
56e8cc77c6
Close #12409 : Refactor CONSOLE_INPUT to use strong enum ( #13052 )
2020-10-01 10:31:03 +01: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
f586981cd3
Use std::string for TitleSequence names
...
Co-authored-by: Gabriel Guedes <gabriel.guedesaz@gmail.com>
2020-09-29 23:22:12 +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
0ae86d0558
Don't use empty resolutions ( #12980 )
2020-09-20 23:13:10 -03: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
f3aba68e46
Update project build files
2020-09-16 20:18:54 +01:00
2c92c652e2
Refactor ObjectLoadError to use new JSON library
2020-09-16 20:18:54 +01:00
57a57b0c02
Refactor Theme to use new JSON library
2020-09-16 20:18:54 +01:00
d0d5cc5179
Remove unused declarations
2020-09-16 20:23:34 +03: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
31d20cefb2
Rename rain to weather where appropriate
...
Co-authored-by: Brett Penzer <brettpenzer123@live.co.uk>
2020-09-14 21:57:54 +02:00
2857f9d276
Part of #12097 : Use ScreenRect on gfx_fill_rect_inset in Widget.cpp ( #12906 )
...
* Part of #12097 : Use ScreenRect on gfx_fill_rect_inset in Widget.cpp
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-09-14 08:44:50 -03: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
4a9974fda6
Introduce mechanism for configuring dropdown menu with static data
...
For menus with static content, provide a mechanism for building the menu items as a constexpr array, allowing developers to specify menus more concisely and to put the data into the .rodata section where it can be quickly copied through.
2020-09-13 16:15:28 -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
cf5b48a9dd
Rename Rain.{cpp,h} to Weather.{cpp,h} ( #12914 )
2020-09-12 19:32:26 -03:00
a9cd89d02e
Fix #12912 : Plugin: selectedCell of CustomListView ( #12913 )
2020-09-12 19:24:23 -03: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
11ebe78328
Refactor window offset std::arrays into regular arrays ( #12799 )
2020-09-09 22:51:51 +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
b53c4b3625
Downgrade Mac build requirements of OpenRCT2 to macOS 10.13 ( #12749 )
...
Keep targeting macOS 10.14 for libopenrct2 target. Replace deployment target with macOS 10.13 for other targets, including the OpenRCT2 bundle.
Explicitly type std::arrays, since Xcode refuses to use C++17 array deduction.
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2020-08-28 22:27:25 +02:00
65e3d20156
Refactor drawing
2020-08-28 01:30:15 +01:00
609cde2304
Fix drawing of money text when zoomed in
2020-08-28 01:29:59 +01:00
7f0510e444
Fix sub pixel clip issues with OpenGL
2020-08-28 01:29:59 +01: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
60a35f7abb
Merge pull request #12783 from Gymnasiast/refactor/ride-status-formatter
...
Use Formatter in windows/Ride.cpp
2020-08-26 22:51:09 +02:00
549a771120
Use Formatter&
2020-08-26 17:13:19 +02:00
ec6f1b5fcd
Fix #12784 : Scenery tab images missing
2020-08-26 17:06:19 +02:00
972e6e80ab
Allow passing Formatter to DrawTextBasic() and DrawTextEllipsised()
2020-08-26 15:08:42 +02:00
ceace1a3ad
Remove draw_string_left_underline()
2020-08-26 14:47:47 +02:00
f1caddc9fe
Remove draw_string_right_underline()
2020-08-26 14:46:37 +02:00
879ce64a86
Use Formatter in windows/Ride.cpp
2020-08-26 13:59:18 +02:00
56c623e549
Merge pull request #12671 from AaronVanGeffen/refactor/tabs
...
MakeTab wrapper for standard tab widgets
2020-08-26 12:13:36 +02:00
efdb7e1a2d
Change gDateMonthsElapsed type to int32_t
2020-08-25 19:06:38 -03:00
4caf571c22
Followup on #12475 post-mortem comments ( #12745 )
...
* Remove using namespace OpenRCT2 from header
* Fix using wronf undefined enum for shortcut key map
2020-08-21 16:07:38 +01:00
5330f7fb86
closes #12445 Refactor CLIMATE to use strong enum ( #12551 )
2020-08-21 09:43:57 +01:00
4cc550a364
Close #12460 : Refactor KeyboardShortcut to use strong enum ( #12475 )
...
* Close #12460 : Refactor KeyboardShortcut to use strong enum
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-08-20 23:54:43 -03:00
9cdae2d1e2
Fix #12401 : Refactor SCALE_QUALITY to use strong enum ( #12673 )
2020-08-20 23:32:56 -03:00
4c2ce0f892
Remove duplicate TRACK_ELEMENT_LOCATION_IS_UNDERGROUND flag ( #12714 )
...
Renamed all instances to ELEMENT_IS_UNDERGROUND
Co-authored-by: Simon Jarrett <simonjjarrett@gmail.com>
2020-08-18 09:26:03 -03:00
40cfadcdc5
Apply formatting suggestions from code review
...
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-08-18 10:13:48 +02:00
cc2bb33892
changed enum STAFF_TYPE to strong enum StaffType, moved it to Peep.h
2020-08-17 22:59:02 -04:00
54a33cbde8
renamed StaffType to AssignedStaffType
2020-08-17 20:16:09 -04:00
3b97cd9b14
Refactor Staff*, Themes, and TitleEditor to use MakeTab
2020-08-17 20:59:42 +02:00
6b9211c8b8
Refactor Park, Player, Research, Ride* to use MakeTab
2020-08-17 20:59:42 +02:00
3631d75b98
Use MakeTab in Mapgen, Multiplayer, Network, NewRide, NewsOptions
2020-08-17 20:59:23 +02:00
be626d0b7c
Refactor Editor*, Finances, Guest* to use MakeTab
2020-08-17 20:59:17 +02:00
6602b51b8b
Use MakeTab in EditorInventionsList, EditorObjectSelection, Scenery
2020-08-17 20:59:17 +02:00
4a55acd71e
Introduce MakeTab wrapper function
...
The MakeTab function is only applied in two places, for the moment:
the Cheats and Options windows.
2020-08-17 20:59:13 +02:00
72be84caf8
Remove unused fourth tab from Staff window ( #12713 )
2020-08-17 20:21:46 +02:00
55ba164dee
Fix crash when switching ride types with construct window open ( #12694 )
2020-08-16 18:48:21 +01:00
647730fcfa
Fix #12691 : Tooltip at ride's graph tab is not using a proper string
2020-08-15 23:17:38 +02:00
f95da1c99a
Fix alignment for widget definitions
2020-08-14 10:18:17 +02:00
6dd67296a4
Merge "new version" window back to changelog
2020-08-14 10:18:17 +02:00
6ae5645686
Show update information on main screen & in floppy menu
2020-08-14 10:18:17 +02:00
55835456a0
Pester users to update to latest release
2020-08-14 10:18:17 +02:00
eda8e31055
Refactor widget defs in EditorObjectiveOptions window ( #12672 )
2020-08-13 23:07:19 -03:00
a8f8f06e2d
Fix #12402 : Refactor MEASUREMENT_FORMAT to use strong enum ( #12642 )
...
* Fix #12402 : Refactor MEASUREMENT_FORMAT to use strong enum
* Remove redundant default branches
Co-authored-by: Matt Thomson <matt-thomson@users.noreply.github.com>
2020-08-13 21:51:28 +01:00
5e09ecc904
Fix #12308 : Cannot use cheats in editor modes ( #12661 )
...
This allows opening the cheats window while in editor mode. Some tabs and options are disabled because they are not relevant to these modes.
2020-08-13 13:03:56 +02:00
33d9fc2b75
Fix #10549 : 'Build the best ride you can' objective missing ride name
...
This is implemented in a way that is compatible with RCT2 (as long as the ride type was not split).
2020-08-13 00:23:08 +02:00
68ce06e833
Refactor objective handling in Scenario Editor
...
This moves some knowledge out of the window and into the main code and also cleans up the window a bit.
This also allows setting the "x guests by the end of year y" goal for no money scenarios, which was not the case previously.
2020-08-12 22:10:47 +02:00
2d56c8d2de
Merge pull request #12636 from Gymnasiast/refactor/to-member-function
...
Use a 16-bit integer for track type in more places
2020-08-11 17:53:20 +02:00
2e4edf6f5d
Merge pull request #12638 from quale/fix-debug-window
...
Fix Z coordinate and spillover in guest debug tab
2020-08-11 07:53:19 -03:00
4117965a4a
Fix Z coordinate in guest debug tab
2020-08-11 03:37:34 +02:00
dcdc782361
Increase minimum window size so pathfind history doesn’t spill out
2020-08-11 03:35:24 +02:00
89f04c4fb3
Fix names of two track type functions
2020-08-10 23:48:18 +02:00
be0123decb
Fix #12611 : Bad check for pay-per-ride ability
2020-08-10 18:56:06 +02:00
6f8ae294ae
Fix launchpad builds ( #12575 )
...
```
/<<PKGBUILDDIR>>/src/openrct2-ui/interface/ViewportInteraction.cpp: In function ‘InteractionInfo viewport_interaction_get_item_left(const ScreenCoordsXY&)’:
/<<PKGBUILDDIR>>/src/openrct2-ui/interface/ViewportInteraction.cpp:85:29: error: potential null pointer dereference [-Werror=null-dereference]
85 | switch (sprite->sprite_identifier)
| ~~~~~~~~^~~~~~~~~~~~~~~~~
```
2020-08-09 07:27:26 +01:00
7cd6e72edd
Refactor TEMPERATURE_FORMAT to use strong enum ( #12610 )
...
* Refactor TEMPERATURE_FORMAT to use strong enum
* Rename TEMPERATURE_FORMAT to TemperatureFormat
* Rename TemperatureFormat to TempueratureUnit
2020-08-09 07:26:46 +01:00
4de58e1fd4
Close #12440 : Refactor VEHICLE_STATUS to use strong enum ( #12606 )
...
* Close #12440 : Refactor VEHICLE_STATUS to use strong enum
* Fix code formatting for VEHICLE_STATUS refactoring
* Refactor VehicleStatus enum to be inside Vehicle
This commit moves VehicleStatus inside Vehicle,
renamed as Status.
2020-08-09 06:24:25 +01:00
c4ae579a84
Feature #11817 : Show authors field in object selection ( #12591 )
...
* Feature #11817 : Show authors field in object selection
- authors field in JSON shows as last line in bottom right on object selection
- authors field added to Object class
- ObjectFileIndex version bump as authors is serialised
* fix sign comparison warning
* Start object selection corner text higher to avoid overlap
* Use references to reduce unneccessary copies
* make GetAuthors const
* Clip drawing of authors string so it doesn't cross widgets
At max length the leftmost aligns exactly with description left
* Add a changelog message
* make SetAuthors use an rvalue reference
* remove unnecessary nullptr check
2020-08-09 06:23:28 +01:00
933570fd62
Close #12442 : Refactor SCENARIO_SOURCE to use strong enum ( #12608 )
2020-08-08 09:38:43 -03:00
be9dca6945
Close #12416 : Refactor CURRENCY_AFFIX to use strong enum ( #12589 )
...
* Close #12416 : Refactor CURRENCY_AFFIX to use strong enum
* Add static assert to check config enum type
Co-authored-by: Matt Thomson <matt-thomson@users.noreply.github.com>
2020-08-05 20:26:18 -03:00
0dc43d66e4
Remove the use of INTERFACE macro and macro its self
2020-08-05 16:30:44 +02:00
83355e35cc
Move IStream, MemoryStream, FileStream into OpenRCT2 namespace
2020-08-05 16:29:36 +02:00
30376085cf
Include missing headers
2020-08-05 16:29:29 +02:00
150100d89f
Fix #12416 : Refactor CURRENCY_AFFIX to use strong enum
2020-08-04 21:35:59 +01:00
156be224f9
Close #12399 : Refactor MIXER_GROUP to strong enum ( #12531 )
2020-08-03 20:51:12 -03:00
0809069e74
Fix #12577 : Mistake made in refactor #12538 ( #12579 )
...
Loop called the peep window open only when nullptr. Added extra checks for nullptr on window open
2020-08-03 20:09:24 -03:00
d217dfa9b9
Refactor NewsItem into namespace and Pascal Case ( #12511 )
2020-08-02 23:14:00 -03:00
aa11773da3
Fix #12566 , #12565 , #12562 , #12560 , #12558 : Nullptr deref ( #12567 )
...
Mistake made in refactor meant that a nullptr deref took place when the screen coords were outside of the normal play area
2020-08-02 20:13:09 +01:00
733bc5a981
Close #12518 : Viewport Refactor ( #12541 )
...
* Remove viewport pointer from get_map_coordinates_from_pos
* Removed viewport from get_window
* Return a InteractionInfo from get_map_coord...
* Remove viewport_interaction_info struct
* Add Entity union to simplify code
* Name the enum used for viewport interaction
* Simplify functions further by returning the info struct
* Add default switches
2020-08-02 08:32:59 +01:00
0f78d452a4
Part of #12497 : Remove extra SPRITE_INDEX_NULL check ( #12538 )
...
* refactor: deleted double check of SPRITE_INDEX_NULL in Staff* ride_get_mechanic(Ride* ride)
* refactor: deleted double check of SPRITE_INDEX_NULL in Ride.cpp file
* refactor: deleted double check of SPRITE_INDEX_NULL in windows/Ride.cpp in function static rct_string_id window_ride_get_status_vehicle
* refactor: deleted double check of SPRITE_INDEX_NULL in ride/Ride.cpp
* refactor: deleted double check in FormatStatusTo
2020-08-02 08:28:11 +01:00
e039a51826
Fix #12552 : Grey rectangles appear under windows and menus ( #12554 )
...
* Fix #12552 : Grey rectangles appear under windows and menus
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-08-02 00:47:28 -03:00
ddd21fa87a
Part of #12098 : Use ScreenRect on gfx_filter_rect ( #12134 )
2020-08-01 14:40:01 -03:00
88bad7729c
Merge pull request #12491 from janisozaur/openurl
...
Add OpenURL method, with implementation for Linux and Windows
2020-08-01 15:42:31 +02:00
4e9c32ff3a
Merge pull request #12521 from AaronVanGeffen/refactor/widgets-8
...
Refactor the last sets of widget definitions
2020-08-01 15:11:28 +02:00
3d071cec53
Implement OpenURL for macOS
2020-08-01 14:25:32 +02:00
6d11825e1a
Reduce the use of rct_sprite ( #12530 )
...
* Reduce the use of rct_sprite
* Pass the correct types in S4 importer
* Add additional nullptr checks
* Simplify the viewport interaction
* Apply review comments
* Small cleanup of GetEntity
* Fix test paint
2020-08-01 11:29:54 +01:00
3430076088
Very quickly process remaining review comments
2020-07-31 13:25:08 +02:00
16a484545a
Use WW in MapGen common widgets
2020-07-31 11:26:49 +02:00
e6e850e399
Apply suggestions from code review
...
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-07-31 11:25:50 +02:00
c6e26267a4
Reduce the use of GET_VEHICLE ( #12494 )
...
* Start removing GET_VEHICLE macro use
* Further work
* Remove further GET_VEHICLE's
* Further removal of GET_VEHICLE
* Remove the last of GET_VEHICLE
* Fix testpaint
* Fix nullptr deref
* Make review changes
Also swapped in helper functions and used a standard patern for iterating the train cars
* Further simplify loops for train cars
2020-07-31 07:48:27 +01:00
d32809eaef
Fix formatting for StaffFirePrompt ( #12525 )
2020-07-30 23:06:01 +02:00
16ad1d18fb
Refactor another set of widget definitions ( #12503 )
...
* Refactor TopToolbar
* Refactor TrackDesignManage
* Refactor TrackDesignPlace
* Refactor TrackList
* Refactor ViewClipping
* Refactor Viewport
* Refactor TitleEditor
* Refactor TitleCommandEditor
* Refactor Themes
* Refactor TextInput
2020-07-30 22:58:49 +02:00
b738c4fa87
Refactor StaffFirePrompt
2020-07-30 22:51:32 +02:00
fe9d577c2e
Refactor Staff
2020-07-30 22:45:40 +02:00
e8e61bd987
Refactor Sign
2020-07-30 22:39:09 +02:00
9b6f6b6216
Refactor Ride
2020-07-30 22:36:42 +02:00
c1cff7fab0
Refactor Park
2020-07-30 22:25:18 +02:00
8325ec04ed
Refactor ObjectLoadError
2020-07-30 22:05:11 +02:00
173c103573
Refactor NewRide
2020-07-30 21:56:51 +02:00
5e04508a59
Refactor NewCampaign
2020-07-30 21:54:26 +02:00
60e397abb9
Refactor Network
2020-07-30 21:51:13 +02:00
240e45d62d
Refactor MusicCredits
2020-07-30 21:51:03 +02:00
24fc4119c9
Refactor Multiplayer
2020-07-30 21:28:48 +02:00
915dc5f07c
Refactor MazeConstruction
2020-07-30 21:23:51 +02:00
cd5b506b6b
Refactor MapTooltip
2020-07-30 21:21:08 +02:00
768fcfcba2
Refactor MapGen
2020-07-30 21:18:32 +02:00
bb1d81471d
Fix #12506 : Cannot advertise food if there are no rides in the park
2020-07-29 10:44:38 +02:00
469f894701
Fix #12505 : Stores can only have the first product advertised
2020-07-29 00:08:16 +02:00
63f683853e
Merge pull request #12479 from pizza2004/news-enum
...
Refactor NewsItem to use strong enums
2020-07-28 18:21:45 -03:00
f8ab48176a
Tile Inspector: remove hardcoded surface/edge style names
2020-07-28 22:37:52 +02:00
a3edeabb5c
Refactor NEWS_FLAG_* to use strong enum
2020-07-28 12:54:31 -06:00
c2b11a9582
Close #12398 : Refactor NEWS_TYPE_* to use strong enum
2020-07-28 12:54:31 -06:00
cee7f8d34c
Close #12397 : Refactor NEWS_ITEM_* to use strong enum
2020-07-28 12:54:18 -06:00
b34b573ad9
Refactor more widget definitions ( #12354 )
...
* Refactor Dropdown
* Refactor EditorMain
* Refactor EditorScenarioOptions
* Refactor InstallTrack
Increased window height to 460 (was 448); one line of text was overflowing.
* Refactor Guest
* Refactor LandRights
* Refactor LoadSave
* Refactor Main
* Refactor Map
* Add extra constants to EditorScenarioOptions
2020-07-27 19:54:22 -03:00
af0fc89cf4
Close #12456 : Refactor INPUT_STATE to use strong enum ( #12484 )
2020-07-27 19:51:10 -03:00
6a191224b5
Fix formatting of UiContext.macOS.mm
2020-07-27 17:20:28 +02:00
352870b503
Add OpenURL method, with implementation for Linux and Windows
2020-07-26 22:09:29 +02:00
cf9e8022a0
Fix #12297 : OpenGL renderer causing artifacts
...
Do not re-allocate texture memory if we don't need to and aren't going to restore the old pixels.
2020-07-26 18:46:23 +01:00
8a378ad236
Remove uses of GET_PEEP macro and replace with GetEntity ( #12467 )
...
* Use TryGetEntity and GetEntity instead of macro
* Use GetEntity for ui guest window
* Remove final GET_PEEP macro uses
* Fix remaining issues
2020-07-26 17:42:02 +01:00
9db2aac3bf
Merge pull request #12482 from frutiemax/Fix12457
...
Close #12457 : Refactor INTRO_STATE to use strong enum
2020-07-26 15:40:22 +02:00
6598ae14aa
Close #12457 : Rename INTRO_STATE to use PascalCase
2020-07-26 09:32:53 -04:00
0f1788d273
Part of #12457 : Refactor INTRO_STATE to use strong enum
2020-07-26 09:25:29 -04:00
f1fa016400
Reset window pointer when cleaning up after dropdown
2020-07-26 10:09:56 +02:00
fa2bd4cad6
Refactor PeepType to use strong enum
2020-07-25 11:54:37 +02:00
6ba6184602
Merge pull request #12362 from Gymnasiast/refactor/object-entry-index-null-to-0xFFFF
...
Change ObjectEntryIndex null value to 0xFFFF
2020-07-25 09:25:04 +02:00
4d0d41dfbe
Restore spinner decrease button width ( #12370 )
2020-07-24 19:12:11 +02:00
682add27dd
Change ObjectEntryIndex null value to 0xFFFF
2020-07-23 12:45:42 +02:00
4a235e3bb6
Refactor ResearchItem Type to an enum class ( #12346 )
...
* Change type of ResearchItem.type to enum class
This is to prevent any future issues caused by confusion as to what the type is and further improves the codebase.
* Specifiy a size for the type
Also remove the static cast where not required
* Apply review comments
2020-07-22 14:25:05 +01:00
205fc3332b
Refactor more widget definitions
...
* Increase height for changelog button in about window
* Tackle banner window
* Tackle changelog window
* Tackle custom currency window
* Tackle finance summary
* Tackle quit prompt widgets
* Tackle debug paint widgets
* Tackle demolish and refurbish prompt widgets
2020-07-21 17:38:57 +02:00
7b5087f057
Update copyright year to 2020
2020-07-21 15:04:34 +02:00
8f57c22bfe
Refactor options window widget definitions into new format ( #12316 )
2020-07-21 14:14:44 +02:00
09ece01096
Merge pull request #12303 from AaronVanGeffen/refactor/cheats
...
Refactor cheats window
2020-07-21 11:36:24 +02:00
3d7c0a567e
Introduce local constants per review suggestion
2020-07-20 00:12:04 +02:00
0a5b75e882
Refactor more windows into new-style widget format
...
* Ride Construction
* Ride List
* Save Prompt
* Scenery
* Scenery Scatter
* Server List
* Server Start
* Shortcut Keys
2020-07-19 19:36:54 +02:00
b966173550
Fix #12315 : Re-introduce titles in Finances and Research windows. ( #12317 )
2020-07-19 14:31:24 +02:00
d303f0b1ef
Add constants for common cheat widget sizes.
2020-07-19 11:54:41 +02:00
15704d6d33
Refactor cheat window widget definitions into new format
2020-07-17 22:46:50 +02:00
6375d79c27
Cheats window: unfold existing window-specific macros
2020-07-17 22:46:48 +02:00
cf664c8340
Close #11971 : Replace ride groups with new ride types
2020-07-17 00:19:49 +02:00
f49149222e
Close #12245 : Use coords objects for SetLocation (Window_internal.h)
2020-07-16 23:01:42 +02:00
79ae0786c0
Refactor more widgets definitions into new format
...
* About
* Editor Bottom Toolbar
* Editor Inventions List
* Editor Object Selection
* Error
* Finances
* Footpath
* Game Bottom Toolbar
* Guest List
* Network Status
* News
* News Options
* Player
* Research
* Staff List
* Title Options
* About window.
And fix MakeSpinnerWidgets declaration order.
2020-07-16 20:48:25 +02:00
0fa0ca451e
Part of #12245 : Use coords for window_scroll_to_location ( #12282 )
2020-07-15 23:26:27 -03:00
c474f2ddc0
Close #12096 : Use only ScreenRect on gfx_fill_rect ( #12280 )
2020-07-15 22:34:57 -03:00
289dc96f25
Remove goto from window_create_auto_pos ( #12256 )
...
* Reduce code duplication on window_create_auto_pos
* Remove deadcode from window_create_auto_pos
Cascadin window offset deadcode
* Extract ClampWindowToScreen from window_create_auto_pos
* Remove goto usage from window_create_auto_pos
2020-07-15 22:59:35 +01:00
cd92597ec4
Part of #12096 : Use ScreenRect on gfx_fill_rect in Tile*.cpp ( #12248 )
2020-07-15 16:19:49 -03:00
f36a86e9e6
Use MakeWidget for most Title windows and the ToolTip ( #12264 )
...
* Use MakeWidget for windows/Tooltip.cpp
* Use MakeWidget for windows/TitleScenarioSelect.cpp
* Use MakeWidget for windows/TitleMenu.cpp
* Use MakeWidget for windows/TitleExit.cpp
* Use MakeWidget for windows/TitleLogo.cpp
* Clarify initial size of TitleMenu buttons
2020-07-15 15:48:41 +02:00
d80f9b511f
Merge pull request #12255 from Gymnasiast/refactor/more-constants-in-track-curve
...
Refactor/more constants in track curve
2020-07-15 15:36:42 +02:00
0951c0c5cc
Remove goto from input_state_widget_pressed ( #12265 )
2020-07-15 07:50:01 -03:00
f94c3bc2f3
Close #12242 : Convert TrackDesignPlace static globals to use Coords ( #12249 )
2020-07-15 04:01:16 +02:00
5344bc2e38
Convert terraforming tools to new widget defintions
2020-07-14 23:36:22 +02:00
e080d4655e
Use RideConstructionSpecialPieceSelected in two more places
2020-07-14 01:10:47 +02:00
1034aadb72
Merge pull request #12238 from frutiemax/Fix12223
...
Close #12223 : Assert that Formatter::Add() only receives desired types
2020-07-14 00:05:37 +02:00
5f4e1ba344
Forbid usage of uint8_t* in formatter::Add
2020-07-13 17:40:04 -04:00
84a4c4e473
Part of #12096 : ScreenRect on gfx_fill_rect in windows/Ride.cpp ( #12239 )
2020-07-13 17:49:12 -03:00
b39a0037f0
Close #12164 : Use Coords for place_virtual_track ( #12240 )
2020-07-13 16:37:10 -03:00
59618327af
Part of #12096 : Use ScreenRect on gfx_fill_rect in Map.cpp ( #12230 )
2020-07-13 14:36:49 -03:00
1cf89362f0
Merge pull request #12184 from IntelOrca/sea
...
Add support for reading .sea (RCT classic) files
2020-07-13 17:23:16 +02:00
132b2e5966
Fix #12071 : Crash in Guest List when a guest dies ( #12126 )
...
Send refresh guest list intent on peep removal
Also added protection to guest list to prevent accessing invalid peeps
2020-07-13 09:31:04 -03:00
0fb2a6216c
Close #12099 : Use ScreenLine on gfx_draw_line ( #12143 )
2020-07-12 18:50:52 -03:00
27734e2971
Part of #12160 : Use Coords for viewport_coord_to_map_coord ( #12216 )
2020-07-12 18:42:54 -03:00
508344a088
Close #12174 : Remove Formatter additions with uintptr_t
2020-07-11 18:56:12 +02:00
b43ce35ef5
Fix: Map Generator shows incorrect map sizes ( #12211 )
2020-07-11 12:19:01 -03:00
8c81cacc6f
Add sea decryption
2020-07-11 11:40:34 +01:00
123d0cceb6
Close #12173 : Remove Formatter additions with void* ( #12196 )
2020-07-11 03:06:23 +02:00
0e788918e2
Fix build for latest VS2019
2020-07-10 18:44:26 +01:00
0e96674a46
Part of #12096 : ScreenRect w/ gfx_fill_rect in libopenrct2ui ( #12188 )
2020-07-10 13:59:08 -03:00
dbf00956b5
Fix null pointers reported by launchpad builders ( #12168 )
2020-07-09 22:52:14 +01:00
f29abf6953
Part of #11389 : Use Formatter on Ride::FormatStatusTo ( #12172 )
2020-07-09 18:54:30 +02:00
4aa7dec84f
Part of #12096 : Use ScreenRect on gfx_fill_rect in Widget.cpp ( #12169 )
2020-07-08 23:06:46 -03:00
280a21fa30
Fix #12095 : Use ScreenRect on gfx_set_dirty_blocks ( #12106 )
2020-07-08 13:16:24 -03:00
e8d6383f57
Clean up voucher arguments
2020-07-07 21:13:40 +02:00
8c88f3c6c0
Fix potential null derference ( #12151 )
...
The error is reported by launchpad.net from its PPA builds
2020-07-07 19:57:32 +01:00
8c1aa43ef4
Add TryGetEntity to fetch entity objects easily ( #11979 )
...
Implement TryGetEntity and use it
2020-07-07 13:13:22 -03:00
f7b42a0254
Merge pull request #11980 from duncanspumpkin/CreateSprite8
...
SpriteList enum class
2020-07-06 15:21:16 +02:00
8ce799a72e
Close #12118 : Prefer foward declaration of *Coords* in headers ( #12142 )
...
* Removing unnecessary world/Location includes in headers
* Prefer foward declaration of *Coords* in header files
Closes #12118
2020-07-06 10:10:39 -03:00
8fc8a435cb
Fix #12123 : Long server descriptions are not cut off properly ( #12129 )
2020-07-05 09:18:23 +02:00
57d2877e67
Provide accesor function for get entity list count
2020-07-05 07:28:38 +01:00
ad86f7b023
Part of #12098 : Use ScreenRect on gfx_filter_rect ( #12120 )
...
* Added a gfx_filter_rect function using ScreenRect
2020-07-04 15:16:09 -03:00
e51bbeed23
Convert SPRITE_LIST to an enum class
2020-07-04 07:38:11 +01:00
55f0f34fe0
Close #12101 : gfx_draw_dashed_line to use ScreenLine ( #12116 )
2020-07-03 18:05:18 -03:00
d969e93ea1
Fix #12112 : Move TrackColourPreviews to RideTypeDescriptors ( #12114 )
2020-07-03 22:15:11 +02:00
4661262572
Fix #12085 : Use ScreenCoordsXY on clip_drawpixelinfo ( #12105 )
2020-07-02 14:06:28 -03:00
26ae2dbf04
Part of #11437 : Move PlatformFileExists to Platform2.h ( #12077 )
2020-07-02 12:03:31 -03:00
5056872676
Close #12087 : Use ScreenCoordsXY on gfx_filter_pixel ( #12102 )
2020-07-02 11:08:46 -03:00
cd716ca4aa
Fix #12093 . Incorrect position and animation of staff tab. ( #12094 )
...
Mistake made when refactoring transposed two digits. Additional mistake made when removing a variable that was unused that changed the memory layout of the window. This meant that a part of the code that accessed a different variable in a union fetched the wrong memory. This was a mistake ultimately made during implementation.
2020-07-02 09:19:19 -03:00
a86a60cbf5
Extract ScreenRect from Graph for reusability
2020-06-30 09:32:22 -03:00
33e86ce0d8
Merge pull request #12016 from tupaschoal/screen-coords-string
...
Make interfaces use ScreenCoordsXY instead of x-y
2020-06-30 08:37:14 +02:00
0f106da7eb
Fix #12065 again. Fixed track design previews with diagonals ( #12074 )
...
Unsure when mistake was made but there was a variety of issues with this section of code. The rotation of the entrance was meant to be relative to the track design rotation not the last track pieces rotation. This caused issues for tracks that were not complete circuits. In addition there was a mistake for diagonal track pieces where the location of the end piece was not incremented this caused the diagonal piece to act as though it didn't exist breaking the preview.
2020-06-29 10:58:31 -03:00
b6f252f68e
Make gfx_draw_sprite_raw_masked use ScreenCoordsXY
2020-06-29 10:29:05 -03:00
b7dc5057e5
Make gfx_draw_string_centred_wrapped_partial use ScreenCoordsXY
2020-06-29 10:25:44 -03:00
1717f2a9a3
Make draw_string_centred_raw use ScreenCoordsXY
2020-06-29 10:23:54 -03:00
a0ed2c181e
Make gfx_draw_string_left_centred use ScreenCoordsXY
2020-06-29 10:23:54 -03:00
6dfcc1a8b2
Fix #12065 . Incorrect Entrance/Exit location on td preview
...
Unsure when the mistake was made but it could have been prevented by using const on variables that should be const.
2020-06-28 09:05:14 +01:00
f08206a5d0
Fix #11963 - Refactor Peep::OutsideOfPark ( #12060 )
...
* Fix #11963 - Refactor Peep::OutsideOfPark
Changed the definition of Peep::OutsideOfPark from uint8_t to bool and refactored all its occurences in code accordingly.
* Fix #11963 - Refactor Peep::OutsideOfPark
One forgotten instance of Peep::OutsideOfPark occurrence
* Fix #11963 - Refactor Peep::OutsideOfPark
Fix code according to a review suggestion.
2020-06-28 08:39:30 +01:00
2cb5402069
Introduce widget::textTop
2020-06-26 19:39:30 +02:00
2e153a7e95
Introduce widget::midX and widget::midY helper functions
2020-06-25 10:31:15 +02:00
681b8d7938
Introduce widget::width and widget::height helper functions ( #12053 )
2020-06-24 22:44:00 -03:00
14a07359b3
Part of #11389 : Use formatter class for Ride::FormatNameTo ( #12041 )
2020-06-24 21:02:08 -03:00
a102892370
Merge pull request #11985 from AaronVanGeffen/windows/object-selection
...
Increase widget heights in object selection window
2020-06-24 23:09:10 +02:00
4974d1a9b0
Fix #12050 : scenario options initial happiness value misplaced
...
Fix a mistake made in PR #11984 .
2020-06-24 19:42:03 +02:00
cd6076b5bc
FIx #12017 - Create gfx_draw_sprite overload ( #12049 )
...
Second and final part. replaces the rest of the calls and removes the old function.
2020-06-24 12:48:17 -03:00
9d965ccfb6
Part of #12017 - create gfx_draw_sprite overload ( #12026 )
...
* Part of #12017 - create gfx_draw_sprite overload
Part 1. Creates the overload and replaces about a half of the calls since there are too many for one PR.
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-06-23 18:32:34 -03:00
6e47385b90
Part of #11389 : in peep class, FormatTo* use Formatter class ( #12035 )
2020-06-23 14:52:08 +01:00
32c342e88d
Part of #11389 : Remove FormatTexto that take void* in banner struct ( #12034 )
2020-06-23 14:50:56 +01:00
f86931d8a0
Close #12019 : Use ScreenCoordsXY on gfx_draw_sprite_software
2020-06-22 23:52:54 +02:00
4a17d1d64e
Fix #12020 - Use ScreenCoordsXY on gfx_draw_sprite_palette_set_software ( #12028 )
...
* Fix #12020 - Use ScreenCoordsXY on gfx_draw_sprite_palette_set_software
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-06-21 22:52:48 -03:00
69db54f770
Fix #12018 - gfx_draw_sprite_solid overload ( #12023 )
...
Creates the overload, replaces all calls to the old function and removes the old function.
2020-06-21 11:50:05 -03:00
9efe43fa59
Fix #11562 - gfx_draw_string_left_wrapped overload ( #12015 )
...
I created the overload, replaced remaining calls with the new function and removed the old function.
2020-06-21 06:25:31 -03:00
ef5f117373
Part of #9473 : Create Vehicle::GetRide ( #12002 )
...
* Part of #9473 : Create Vehicle::GetRide
* Redefine Vehicle::GetRide in Compat.cpp
2020-06-21 08:38:53 +01:00
c1546059ad
Close #11571 - Remove <x,y> gfx_draw_string_left overload ( #12010 )
...
Third and final part. replaces the rest of the calls to x,y overload
2020-06-20 16:09:45 -03:00
2264c5f7f1
Part of #11571 - Use gfx_draw_string_left with ScreenCoordsXY ( #12008 )
2020-06-20 11:56:36 -03:00
82618f2441
Merge pull request #11972 from Gymnasiast/fix/7324
...
Fix #7324 : Research window shows vehicle name instead of ride name
2020-06-20 13:46:31 +02:00
e93e32d139
Part of #11571 : create gfx_draw_string_left() overload ( #11984 )
...
Replaces a third of all occurrences of the old function
2020-06-20 00:22:01 -03:00
f8699d1244
Apply review requests; fix error; remove debug code
2020-06-19 23:35:18 +02:00
5029f754ed
Fix #7324 : Research window shows vehicle name instead of ride name
2020-06-19 22:50:53 +02:00
51f32130b3
Part of #11964 : Merge RideColourKey in RideTypeDescriptor ( #11996 )
2020-06-19 20:21:16 +02:00
5a7fbc8054
Fix #11961 : Plugins: ViewportWidget unable to be moved or resized ( #11997 )
...
- Ensure child controls for dropdown and spinners are moved.
- Ensure viewport bounds are re-calculated if widget is moved / resized.
2020-06-19 20:20:58 +02:00
0e9857899e
Use widget height constants in object selection window
...
Replaces hardcoded integers with LIST_ROW_HEIGHT and SCROLLABLE_ROW_HEIGHT.
2020-06-19 08:42:14 +02:00
81dd7c1a7d
Use available vertical text box space for text and cursor
2020-06-19 08:42:12 +02:00
5cb7bf6216
Increase widget heights in object selection window
...
These changes accomodate CJK languages:
* Buttons from 11px to 13px.
* Text box from 11px to 13px.
Furthermore:
* Rename WIDX_FILTER_STRING_BUTTON constant to WIDX_FILTER_TEXT_BOX.
* Rename WINDOW_STAFF_LIST_WIDGET_IDX to WINDOW_EDITOR_OBJECT_SELECTION_WIDGET_IDX.
2020-06-19 08:42:10 +02:00
d66c61ca08
Change map generation button heights ( #11986 )
2020-06-18 23:33:08 +02:00
5e8a3a709d
Merge pull request #11976 from Gymnasiast/refactor/vehicle-preference
...
Move build menu preference to objects themselves
2020-06-17 23:41:10 +02:00
33298d2bde
Fix peep pickup. Mistake made during refactor. ( #11978 )
...
PeepPickupAction assumed that all locations that are passed into the function would be valid locations or null locations. This is not the case when picking up as a dummy value is passed into the function. The caller was fixed by passing a null location as expected by PeepPickupAction.
2020-06-17 21:11:50 +01:00
c77d500394
Move build menu preference to objects themselves
2020-06-17 21:46:37 +02:00
e2b187c24a
Merge pull request #11921 from duncanspumpkin/CreateSprite6
...
Entity List Iterator
2020-06-17 21:28:36 +02:00
de1c172c74
Move RideProperties and rideBonusValue to RideTypeDescriptors
...
Part of #11964 .
2020-06-17 18:59:04 +02:00
96678a14eb
Move ride naming to RTD
...
This also means that all unused ride types will now have the same name. I have made an exception for the 'arbitrary ride type change' dropdown only.
2020-06-16 22:52:48 +02:00
6ed17b4ff9
Remove FOR_ALL_PEEPS/GUESTS/STAFF macros
...
Replaced with an EntityList iterator
Fix formatting
Fix nullptr issues
2020-06-16 20:27:44 +01:00
c45a0536eb
Use new class
2020-06-16 20:27:40 +01:00
904e6c6987
Implement GetSprite and use it in a number of places
...
This will eventually replace all of the get_sprite and try_get_sprite calls
Further use of GetSprite
Use GetSprite in all remaining easy to use functions
Correct formatting
Rename GetSprite to GetEntity
Make suggested changes
Remove const to allow for building
Fix crashes due to next sprite
2020-06-16 20:21:56 +01:00
9cf12e763d
Move RideHeights and max mass to RTDs
2020-06-16 20:57:55 +02:00
140f2d6922
Rename rct_ride_data_5 and its fields to RideHeights
2020-06-16 20:17:07 +02:00
1336e8ad86
Merge pull request #11900 from hdpoliveira/news_cpp
...
Create functions for const access to News queues and refactor use
2020-06-15 22:56:29 -03:00
13df05ce32
Part of #11564 : Use ScreenCoordsXY instead of <x,y>
2020-06-14 12:51:06 -03:00
613cec3f7a
Part of #11564 : gfx_draw_string_centred_clipped with ScreenCoordsXY
2020-06-14 12:26:53 -03:00
ce171164c9
Merge pull request #11932 from tupaschoal/draw_string_right-11569
...
Use ScreenCoordsXY for gfx_draw_string_right
2020-06-14 12:11:10 -03:00
e54a3d89f2
Rename some Peep member variables to use TitleCase ( #11931 )
...
* Rename Peep::destination_tolerance to use TitleCase
* Rename Peep::destination_y to use TitleCase
* Rename Peep::destination_x to use TitleCase
* Rename Peep::trousers_colour to use Title Case
* Rename Peep::tshirt_colour to use TitleCase
* Rename Peep::no_of_rides to use Title Case
* Rename Peep::staff_type to use TitleCase
* Rename Peep::type to use TitleCase
* Rename Peep::sprite_type to use TitleCase
* Rename Peep::sub_state to use TitleCase
* Rename Peep::state to use TitleCase
* Rename Peep::outside_of_park to use TitleCase
* Rename Peep::next_flags to use TitleCase
* Rename Peep::name to use TitleCase
* Rename Peep::NoOfRides to GuestNoOfRides
* Rename Peep::Type to AssignedPeepType
* Rename Peep::GuestNoOfRides to GuestNumRides
2020-06-14 06:31:08 +01:00
1b1f812fc9
Create functions for const access to News queues
2020-06-13 19:35:02 -03:00
d470c51050
Refactor News.cpp functions
2020-06-13 19:34:13 -03:00
de045978de
Implement #11944 : Remember rides sort mode ( #11945 )
2020-06-13 23:36:43 +02:00
f66d103d9a
Move build costs to RTD
2020-06-13 18:48:53 +02:00
b73b7e73e7
Move PriceEstimateMultiplier to ride_cost
2020-06-13 18:48:53 +02:00
a8d21610fb
Improve #4617 : signs causing crashes ( #11094 )
2020-06-12 21:33:07 +02:00
d6baec3f66
Reduce scope of ScreenCoordsXY variables
2020-06-11 18:26:16 -03:00
03ba7e5301
Merge pull request #11933 from AaronVanGeffen/unused-vars
...
Patch unused variables
2020-06-11 12:12:06 -03:00
3090e2af79
Fix compilation failure due to unused vars.
...
Compilation fails due to warnings-turned-errors.
2020-06-11 15:22:06 +02:00
183ee1e595
Part of #11569 : Use ScreenCoordsXY instead of <x,y>
2020-06-11 10:11:33 -03:00
fab0ea131f
Part of #11569 : Use gfx_draw_string_right with ScreenCoordsXY
2020-06-11 10:11:20 -03:00
eb154c7b48
Merge pull request #11915 from tupaschoal/prevent-shadow-peep-6
...
Rename some Peep member variables to use TitleCase
2020-06-10 14:49:21 -03:00
f9c5633c19
Can now pop balloons and quack ducks in title screen. ( #9614 )
...
* Can now pop balloons and quack ducks in title screen.
* Chengelog entry
* Narrow check for misc sprite down to only duck and balloon sprite.
* Update distribution/changelog.txt
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
* Use the IsBalloon and IsDuck functions instead.
* Update src/openrct2-ui/interface/ViewportInteraction.cpp
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
* Squash: Bring code up to date.
* Add nullptr check.
* Update src/openrct2-ui/interface/ViewportInteraction.cpp
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2020-06-10 18:31:33 +01:00
14899f3940
Fix #11926 : Plugin Checkbox and Groupbox widgets crash the game ( #11927 )
2020-06-10 14:00:53 -03:00
a993ad8408
Rename Peep::energy to Energy
2020-06-08 23:34:35 -03:00
92fbb9fc04
Rename Peep::happiness to Happiness
2020-06-08 23:30:27 -03:00
e387539802
Rename Peep::nausea to Nausea
2020-06-08 23:25:37 -03:00
533695cbe6
Rename Peep::hunger to Hunger
2020-06-08 23:18:12 -03:00
aad80d3390
Rename Peep::thirst to Thirst
2020-06-08 23:12:38 -03:00
Łukasz Pękalski