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

741 Commits

Author SHA1 Message Date
Michael Steenbeek
4e7d5d987a Merge pull request #21745 from rik-smeets/fix-stuck-boat-hire
Fix #866: Boat Hire boats get stuck entering track
2024-04-10 12:16:38 +02:00
Rik Smeets
b009643ab0 Remove to do statement by explicit null check on collideVehicle 2024-04-10 07:58:39 +02:00
Rik Smeets
e250ec3b66 Fix #866: Boat Hire boats get stuck entering track 2024-04-10 07:58:39 +02:00
Rik Smeets
2a78399418 Introduce BoatHireSubState enum 2024-04-10 07:58:36 +02:00
Gymnasiast
c158854a7f Move Park into namespace, add other park-related things to struct 2024-04-04 18:14:27 +02:00
ζeh Matt
84d1f502b1 Rename NO_TRAIN to kNoTrain 2024-03-30 23:18:51 +01:00
Claudio Tiecher
2c4c2da319 Part of #21421: Refactor VEHICLE_SEAT_PAIR_FLAG 2024-03-25 16:17:32 +01:00
Claudio Tiecher
13e9ff84c2 Part of #21421: Replace define with constexpr (#21626)
* Part of #21421: Refactor RIDE_INITIAL_RELIABILITY in Ride.h

* Part of #21421: Refactor STATION_DEPART_FLAG and STATION_DEPART_MASK

* Part of #21421: Refactor MAX_STATION_PLATFORM_LENGTH

* Part of #21421: Refactor RIDE_RATING_UNDEFINED

* Part of #21421: Refactor TRACK_BLOCK_END

* Part of #21421: Refactor TRACK_PREVIEW_IMAGE_SIZE

* Part of #21421: Refactor based on feedback

* Part of #21421: Fix signed/unsigned mismatch on Win

* Improved consistency kTrackPreviewImageSize

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>

* Part of #21421: kMaxStationPlatformLength to int8

---------

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2024-03-24 21:49:50 +00:00
Michał Janiszewski
0581b1edd3 Fix #18413: Trying to set tooltip using null vehicle (#21662) 2024-03-24 21:21:18 +01:00
Duncan
5a70fd97fb Move vehicle sounds update into Ui library (#21577)
* Move vehicle sounds update into Ui library

* Add missing statics

* Apply review comments

* Sprinkle some const

* Clang format accumulate
2024-03-20 11:14:52 +00:00
Claudio Tiecher
59958a6b8f Part of #21421: replace define with constexpr in Ride.h (#21602) 2024-03-16 06:34:01 -03:00
Harry Hopkinson
25d3db0f1f Move gParkRatingCasualtyPenalty to GameState_t (#21610) 2024-03-16 06:24:50 -03:00
Harry Hopkinson
9ab18e37a2 Cleanup static_cast's
Cleanup static_cast's

Cleanup static_casts'

Cleanup static_casts'

Format Code

Address requested changes

Address requested changes

Change uint16_t to size_t

Stop undefined behaviour

Address requested changes.
2024-03-06 10:28:45 +00:00
Harry-Hopkinson
56df39dcb4 Replace uint8's with EnumValue
Replace uint8's with EnumValue

Replace uint8's with EnumValue

Revertl arge change

Revert large change

Format
2024-03-04 19:04:18 +00:00
Harry Hopkinson
701bbda164 Move gEditorStep to GameState_t (#21492)
* Move gEditorStep to GameState_t

* Fix compilation on GCC

---------

Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
2024-03-01 20:26:20 +00:00
Gymnasiast
d413f7dd48 Fix formatting 2024-02-04 22:55:57 +01:00
frutiemax
376d69090b Remove goto label loc_6DC743 2024-02-04 22:55:35 +01:00
frutiemax
c8d836bc09 Remove goto label loc_6DC985 2024-02-04 22:55:35 +01:00
frutiemax
580852351f Remove goto label loc_6DC99A 2024-02-04 22:55:34 +01:00
frutiemax
535b485d37 Remove goto label loc_6DCD2B 2024-02-04 21:41:00 +01:00
frutiemax
714b2a1ace Remove goto loc_6DCD4A 2024-02-04 21:41:00 +01:00
frutiemax
1cd1b7ca87 Remove goto label loc_6DC9BC 2024-02-04 21:41:00 +01:00
frutiemax
760a6aa337 Remove goto label loc_6DCC2C 2024-02-04 21:41:00 +01:00
frutiemax
83d840f3a5 Remove goto label loc_6DCD6B 2024-02-04 21:41:00 +01:00
frutiemax
62be6090a8 Remove goto label 6DC476 2024-02-04 21:41:00 +01:00
frutiemax
b512914c4b Remove goto 6DCDE4 2024-02-04 21:41:00 +01:00
ζeh Matt
a5dde0f8dc Replace gCurrentTicks with the one in GameState_t 2024-01-19 16:32:19 +02:00
Gymnasiast
cffc55e165 Rename fields of TrackDefinition 2024-01-17 23:33:19 +01:00
James103
1d8dc111f1 Replace 2023 with 2024 in copyright headers (#21139)
Replace all instances of the year 2023 with 2024 in all copyright headers
2024-01-01 12:52:28 +01:00
spacek531
6162ff9b00 Replace TrackElemType::Booster reference with TrackTypeIsBooster() (#21044) 2023-12-06 08:18:41 -03:00
Spacek531
b44e522262 rename SetBrakeClosed2 to SetBrakeClosedMultiTile 2023-10-01 18:58:06 -07:00
Spacek531
37c1b5dd7a make SetBrakesClosed2 a standalone function 2023-10-01 18:58:06 -07:00
Spacek531
88ee7445d7 fix replay issue 2023-10-01 18:58:05 -07:00
spacek531
79730e50fd Diagonal Brakes and Block Brakes 2023-10-01 18:58:03 -07:00
Matthias Moninger
379287ed0f Remove legacy stuff in common.h (#20523)
* Remove old interop macro

* Remove legacy string macro things

* Unbreak the posix/linux/unix builds

* Add String::IEquals and use it for case insensitive compare

* Add missing include for posix

* Replace _strnicmp with String::StartsWith

* Add LoByte and HiByte into Util.h, swap macros

* Fix android build

* Hopefully last of the string things

* Replace STUB directly with the warning
2023-07-02 12:59:20 +03:00
Aaron van Geffen
d425e0a8bb Remove const qualifier from constexpr statements 2023-06-24 11:45:26 +02:00
zzril
d6ffdb0aa1 Add Pitch values for steep diagonal drops to checks in UpdateScreamSound
The checks in UpdateScreamSound (rct2: 0x006D796B) forgot about (steep)
diagonal drops. This resulted in riders' screams getting cut-off on
(long) steep diagonal drops once the last car reached the maximum drop
angle, and the screams re-starting as soon as the first car reached the
valley.
2023-06-20 23:17:56 +02:00
kyphii
c74e69b8a0 Fix #20027: Looping coaster with the reverse train option makes the wrong sound (#20028)
* Always use carEntry 0 for friction sound

* Use front car entry for sound index

* Add note for carEntry sound properties

* Bump network version

---------

Co-authored-by: Trevor Finney <8711258+finneyt@users.noreply.github.com>
2023-04-24 08:03:01 +01:00
kyphii
6dfc6225e2 "Reversed Trains" Option (#19305)
* Initial commit for backwards-facing trains

* Allow persistence for reversed cars across save/load

* Make log flume turntable compatible with new reversal implementation

* Style fixes + Better implementation of inverted bank angles

* Further Style Fixes

* Code cleanup from PR feedback

* Fix GetBankRotationForDrawing function declaration

* Use update flag for reversed state

* Replace modulo operation with bit mask

* Correct guest pathing destination when entering reversed cars

* More style fixes

* Add plugin support for reversed vehicles

* Fix formatting error

* Derive reversal from ride mode for car spawning

* Formatting

* Rename function to GetPaintBankRotation

* Add reversed trains modes to Multi Dimension Coaster

* Change name of isReversed plugin API parameter for consistency

* Replace reversal operating modes with separate ride setting

* Add ALLOW_REVERSED_TRAINS flag to more ride types

* Make clang-format happy

* More Formatting

* Fix ALLOW_REVERSED_TRAINS flag on a couple rides

* Exclude flat rides from Reverse Trains tickbox when cheats are enabled

* Formatting

* Use Disable Vehicle Limits cheat for checkbox appearance condition

* Use correct swinging sprites when cars are reversed

* Update changelog and Plugin/Network/Park version numbers

* Formatting

* Add separate error String ID for clarity

* Add name to contributors.md

* Fix ride vehicle preview window with reversed trains for RCT1 train types

* Bump version numbers again

---------

Co-authored-by: Trevor Finney <8711258+finneyt@users.noreply.github.com>
2023-04-21 19:22:33 +03:00
Rik Smeets
d10be6d0e7 Fix #19911: Guests stuck at railway crossings (#19939)
In continuous circuit operating mode, not only the train head should be used for (un)blocking path. Because of this change, a previous change regarding which trailing track blocks should be unblocked has been reverted, as to prevent path being unblocked too soon.
2023-04-20 18:53:21 +02:00
Spacek531
fdeb311ad3 remove redundant condition 2023-04-11 19:28:27 -07:00
Spacek531
7fe9580131 vehicle chooses between brake speed and block brake speed 2023-04-11 19:28:26 -07:00
Spacek531
6488f0397e link brake open to block brake open 2023-04-11 19:28:26 -07:00
Spacek531
99ffaa8b71 allow block brakes to be built with speed 2023-04-11 19:28:17 -07:00
ζeh Matt
7d764f52a1 Fix formatting 2023-04-08 14:51:33 +03:00
ζeh Matt
8f82aa95b3 Move Direction out and rename it to Orientation to avoid name conflict 2023-04-07 22:46:25 +03:00
ζeh Matt
679f5aac2e Rename members of EntitySpriteData 2023-04-07 19:47:26 +03:00
ζeh Matt
dce21bc8ec Split move sprite specific data into EntitySpriteData 2023-04-07 19:37:47 +03:00
Rik Smeets
f8b30fbb36 Reduce guests walking through trains on level crossing next to station (#19619) 2023-04-02 17:38:00 +02:00
spacek531
fdbc3d29bb steam position modifier and animation speed properties (#11269)
* Add speed and frame properties

* add steam position modifier

* copy code from OpenLoco

* update sin and cos

* add computation function

* finalize locomotion code

* fix formatting

* refine code

* refactor things slightly

* manually fix formatting

* use PascalCase and rename

* fix copyright notice

* fix name again

* rename function, move outt  of namespace

* fix rebase issues

* remove pitch table derived from physics

* rename some stuff

* flip vertical component sign to make sense

* change json structure

* create steam particles based on number of animation frames

* fix formatting

* add slope for spiral lift hill down

* fix formatting again

* parens around bitwise and

* make animations separate functions

* rename MultiDimCoaster to MultiDimension

* use EnumValue method

* rework multidim frame count

* bump network to be safe

* fix formatting

* move array out of function

* make table const

* move struct into RideObject.cpp

* try new method to fix numbers in multidim

* implement ZehMatt modulo

* add documentation to new function

* include Yaw.hpp

* rename src/ride/SteamPosition.hpp to src/math/Trigonometry.hpp

* actually add src/math/Trigonometry.hpp

* move ComputeSteamOffset to Vehicle.cpp

* use static asserts on arrays

* fix changelog grammar

* add more static asserts
2023-03-09 15:45:45 +02:00