mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
19,253 Commits 7 Branches 39 Tags 353 MiB
Commit Graph

2032 Commits

Author SHA1 Message Date
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 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