Michael Steenbeek
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
Gymnasiast
3d071cec53
Implement OpenURL for macOS
2020-08-01 14:25:32 +02:00
Duncan
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
Aaron van Geffen
3430076088
Very quickly process remaining review comments
2020-07-31 13:25:08 +02:00
Aaron van Geffen
16a484545a
Use WW in MapGen common widgets
2020-07-31 11:26:49 +02:00
Aaron van Geffen
e6e850e399
Apply suggestions from code review
...
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-07-31 11:25:50 +02:00
Duncan
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
Aaron van Geffen
d32809eaef
Fix formatting for StaffFirePrompt ( #12525 )
2020-07-30 23:06:01 +02:00
Aaron van Geffen
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
Aaron van Geffen
b738c4fa87
Refactor StaffFirePrompt
2020-07-30 22:51:32 +02:00
Aaron van Geffen
fe9d577c2e
Refactor Staff
2020-07-30 22:45:40 +02:00
Aaron van Geffen
e8e61bd987
Refactor Sign
2020-07-30 22:39:09 +02:00
Aaron van Geffen
9b6f6b6216
Refactor Ride
2020-07-30 22:36:42 +02:00
Aaron van Geffen
c1cff7fab0
Refactor Park
2020-07-30 22:25:18 +02:00
Aaron van Geffen
8325ec04ed
Refactor ObjectLoadError
2020-07-30 22:05:11 +02:00
Aaron van Geffen
173c103573
Refactor NewRide
2020-07-30 21:56:51 +02:00
Aaron van Geffen
5e04508a59
Refactor NewCampaign
2020-07-30 21:54:26 +02:00
Aaron van Geffen
60e397abb9
Refactor Network
2020-07-30 21:51:13 +02:00
Aaron van Geffen
240e45d62d
Refactor MusicCredits
2020-07-30 21:51:03 +02:00
Aaron van Geffen
24fc4119c9
Refactor Multiplayer
2020-07-30 21:28:48 +02:00
Aaron van Geffen
915dc5f07c
Refactor MazeConstruction
2020-07-30 21:23:51 +02:00
Aaron van Geffen
cd5b506b6b
Refactor MapTooltip
2020-07-30 21:21:08 +02:00
Aaron van Geffen
768fcfcba2
Refactor MapGen
2020-07-30 21:18:32 +02:00
Michael Steenbeek
bb1d81471d
Fix #12506 : Cannot advertise food if there are no rides in the park
2020-07-29 10:44:38 +02:00
Michael Steenbeek
469f894701
Fix #12505 : Stores can only have the first product advertised
2020-07-29 00:08:16 +02:00
Tulio Leao
63f683853e
Merge pull request #12479 from pizza2004/news-enum
...
Refactor NewsItem to use strong enums
2020-07-28 18:21:45 -03:00
Michael Steenbeek
f8ab48176a
Tile Inspector: remove hardcoded surface/edge style names
2020-07-28 22:37:52 +02:00
pizza2004
a3edeabb5c
Refactor NEWS_FLAG_* to use strong enum
2020-07-28 12:54:31 -06:00
pizza2004
c2b11a9582
Close #12398 : Refactor NEWS_TYPE_* to use strong enum
2020-07-28 12:54:31 -06:00
pizza2004
cee7f8d34c
Close #12397 : Refactor NEWS_ITEM_* to use strong enum
2020-07-28 12:54:18 -06:00
Aaron van Geffen
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
frutiemax
af0fc89cf4
Close #12456 : Refactor INPUT_STATE to use strong enum ( #12484 )
2020-07-27 19:51:10 -03:00
Michał Janiszewski
6a191224b5
Fix formatting of UiContext.macOS.mm
2020-07-27 17:20:28 +02:00
Michał Janiszewski
352870b503
Add OpenURL method, with implementation for Linux and Windows
2020-07-26 22:09:29 +02:00
Ted John
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
Duncan
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
Michael Steenbeek
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
frutiemax
6598ae14aa
Close #12457 : Rename INTRO_STATE to use PascalCase
2020-07-26 09:32:53 -04:00
frutiemax
0f1788d273
Part of #12457 : Refactor INTRO_STATE to use strong enum
2020-07-26 09:25:29 -04:00
Michał Janiszewski
f1fa016400
Reset window pointer when cleaning up after dropdown
2020-07-26 10:09:56 +02:00
Matt
fa2bd4cad6
Refactor PeepType to use strong enum
2020-07-25 11:54:37 +02:00
Michael Steenbeek
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
Aaron van Geffen
4d0d41dfbe
Restore spinner decrease button width ( #12370 )
2020-07-24 19:12:11 +02:00
Gymnasiast
682add27dd
Change ObjectEntryIndex null value to 0xFFFF
2020-07-23 12:45:42 +02:00
Duncan
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
Aaron van Geffen
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
Aaron van Geffen
7b5087f057
Update copyright year to 2020
2020-07-21 15:04:34 +02:00
Aaron van Geffen
8f57c22bfe
Refactor options window widget definitions into new format ( #12316 )
2020-07-21 14:14:44 +02:00
Michael Steenbeek
09ece01096
Merge pull request #12303 from AaronVanGeffen/refactor/cheats
...
Refactor cheats window
2020-07-21 11:36:24 +02:00
Aaron van Geffen
3d7c0a567e
Introduce local constants per review suggestion
2020-07-20 00:12:04 +02:00
Aaron van Geffen
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
Aaron van Geffen
b966173550
Fix #12315 : Re-introduce titles in Finances and Research windows. ( #12317 )
2020-07-19 14:31:24 +02:00
Aaron van Geffen
d303f0b1ef
Add constants for common cheat widget sizes.
2020-07-19 11:54:41 +02:00
Aaron van Geffen
15704d6d33
Refactor cheat window widget definitions into new format
2020-07-17 22:46:50 +02:00
Aaron van Geffen
6375d79c27
Cheats window: unfold existing window-specific macros
2020-07-17 22:46:48 +02:00
Gymnasiast
cf664c8340
Close #11971 : Replace ride groups with new ride types
2020-07-17 00:19:49 +02:00
frutiemax
f49149222e
Close #12245 : Use coords objects for SetLocation (Window_internal.h)
2020-07-16 23:01:42 +02:00
Aaron van Geffen
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
frutiemax
0fa0ca451e
Part of #12245 : Use coords for window_scroll_to_location ( #12282 )
2020-07-15 23:26:27 -03:00
frutiemax
c474f2ddc0
Close #12096 : Use only ScreenRect on gfx_fill_rect ( #12280 )
2020-07-15 22:34:57 -03:00
Tulio Leao
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
frutiemax
cd92597ec4
Part of #12096 : Use ScreenRect on gfx_fill_rect in Tile*.cpp ( #12248 )
2020-07-15 16:19:49 -03:00
Tulio Leao
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
Michael Steenbeek
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
Tulio Leao
0951c0c5cc
Remove goto from input_state_widget_pressed ( #12265 )
2020-07-15 07:50:01 -03:00
frutiemax
f94c3bc2f3
Close #12242 : Convert TrackDesignPlace static globals to use Coords ( #12249 )
2020-07-15 04:01:16 +02:00
Aaron van Geffen
5344bc2e38
Convert terraforming tools to new widget defintions
2020-07-14 23:36:22 +02:00
Gymnasiast
e080d4655e
Use RideConstructionSpecialPieceSelected in two more places
2020-07-14 01:10:47 +02:00
Michael Steenbeek
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
frutiemax
5f4e1ba344
Forbid usage of uint8_t* in formatter::Add
2020-07-13 17:40:04 -04:00
frutiemax
84a4c4e473
Part of #12096 : ScreenRect on gfx_fill_rect in windows/Ride.cpp ( #12239 )
2020-07-13 17:49:12 -03:00
frutiemax
b39a0037f0
Close #12164 : Use Coords for place_virtual_track ( #12240 )
2020-07-13 16:37:10 -03:00
frutiemax
59618327af
Part of #12096 : Use ScreenRect on gfx_fill_rect in Map.cpp ( #12230 )
2020-07-13 14:36:49 -03:00
Michael Steenbeek
1cf89362f0
Merge pull request #12184 from IntelOrca/sea
...
Add support for reading .sea (RCT classic) files
2020-07-13 17:23:16 +02:00
Michael Steenbeek
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
Thamara Andrade
0fb2a6216c
Close #12099 : Use ScreenLine on gfx_draw_line ( #12143 )
2020-07-12 18:50:52 -03:00
frutiemax
27734e2971
Part of #12160 : Use Coords for viewport_coord_to_map_coord ( #12216 )
2020-07-12 18:42:54 -03:00
frutiemax
508344a088
Close #12174 : Remove Formatter additions with uintptr_t
2020-07-11 18:56:12 +02:00
Michael Steenbeek
b43ce35ef5
Fix: Map Generator shows incorrect map sizes ( #12211 )
2020-07-11 12:19:01 -03:00
Ted John
8c81cacc6f
Add sea decryption
2020-07-11 11:40:34 +01:00
frutiemax
123d0cceb6
Close #12173 : Remove Formatter additions with void* ( #12196 )
2020-07-11 03:06:23 +02:00
Ted John
0e788918e2
Fix build for latest VS2019
2020-07-10 18:44:26 +01:00
frutiemax
0e96674a46
Part of #12096 : ScreenRect w/ gfx_fill_rect in libopenrct2ui ( #12188 )
2020-07-10 13:59:08 -03:00
Michał Janiszewski
dbf00956b5
Fix null pointers reported by launchpad builders ( #12168 )
2020-07-09 22:52:14 +01:00
Tulio Leao
f29abf6953
Part of #11389 : Use Formatter on Ride::FormatStatusTo ( #12172 )
2020-07-09 18:54:30 +02:00
frutiemax
4aa7dec84f
Part of #12096 : Use ScreenRect on gfx_fill_rect in Widget.cpp ( #12169 )
2020-07-08 23:06:46 -03:00
frutiemax
280a21fa30
Fix #12095 : Use ScreenRect on gfx_set_dirty_blocks ( #12106 )
2020-07-08 13:16:24 -03:00
Gymnasiast
e8d6383f57
Clean up voucher arguments
2020-07-07 21:13:40 +02:00
Michał Janiszewski
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
Duncan
8c1aa43ef4
Add TryGetEntity to fetch entity objects easily ( #11979 )
...
Implement TryGetEntity and use it
2020-07-07 13:13:22 -03:00
Michael Steenbeek
f7b42a0254
Merge pull request #11980 from duncanspumpkin/CreateSprite8
...
SpriteList enum class
2020-07-06 15:21:16 +02:00
Thamara Andrade
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
Aaron van Geffen
8fc8a435cb
Fix #12123 : Long server descriptions are not cut off properly ( #12129 )
2020-07-05 09:18:23 +02:00
duncanspumpkin
57d2877e67
Provide accesor function for get entity list count
2020-07-05 07:28:38 +01:00
annoyingdroid
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
duncanspumpkin
e51bbeed23
Convert SPRITE_LIST to an enum class
2020-07-04 07:38:11 +01:00
DrunkBlood
55f0f34fe0
Close #12101 : gfx_draw_dashed_line to use ScreenLine ( #12116 )
2020-07-03 18:05:18 -03:00
frutiemax
d969e93ea1
Fix #12112 : Move TrackColourPreviews to RideTypeDescriptors ( #12114 )
2020-07-03 22:15:11 +02:00
frutiemax
4661262572
Fix #12085 : Use ScreenCoordsXY on clip_drawpixelinfo ( #12105 )
2020-07-02 14:06:28 -03:00
frutiemax
26ae2dbf04
Part of #11437 : Move PlatformFileExists to Platform2.h ( #12077 )
2020-07-02 12:03:31 -03:00
annoyingdroid
5056872676
Close #12087 : Use ScreenCoordsXY on gfx_filter_pixel ( #12102 )
2020-07-02 11:08:46 -03:00
Duncan
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
Tulio Leao
a86a60cbf5
Extract ScreenRect from Graph for reusability
2020-06-30 09:32:22 -03:00
Michael Steenbeek
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
Duncan
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
Tulio Leao
b6f252f68e
Make gfx_draw_sprite_raw_masked use ScreenCoordsXY
2020-06-29 10:29:05 -03:00
Tulio Leao
b7dc5057e5
Make gfx_draw_string_centred_wrapped_partial use ScreenCoordsXY
2020-06-29 10:25:44 -03:00
Tulio Leao
1717f2a9a3
Make draw_string_centred_raw use ScreenCoordsXY
2020-06-29 10:23:54 -03:00
Tulio Leao
a0ed2c181e
Make gfx_draw_string_left_centred use ScreenCoordsXY
2020-06-29 10:23:54 -03:00
duncanspumpkin
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
TomasZilinek
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
Aaron van Geffen
2cb5402069
Introduce widget::textTop
2020-06-26 19:39:30 +02:00
Aaron van Geffen
2e153a7e95
Introduce widget::midX and widget::midY helper functions
2020-06-25 10:31:15 +02:00
Aaron van Geffen
681b8d7938
Introduce widget::width and widget::height helper functions ( #12053 )
2020-06-24 22:44:00 -03:00
frutiemax
14a07359b3
Part of #11389 : Use formatter class for Ride::FormatNameTo ( #12041 )
2020-06-24 21:02:08 -03:00
Michael Steenbeek
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
TomasZilinek
4974d1a9b0
Fix #12050 : scenario options initial happiness value misplaced
...
Fix a mistake made in PR #11984 .
2020-06-24 19:42:03 +02:00
TomasZilinek
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
TomasZilinek
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
frutiemax
6e47385b90
Part of #11389 : in peep class, FormatTo* use Formatter class ( #12035 )
2020-06-23 14:52:08 +01:00
frutiemax
32c342e88d
Part of #11389 : Remove FormatTexto that take void* in banner struct ( #12034 )
2020-06-23 14:50:56 +01:00
frutiemax
f86931d8a0
Close #12019 : Use ScreenCoordsXY on gfx_draw_sprite_software
2020-06-22 23:52:54 +02:00
frutiemax
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
TomasZilinek
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
TomasZilinek
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
Hudson Oliveira
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
TomasZilinek
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
TomasZilinek
2264c5f7f1
Part of #11571 - Use gfx_draw_string_left with ScreenCoordsXY ( #12008 )
2020-06-20 11:56:36 -03:00
Michael Steenbeek
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
TomasZilinek
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
Gymnasiast
f8699d1244
Apply review requests; fix error; remove debug code
2020-06-19 23:35:18 +02:00
Gymnasiast
5029f754ed
Fix #7324 : Research window shows vehicle name instead of ride name
2020-06-19 22:50:53 +02:00
frutiemax
51f32130b3
Part of #11964 : Merge RideColourKey in RideTypeDescriptor ( #11996 )
2020-06-19 20:21:16 +02:00
Ted John
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
Aaron van Geffen
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
Aaron van Geffen
81dd7c1a7d
Use available vertical text box space for text and cursor
2020-06-19 08:42:12 +02:00
Aaron van Geffen
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
Aaron van Geffen
d66c61ca08
Change map generation button heights ( #11986 )
2020-06-18 23:33:08 +02:00
Michael Steenbeek
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
Duncan
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
Gymnasiast
c77d500394
Move build menu preference to objects themselves
2020-06-17 21:46:37 +02:00
Michael Steenbeek
e2b187c24a
Merge pull request #11921 from duncanspumpkin/CreateSprite6
...
Entity List Iterator
2020-06-17 21:28:36 +02:00
frutiemax
de1c172c74
Move RideProperties and rideBonusValue to RideTypeDescriptors
...
Part of #11964 .
2020-06-17 18:59:04 +02:00
Gymnasiast
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
duncanspumpkin
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
duncanspumpkin
c45a0536eb
Use new class
2020-06-16 20:27:40 +01:00
duncanspumpkin
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
Gymnasiast
9cf12e763d
Move RideHeights and max mass to RTDs
2020-06-16 20:57:55 +02:00
Gymnasiast
140f2d6922
Rename rct_ride_data_5 and its fields to RideHeights
2020-06-16 20:17:07 +02:00
Tulio Leao
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
Tulio Leao
13df05ce32
Part of #11564 : Use ScreenCoordsXY instead of <x,y>
2020-06-14 12:51:06 -03:00
Tulio Leao
613cec3f7a
Part of #11564 : gfx_draw_string_centred_clipped with ScreenCoordsXY
2020-06-14 12:26:53 -03:00
Tulio Leao
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
Tulio Leao
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
hdpoliveira
1b1f812fc9
Create functions for const access to News queues
2020-06-13 19:35:02 -03:00
hdpoliveira
d470c51050
Refactor News.cpp functions
2020-06-13 19:34:13 -03:00
Aaron van Geffen
de045978de
Implement #11944 : Remember rides sort mode ( #11945 )
2020-06-13 23:36:43 +02:00
Gymnasiast
f66d103d9a
Move build costs to RTD
2020-06-13 18:48:53 +02:00
Gymnasiast
b73b7e73e7
Move PriceEstimateMultiplier to ride_cost
2020-06-13 18:48:53 +02:00
Michał Janiszewski
a8d21610fb
Improve #4617 : signs causing crashes ( #11094 )
2020-06-12 21:33:07 +02:00
Tulio Leao
d6baec3f66
Reduce scope of ScreenCoordsXY variables
2020-06-11 18:26:16 -03:00
Tulio Leao
03ba7e5301
Merge pull request #11933 from AaronVanGeffen/unused-vars
...
Patch unused variables
2020-06-11 12:12:06 -03:00
Aaron van Geffen
3090e2af79
Fix compilation failure due to unused vars.
...
Compilation fails due to warnings-turned-errors.
2020-06-11 15:22:06 +02:00
Tulio Leao
183ee1e595
Part of #11569 : Use ScreenCoordsXY instead of <x,y>
2020-06-11 10:11:33 -03:00
Tulio Leao
fab0ea131f
Part of #11569 : Use gfx_draw_string_right with ScreenCoordsXY
2020-06-11 10:11:20 -03:00
Tulio Leao
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
XplosiveLugnut
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
Ted John
14899f3940
Fix #11926 : Plugin Checkbox and Groupbox widgets crash the game ( #11927 )
2020-06-10 14:00:53 -03:00
Tulio Leao
a993ad8408
Rename Peep::energy to Energy
2020-06-08 23:34:35 -03:00
Tulio Leao
92fbb9fc04
Rename Peep::happiness to Happiness
2020-06-08 23:30:27 -03:00
Tulio Leao
e387539802
Rename Peep::nausea to Nausea
2020-06-08 23:25:37 -03:00
Tulio Leao
533695cbe6
Rename Peep::hunger to Hunger
2020-06-08 23:18:12 -03:00
Tulio Leao
aad80d3390
Rename Peep::thirst to Thirst
2020-06-08 23:12:38 -03:00
Tulio Leao
3dd4adeb81
Rename Peep::toilet to Toilet
2020-06-08 23:10:18 -03:00
Tulio Leao
4f9227fd83
Rename Peep::intensity to Intensity
2020-06-08 22:55:07 -03:00
Tulio Leao
f1337768f5
Rename Peep::nausea_tolerance to use TitleCase
2020-06-08 22:41:15 -03:00
Tulio Leao
f732c2f1cd
Rename Peep::window_invalidate_flags to use TitleCase
2020-06-08 22:25:54 -03:00
Tulio Leao
1c566eebcb
Rename Peep::paid_on_drink to PaidOnDrink
2020-06-08 20:23:14 -03:00
Tulio Leao
1ee5653c8c
Rename Peep::photo2_ride_ref to use TitleCase
2020-06-08 17:36:35 -03:00
Tulio Leao
397c1137db
Rename Peep::photo3_ride_ref to use TitleCase
2020-06-08 17:36:35 -03:00
Tulio Leao
df87daaa6e
Rename Peep::photo4_ride_ref to use TitleCase
2020-06-08 17:36:35 -03:00
Michael Steenbeek
a0c6752ff3
Merge pull request #11882 from tupaschoal/prevent-shadow-peep-4
...
Rename some Peep member variables to use TitleCase
2020-06-07 23:35:23 +02:00
Michael Steenbeek
9ef8d6da42
Convert most remaining C-style casts to C++-style ones ( #11867 )
2020-06-07 23:18:11 +02:00
Michael Steenbeek
7646f1b7e4
Merge pull request #11896 from hdpoliveira/update_flags
...
Update flags
2020-06-07 23:03:48 +02:00
hdpoliveira
5b1469b8b7
Create Vehicle::GetTrackType() ( #11895 )
2020-06-07 21:43:32 +01:00
hdpoliveira
480d1a6d6b
Create Vehicle::ClearUpdateFlag
2020-06-07 17:16:12 -03:00
Tulio Leao
4cdfccb338
Rename Peep::id to Id
2020-06-06 11:53:51 -03:00
Tulio Leao
77af2326ff
Rename Peep::cash_in_pocket to CashInPocket
2020-06-06 11:53:50 -03:00
Tulio Leao
0fc7bd1afd
Rename Peep::cash_spent to CashSpent
2020-06-06 11:26:04 -03:00
Tulio Leao
cf4b052cd4
Rename Peep::time_in_park to TimeInPark
2020-06-06 11:26:04 -03:00
Tulio Leao
e08c1b44b2
Rename Peep::thoughts to Thoughts
2020-06-06 10:03:58 -03:00
duncanspumpkin
5c48e5f0bb
Remove AsPeep
2020-06-06 11:36:48 +01:00
duncanspumpkin
6e78d8d654
Remove AsBalloon
2020-06-06 11:36:48 +01:00
duncanspumpkin
517ed57593
Remove IsPeep
2020-06-06 11:36:48 +01:00
duncanspumpkin
f5772fae48
Remove IsDuck
2020-06-06 11:36:47 +01:00
duncanspumpkin
4485937560
Remove IsBalloon
2020-06-06 11:36:47 +01:00
Michael Steenbeek
f21ddb0723
Refactor checks for station pieces ( #11876 )
2020-06-05 17:55:15 -03:00
Michael Steenbeek
4efd3dbfbf
Merge pull request #11866 from Gymnasiast/refactor/set_format_arg_be_gone
...
Move calls to set_format_arg to Formatter::Common()
2020-06-04 23:20:37 +02:00
Ted John
d0a8c9fa92
Fix plugin, window update not being called ( #11871 )
...
For windows with no tabs.
2020-06-04 21:14:49 +01:00
Tulio Leao
6dc08afdd0
Rename Peep:staff_id to StaffId
2020-06-04 19:16:24 +02:00