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

132 Commits

Author SHA1 Message Date
Duncan
67bbc8560d Code style: Remove snakes from everything world apart from Map.h (#18273)
* Remove remaining snakes from world (outside of map)

* Initial few desnaking of Map.h
2022-10-11 19:39:24 +01:00
Rik Smeets
7c2ec714f7 Improve method name for level crossing check 2022-10-09 11:01:10 +02:00
Rik Smeets
bba54d2ecc Fix guests 'waiting' on extended railway crossings
On extended railway crossings, guests would stop to 'wait' for the passing train, which would then phase right through them. This change at least allows guests a chance to get to a safe place.
2022-10-08 21:59:26 +02:00
Duncan
5dba30778d Code style: Remove more snakes from the park, maphelper, scenery. (#18222) 2022-10-08 06:56:17 -03:00
duncanspumpkin
2a593b6029 Remove snake cases from Location and LargeScenery 2022-10-05 20:21:56 +01:00
Nick
4aabc00335 Fix: ghosts are counted in guest scenery or fountain thoughts 2022-10-05 17:57:22 +00:00
duncanspumpkin
3e8dc1b2ac Remove snakes from the foopaths 2022-10-04 20:08:14 +01:00
Rik Smeets
6d97bbddf9 Fix #18063: Guests stopping at railway crossings
Guests could stop at railway crossings for actions like taking a picture, watching a ride / a ride being constructed, reading a map etc. This also could mean they'd be in the way for a passing train.

Now, these actions will no longer be performed if the guest is at a crossing.
2022-10-01 19:09:51 +02:00
Duncan
3565a0172d Attack snakes in banners and climate (#18163) 2022-10-01 18:54:15 +02:00
73
b9e677945d Replace 20XX with 2022 (#18158)
* Replace 2020 with 2022

Replace all 2020 headers with 2022

* replace other years with 2022

add missing years
2022-10-01 08:42:14 +01:00
Michael Steenbeek
2e5847d8d4 Merge pull request #18136 from Gymnasiast/refactor/more-imageid
Refactor/more imageid
2022-09-30 22:17:57 +02:00
Rik Smeets
efa7a23773 Fix #18140 & #18143: Invalid read in Staff
The tile element should be determined the same way as is done when checking if the footpath is blocked by a vehicle.

Also added some extra safety checks and made the code a bit more efficient / reusable. For example: when the staff member is not a mechanic, the tile element doesn't have to determined.
2022-09-30 18:00:59 +00:00
Gymnasiast
a69a8fa7e8 Remove uint32_t overloads in Paint functions 2022-09-29 21:17:16 +02:00
Michael Steenbeek
6f3790cf98 Modify ride drawing code to use ImageId 2022-09-28 21:36:56 +02:00
Rik Smeets
6c6ea169f1 Add railway crossing behaviour for staff (#18057) 2022-09-24 07:44:19 +02:00
Michael Steenbeek
31e2d7692c Rename more instances of “vehicle” to “train” 2022-09-22 11:22:18 +02:00
Rik Smeets
b161a46beb Fix visual glitch with litter at sloped path 2022-09-11 16:30:49 +00:00
frutiemax
c2cfa95d1a Add UpdateRideApproachVehicleWaypoints to RTD (#17124) 2022-08-31 22:56:13 -03:00
Rik Smeets
e0648f8ddb Fix guests leaving queue if other guest rejoins it (#17788)
If another guest returns to the queue from the entrance building, guests arriving at the entrance building through the queue could decide to leave it.
2022-08-29 19:57:51 +01:00
Rik Smeets
67ea7e739f Fix #14337: Guest blocking ride entrance (#17743)
If the ride price becomes unaffordable for a guest who is already waiting to enter a vehicle, that guest became stuck due to an animation loop.
2022-08-22 21:15:58 +01:00
Hielke Morsink
7f29e4e39c Make rct_windowclass strong type WindowClass
This already revealed some places where implicit conversions were done, including some where its use was nonsense (MouseInput.cpp).
The changes to the Intent class were necessary to keep things working, and this splits things up more neatly.
2022-08-21 18:38:25 +02:00
frutiemax
f9bb5b2447 Add GetGuestWaypointLocation to RTD (#17750) 2022-08-13 16:53:27 -03:00
Michael Steenbeek
d9e23e9dfa Use ride_type_t instead of uint8_t in more places (#17803)
Part of preparation for making ride types into objects.
2022-08-13 21:49:19 +02:00
Duncan
adc51ad9aa Rework rct_vehicle_colour (#16051)
* Remove rct_vehicle_colour and replace with VehicleColour

* Update network version

* Update replay version
2022-08-13 19:30:30 +00:00
Michael Steenbeek
5661da1c68 Unwrap game action compat wrappers 2022-08-11 00:00:58 +02:00
Gymnasiast
49896ece43 Pass considerOnlyCloseRides to PeepHeadForNearestRideWithFlags() 2022-08-06 15:00:52 +02:00
frutiemax
6868b3dcaf Rename IS_SHOP to IS_SHOP_OR_FACILITY and use it for RideObject 2022-08-06 15:00:52 +02:00
frutiemax
2d75858589 Add IS_FIRST_AID flag 2022-08-06 15:00:52 +02:00
frutiemax
76104cbbee Use RIDE_TYPE_FLAG_IS_TOILET 2022-08-06 15:00:52 +02:00
Gymnasiast
d3fd31c611 Rename rct_string_id to StringId 2022-07-31 22:30:13 +02:00
Hielke Morsink
e2da19f0f7 Add missing includes 2022-07-29 18:45:10 +02:00
Michael Steenbeek
2b859c7099 Remove __ENABLE_LIGHTFX__ define
It is already enabled for all our builds, and upcoming changes to RTD would add a slew more.
Discussed in team chat with Duncan and Hielke.
2022-07-28 21:34:02 +00:00
frutiemax
bc72c7e24c Add UpdateLeaveEntrance field to the RTD (#16986)
Co-authored-by: frutiemax <frutiemax@users.noreply.github.com>
2022-07-26 19:33:54 -03:00
8street
213696ea27 Add option to sell merchandise in random colours
Co-authored-by: 8street <nikolai_e@rambler.ru>
2022-07-12 22:20:49 +00:00
Gymnasiast
06c368694a Update variables containing a CarEntry 2022-07-11 18:06:22 +02:00
Sadret
1b154b1b6e Fix #17450: Ducks can swim on three-corners-up land tile. (#17456) 2022-06-27 21:37:00 -03:00
Ted John
585ebed600 Fix #17297: Crash when switching language (#17370)
* Refactor all uses of IAudioChannel and the audio mixer.
* Use shared_ptr to avoid dead pointers hanging about.
* Reload particular audio channels where necessary after object reload.
2022-06-27 17:41:53 +01:00
Michael Steenbeek
3fae2413db Use “car” instead of the ambiguous “vehicle”, part 1
Currently, the word “vehicle” is used for both “train” and “car”. This is a first effort towards disambiguation.
2022-06-07 20:36:20 +00:00
spacek531
673ec0fa10 Frames rotation count part 1 (#17106)
Refactor vehicle sprite groups

rename rotationType to spriteGroup

remove numframes getters from scobject

add sprite groups getters

add documentation to plugin

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2022-06-03 23:03:02 +01:00
Ted John
a2e6691ac2 Add new audio objects for loading sounds 2022-05-23 22:24:56 +01:00
LordOfLunacy
fa71bbc1b2 Implement requested changes
- Change the GuestPathfinder object to a smart pointer

 - Improved function signatures

 - Added javadoc comments to the abstract base class

 - Converted pointers to references in  pathfinding function calls
2022-05-14 15:28:24 -04:00
LordOfLunacy
eddda64e20 Fixed formatting 2022-05-13 19:59:47 -04:00
LordOfLunacy
45013a90cc Part of pathfinding rework 2022-05-13 19:18:46 -04:00
frutiemax
275e970d69 Add RIDE_TYPE_FLAG_IS_CASH_MACHINE flag to RTD (#17130)
* Add RIDE_TYPE_FLAG_HAS_CASH flag to RTD

* Rename to RIDE_TYPE_FLAG_IS_CASH_MACHINE
2022-05-04 19:37:11 +01:00
spacek531
22c44fac71 Cleanup vehicle drawing code part 4 (#17105)
* Refactor VehiclePaint to take into account NumRotationFrames

* Reduce copied code
2022-04-30 11:26:55 +01:00
spacek531
5659d43f46 Cleanup vehicle drawing code part 3 (#16968)
* Cleanup vehicle drawing code part 3

* Create functions to convert between rotation amounts

* Add regions to ease code navigation
2022-04-30 07:56:23 +01:00
Michael Steenbeek
765bc59acd Merge pull request #14207 from geoff-B/money32-UDL
#14093 User defined literals for Money32
2022-04-06 15:29:26 +02:00
Rik Smeets
760c96224c Prevent slow motion jumps in Maze 2022-04-06 10:42:00 +02:00
Hielke Morsink
4328a355c0 Apply coding style to surrounding variables 2022-04-05 19:55:49 +02:00
Hielke Morsink
fd09fc2ce8 Replace hardcoded thought indices with identifiers 2022-04-05 19:55:48 +02:00