Aaron van Geffen
be626d0b7c
Refactor Editor*, Finances, Guest* to use MakeTab
2020-08-17 20:59:17 +02:00
Jonathan van Tuijl
4117965a4a
Fix Z coordinate in guest debug tab
2020-08-11 03:37:34 +02:00
Jonathan van Tuijl
dcdc782361
Increase minimum window size so pathfind history doesn’t spill out
2020-08-11 03:35:24 +02:00
Duncan
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
Duncan
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
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
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
Matt
fa2bd4cad6
Refactor PeepType to use strong enum
2020-07-25 11:54:37 +02:00
frutiemax
0e96674a46
Part of #12096 : ScreenRect w/ gfx_fill_rect in libopenrct2ui ( #12188 )
2020-07-10 13:59:08 -03:00
Gymnasiast
e8d6383f57
Clean up voucher arguments
2020-07-07 21:13:40 +02:00
frutiemax
4661262572
Fix #12085 : Use ScreenCoordsXY on clip_drawpixelinfo ( #12105 )
2020-07-02 14:06:28 -03: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
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
TomasZilinek
2264c5f7f1
Part of #11571 - Use gfx_draw_string_left with ScreenCoordsXY ( #12008 )
2020-06-20 11:56:36 -03: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
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
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
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
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
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
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
Tulio Leao
7357eeca60
Rename Peep::photo1_ride_ref to Photo1RideRef
2020-06-04 19:16:11 +02:00
Tulio Leao
a2a0fad886
Rename Peep::peep_flags to PeepFlags
2020-06-04 19:16:11 +02:00
Tulio Leao
53bff03a3f
Rename Peep::pathfind_goal to PathfindGoal
2020-06-04 19:16:11 +02:00
Tulio Leao
cad809275e
Rename Peep::pathfind_history to PathfindHistory
2020-06-04 19:16:11 +02:00
Michael Steenbeek
0ba02dd91c
Fix suggestion
2020-06-04 12:41:03 +02:00
Michael Steenbeek
f9417cc5de
Apply suggestion from code review
...
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-06-04 10:16:23 +02:00
Gymnasiast
66a71e009d
Create Rewind method on Formatter
2020-06-03 14:49:04 +02:00
Gymnasiast
02338ffc5c
Migrate 50 more calls to set_format_arg()
2020-06-03 14:49:04 +02:00
Gymnasiast
f640446d58
Migrate 40 calls to set_format_arg()
2020-06-03 14:49:04 +02:00
Tulio Leao
e18abc7e3d
Rename NoOf... to AmountOf... on Peep
2020-05-31 09:13:56 -03:00
Tulio Leao
a987a9ee5e
Rename Peep::paid_to_enter to PaidToEnter
2020-05-30 20:35:06 -03:00
Tulio Leao
3f091d33e2
Rename Peep::paid_on_rides to PaidOnRides
2020-05-30 20:35:05 -03:00
Tulio Leao
414cff9b91
Rename Peep::paid_on_food to PaidOnFood
2020-05-30 20:35:05 -03:00
Tulio Leao
c2f7efa328
Rename Peep::paid_on_souvenirs to PaidOnSouvenirs
2020-05-30 20:35:05 -03:00
Tulio Leao
a729ac1589
Rename Peep::no_of_food to NoOfFood
2020-05-30 20:35:04 -03:00
Tulio Leao
bc7ea40c4b
Rename Peep::no_of_drinks to NoOfDrinks
2020-05-30 20:35:04 -03:00
Tulio Leao
625f7859a4
Rename Peep::no_of_souvenirs to NoOfSouvenirs
2020-05-30 20:35:04 -03:00
Tulio Leao
fd71b1b009
Rename Peep::voucher_type to VoucherType
2020-05-30 20:35:04 -03:00
Tulio Leao
bf228abf55
Rename Peep::voucher_arguments to VoucherArguments
2020-05-30 20:35:03 -03:00
Sohil Adwani
d2565af867
Part of #11562 : gfx_draw_string_left_wrapped() overload ( #11784 )
2020-05-19 21:57:11 -03:00
TusharSariya
2cf95adc4b
Fix #11565 : gfx_draw_string_left_clipped to use ScreenCoordsXY ( #11765 )
...
* Issue #11565 , created overload for gfx_draw_string_left_clipped
Co-authored-by: Tushar <tushar.97@hotmail.com>
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-05-17 19:30:58 -03:00
Tulio Leao
128c1993c1
Rename Peep::balloon_colour to BalloonColour
2020-05-13 23:16:43 -03:00
Tulio Leao
6c57f33dc9
Rename Peep::umbrella_colour to UmbrellaColour
2020-05-13 23:14:45 -03:00
Tulio Leao
222f8df6cb
Rename Peep::hat_colour to HatColour
2020-05-13 23:11:28 -03:00
Tulio Leao
3b632fcf95
Rename Peep::favourite_ride to FavouriteRide
2020-05-13 23:06:40 -03:00
TomasZilinek
9fde6a74c3
Close #11561 : Use ScreenCoordsXY in gfx_draw_string()
...
* Fix #11572 create gfx_draw_string() overload
created the overload and changed all calls of the old function to the new (using const ScreenCoordsXY&)
...
2020-05-10 09:49:15 -03:00
Gymnasiast
f8aeb70398
Apply review requests
2020-05-09 18:07:16 +02:00
Gymnasiast
43556d2dec
Remove ifdefs for LEFT_CLOSEBOX - for now
2020-05-09 18:07:16 +02:00
Gymnasiast
9e4c664944
Replace defines with constexpr
2020-05-09 18:07:16 +02:00
Gymnasiast
96fe3d3b3c
Make WINDOW_SKELETON take a title, height and width
2020-05-09 18:07:16 +02:00
tassaron2
559ede5d14
Add compile option to move close box to the left
2020-05-09 18:07:16 +02:00
Ted John
7b8ffdb865
Refactor peep.intensity into new strict struct
2020-05-09 12:37:51 +01:00
Ted John
d34dec9c27
Create ZoomLevel struct to add two new zoom levels
2020-03-23 15:54:03 +00:00
Gymnasiast
7759b54c2f
Make PeepPickupAction *actually* take a CoordsXYZ
2020-03-07 21:34:04 +01:00
Gymnasiast
8883f428ba
Clean up window vars
2020-03-05 08:03:38 -03:00
Tulio Leao
724a6d4dcf
Make rct_window use ScreenCoordsXY
2020-03-02 20:51:01 -03:00
Tulio Leao
87f724d038
Use Coords objects for viewport_create()
2020-03-02 20:49:59 -03:00
Tulio Leao
9bcd20e0e6
Prefer const ref to send ScreenCoordsXY over
2020-02-29 08:25:48 -03:00
Duncan
b8b539c16e
Modify next_x/y/z to become a CoordsXYZ ( #10680 )
...
* Modify next_x/y/z to become a CoordsXYZ
Should be further scope for refactoring from this.
* Make suggested changes
* Fix default construct issues
2020-02-11 22:01:14 +00:00
Tulio Leao
201d13577e
Use CoordsXY for footpath_get_coordinates_from_pos()
2020-01-12 22:20:29 -03:00
Tulio Leao
47935288d0
Remove raw coordinates overload of get_map_coordinates_from_pos
2019-11-25 17:45:02 -03:00
Tulio Leao
fe3d6f6faf
Use ScreenCoordsXY for scroll_mouse* functions
2019-11-14 08:40:40 -03:00
Tulio Leao
5e888747de
Use mapCoords instead of ScreenCoords
2019-11-12 20:13:14 -03:00
Tulio Leao
892c084cd8
Use ScreenCoordsXY for windows/Footpath
2019-11-11 23:10:51 -03:00
Tulio Leao
afc14183e7
Use ScreenCoordsXY for tool_* functions
2019-10-29 19:02:58 -03:00
Matt
cc6321048f
Refactor window_invalidate to use rct_window::Invalidate
2019-08-11 17:22:00 +02:00
Matt
2053ecb688
Refactor window_scroll_to_viewport to use rct_window::ScrollToViewport
2019-08-11 17:22:00 +02:00
Ted John
93789b9034
Add nullptr checks for get_ride in libopenrct2ui ( #9795 )
2019-08-09 08:06:25 +01:00
Ted John
414b53b56d
Remove ride classifications
2019-08-04 16:43:50 +01:00
Ted John
a3fe00f0a3
Refactor ride list to a manager with iterator
2019-08-04 16:43:50 +01:00
Ted John
40d49b93d3
Do not use user strings for peep names
2019-07-29 19:18:16 +01:00
Ted John
3f45976009
Fix openrct2ui errors
2019-07-29 19:18:16 +01:00
Ted John
3155c661fa
Refactor format peep action
2019-07-29 19:18:16 +01:00
Ted John
6fff2079f9
Refactor ride name to dynamic args and std::string
2019-07-29 19:18:16 +01:00
Ted John
5733d666b3
Do not store park name as a user string
2019-07-21 11:33:15 +02:00
duncanspumpkin
b896f07687
Add PeepPickupAction
...
Move Guest and Staff pickup to the new game action. Rework the game
action so that only one game action is required for the two game
commands. Remove the final game command with a callback.
2019-06-20 19:34:02 +01:00
nexgenration
46889b5381
Implement #9231 : Add sprite_index to Guest Debug Tab
2019-05-27 22:39:03 +02:00
nexgenration
6b232f7e53
Fix#9197: Peep insert new thought ( #9230 )
...
Improve the readability of the codebase by moving functions into the relevant structures.
- Change name of peep_insert_new_thought to InsertNewThought.
- Update InsertNewThought definition to Guest::InsertNewThought.
2019-05-18 09:47:25 +01:00
Ted John
a22f0a53fb
Use localised strings for guest debug tab
2019-05-04 21:48:02 +00:00
Ted John
f50695fc9b
Refactor guest window resize
2019-05-04 16:23:29 +00:00