1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Commit Graph

19214 Commits

Author SHA1 Message Date
frutiemax
642f4f83a8 Merge RideRatingsCalculateFuncTable in RideTypeDescriptor 2020-06-18 09:29:27 -04:00
frutiemax
f6eb9f1cc5 Merge RideRatings in RideTypeDescriptor structure (#11975) 2020-06-17 22:22:52 +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
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
Michael Steenbeek
723e8347ec Merge pull request #11973 from Gymnasiast/refactor/toilet
Replace some Americanisms
2020-06-17 18:53:57 +02:00
Gymnasiast
f0872ab7b8 Replace 'bumper cars' with 'dodgems' 2020-06-17 18:13:00 +02:00
Gymnasiast
9e702d9e01 Replace 'Bathroom' with 'Toilet' 2020-06-17 18:12:13 +02:00
Olivier Wervers
66c3d8d828 Expose park name to plugins (#11970) 2020-06-17 17:33:38 +02:00
Michael Steenbeek
5e3a99a9ac Move RideTypeTrackPaintFunctionsOld declaration to TestPaint (#11969) 2020-06-17 13:52:10 +02:00
Michael Steenbeek
97b99122de Merge pull request #11962 from Gymnasiast/refactor/rtd-rtd-rtd
Move RideNaming, RideHeights and max mass to RTDs
2020-06-17 13:06:26 +02:00
Michael Steenbeek
ba5e730c06 Rename UpdateFlag to HasUpdateFlag; refactor to bool (#11966) 2020-06-17 00:05:37 -03:00
Gymnasiast
f16a80a481 Fix typo in VEHICLE_UPDATE_FLAG_ON_BREAK_FOR_DROP 2020-06-16 23:31:34 +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
Duncan
50d22ededd Create a hookable location checking function for actions (#11860)
* Create a hookable location checking function for actions

* Add location valid to a number of game actions

Actually pass the coordinates to the script

Use LocationValid on further game actions

Add further actions to the LocationValid. Update api

Update remaining actions to use LocationValid

* Fix bug with peep pickup

Adjust api
2020-06-16 20:57:11 +01:00
duncanspumpkin
8eb7356320 Simplify iterator class 2020-06-16 20:27:44 +01:00
duncanspumpkin
9c2f545225 Fix building of testpaint 2020-06-16 20:27:44 +01: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
225ae3a0a9 Add EntityList iterator 2020-06-16 20:26:56 +01:00
duncanspumpkin
a30374d200 Use new iterator
Fix mac builds

Fix minor mistake

Fix vehicle loops
2020-06-16 20:25:47 +01:00
duncanspumpkin
133d8c4a0a 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:25:03 +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
Gymnasiast
2eccef5979 Split max_mass from rct_ride_data_5 2020-06-16 20:00:25 +02:00
Michael Steenbeek
0f12382895 Merge pull request #11959 from irrelevantirreverent/extra-go-karts-subpositions
Add info for go-kart lanes on some track pieces
2020-06-16 15:57:39 +02:00
Irrelevant Irreverent
db85f0c78b Bump network version 2020-06-16 09:08:04 -04:00
Irrelevant Irreverent
efd5b869d1 Update changelog with new feature 2020-06-16 08:57:56 -04:00
Irrelevant Irreverent
416fb64e74 Use proper prefix for track piece comments 2020-06-16 08:51:00 -04:00
Irrelevant Irreverent
6c911f203d Fix spacing in track info and adjust comments 2020-06-16 08:24:20 -04:00
Irrelevant Irreverent
fc25fb68de Add info for go-kart lanes on some track pieces 2020-06-16 08:19:31 -04:00
Michael Steenbeek
8c67eede5b Name track vehicle info lists (#11960) 2020-06-16 12:35:13 +01:00
Hudson Oliveira
994dea2722 Pass only TrackLocation instead of whole vehicle (#11954) 2020-06-16 13:01:25 +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
Duncan
78d062943b Fix #11953: Incorrect shade used for wall banner text 2020-06-15 23:04:34 +02:00
Sohil Adwani
03f016e9ef Smart pointers (#11852)
* Part of #11159 Added smart pointers to a few functions

* Use camelCase for variables

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2020-06-15 19:47:07 +01:00
Hudson Oliveira
feb3fcfd6e Remove gotos from TrackMotionForwardsGetNewTrack (#11955)
* Remove gotos from TrackMotionForwardsGetNewTrack

* Move default case to the bottom of the switch

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2020-06-15 01:25:13 +02:00
Duncan
1e5739b739 Vehicle motion update: small cleanup; work towards unifying code paths 2020-06-14 22:54:34 +02:00
Tulio Leao
112ac33a24 Merge pull request #11952 from tupaschoal/draw_string_centred_11564
Use ScreenCoordsXY for gfx_draw_string_centred_clipped
2020-06-14 17:42:15 -03:00
hdpoliveira
a3fe90c250 Create SpriteBase::Invalidate methods (#11948) 2020-06-14 15:18:07 -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
Michael Steenbeek
d695e1d071 Merge pull request #11942 from Gymnasiast/refactor/rtd-build-cost
Move build costs to RTD
2020-06-13 22:26:05 +02:00
Michael Steenbeek
aff920c874 Add support for importing RCT Modified ride entrances (#11938) 2020-06-13 20:10:43 +02:00