1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-28 09:14:58 +01:00
Commit Graph

533 Commits

Author SHA1 Message Date
Duncan
df7a284822 Entity type 2: Remove sprite_identifier (#14334)
* Start changing the underlying type

* Further work

* Complete refactor

* Further cleanup

* Remove pointless check

* Increment network and plugin versions

* Add defaults

* Further defaults

* Fix test paint

* Update replays
2021-03-17 08:04:41 +00:00
Duncan
6ec379cd0e Split Entity Lists by Entity type (#14326)
* Make initial changes to add entity type

* Make further corrections

* Revert header changes

* Fix mistakes
2021-03-16 11:18:06 +00:00
Duncan
5474194905 Implement train view and remove linked_list_index (#13956)
* Make train manager view

* Remove linked list index field

* Remove merge mistake

* Fix further rebase errors

* Rename and add comments

* Update replays

* Fix Xcode project

* Increment network version

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2021-03-15 08:13:00 +00:00
Gymnasiast
44d0e77afb Make all access to RTD table use the bounds checking function 2021-02-26 10:01:00 +01:00
Gymnasiast
62f8796677 Replace more flag checking 2021-02-26 09:51:17 +01:00
Gymnasiast
56399e7188 Use the RTD instead of ride_type_has_flag() 2021-02-24 14:10:30 +01:00
Matt
5b42fa0dbb Simplify velocity acceleration 2021-02-21 09:59:05 +02:00
ζeh Matt
d3cae77230 Merge pull request #14129 from ZehMatt/refactor/UpdateSwingingCar
Refactor UpdateSwingingCar function
2021-02-21 09:58:15 +02:00
Matt
a232749b2f Refactor UpdateSwingingCar function 2021-02-21 09:30:17 +02:00
Michael Steenbeek
345c436f19 Fix #14119: Illegal array access in vehicle_move_info_valid() 2021-02-20 22:53:40 +01:00
Gymnasiast
1b964c0f2e Refactor flat ride track pieces 2021-02-18 17:50:19 +01:00
Duncan
14cca95fec Fix #14067: Nullptr exception in vehicle measurement code 2021-02-11 09:49:13 +01:00
Michael Steenbeek
f75a48d8dc Merge pull request #14034 from Gymnasiast/fix/12939
Fix #12939: divide-by-0 in Vehicle::UpdateMotionDodgems()
2021-02-09 22:18:49 +01:00
Gymnasiast
25b26e769d Rename ebx to momentum 2021-02-09 20:32:05 +01:00
Michael Steenbeek
7744458cc8 Fix #12861: Divide-by-0 in UpdateTrackMotionMiniGolf
This fix had already been applied to UpdateTrackMotionPoweredRideAcceleration(), but not here.
2021-02-09 20:02:15 +01:00
Gymnasiast
45464cddeb Fix #12939: divide-by-0 in Vehicle::UpdateMotionDodgems() 2021-02-09 19:13:38 +01:00
Duncan
9d3f3fa224 Fix #13234. Check for correct peep state when removing mass (#13983)
* Check for correct peep state when removing mass

* Add apply mass function

* Increment network version

* Fix #13234. Add to changelog
2021-02-03 09:13:56 +00:00
Michael Steenbeek
e3a1af3d05 Use getters/setters for track type and direction 2021-01-30 15:16:17 +01:00
spacek531
1e3fe9b550 Separate booster track elem type (#13857)
* add data to Track.cpp

add data to TrackData.cpp

add import helper functions

fix Booster value

import booster as 256

export booster as 100

add vehicle subposition data

add SV4 import

add TD4 import

add TD6 import

use track_type_t when importing TD6

add TD6 export

change peep tracktype type to auto

fix SV4 track element import

fix import of booster speed

add None enum to TrackElemType

move _legacy RideConstruction functions to Ride.cpp

change _currentPossibleRideConfigurations to use track_type_t

fix booster track category

add booster string tto

expand _currentTrackCurve to 32 bits

expand track_curve_chain to 32 bits

update get_track_element et al. to handle 16 bit track types

run clang-format

remove unused #includes from _legacy.cpp

Revert "remove unused #includes from _legacy.cpp"

This reverts commit 4c4d4b06edb0c130314789d8fe371246be246c9f.

Revert "update get_track_element et al. to handle 16 bit track types"

This reverts commit 73920dafd4a6c9e7c9f0c7ee1098d493f8f5d262.

Revert "move _legacy RideConstruction functions to Ride.cpp"

This reverts commit 2d83a75c1477d387ad77a7a5085f37a28f72a589.

update _legacy functions for 16-bit track types

update ride_construction_reset_current_piece behavior with new enum

fix declaration of _currentTrackCurve to match other track tcurve vars

remove unused include from T4Importer.cpp

move SCT to 256 part 1: RideConstruction.cpp

move SCT to 256 part 2: TrackData.cpp

move SCT to 256 part 3: Ride.h/Ride.cpp

move SCT to 256 Part 4: revert changes to S4Importer.cpp, T4Importer.cpp

fix stations appearing as curves

fix too many initializers in TrackData.cpp

move SCT to 256 part 5: S6/T6 importing and exporting

move SCT to 256 part 6: simplify RCT12.cpp functions

fix comments in S6Exporter.cpp, S6Importer.cpp

fix clang-format on S6Importer.cpp

add missing data to TrackData.cpp

revert new functions for checking if track type is a booster

revert unused include

change trackType to auto and add comment to S6Exporter.cpp

move track type aliasing from TrackDesign.cpp to T6Import.cpp, T6Export.cpp

add comment about sv6 vehicle.track_type

static cast to uint8_t in T6Exporter.cpp`

set type to auto when setting value to _currentTrackCurve

revert moving function in S6Importer.cpp

fix value names in RideData.cpp

revert cahnge to uint16_t return for GetTrackType() in RCT12.cpp

fix GetTrackType return type for real

add changelog entry

bump network version

cast alternate track type to track_type_t

static_cast tuple input value in _legacy.cpp

change _currentTrackCurve to uint32

use TrackElemType::Count to determine length of subposition array

perform some changes

remove padding from rct_trackdefinition

fix alternative type check

remove _boosterTrackSelected

add missing condition for booster speed

add comments for TrackElemType::MultiDimInvertedUp90ToFlatQuarterLoop

add missing comments to RideData.cpp

remove extra entry

simplify some things

fix formatting

remove redundant checks todo: fix building the track piece

use TrackElemType::None more

remove git.txt

* bump network version

* make conditional more explicit w/ parentheses

* move booster check to RCT12.cpp

* implement getters and setters for vehicle track type and direction

* fix formatting

* rename RCT12TrackTypeIsBooster to RCT2TrackTypeIsBooster

* add whitespace in RCT2.h

* change the thing I thought I changed

* move booster check function to RCT2.cpp

* move function into if condition

* fix scope issues with setters
2021-01-29 15:24:53 +00:00
Michael Steenbeek
20f959c833 Use track_type_t in more places 2021-01-22 11:33:55 +01:00
Gymnasiast
87ff851fd1 Rename flagsForSomething to remainingDistanceFlags 2021-01-18 22:11:28 +01:00
Gymnasiast
a2e84d161d Remove last usage of registers 2021-01-17 20:11:50 +01:00
Gymnasiast
cb63b3356a Replace another occurence of regs.ebx 2021-01-17 20:06:35 +01:00
Gymnasiast
98a9827ee8 Remove unused regs.cx 2021-01-17 20:06:35 +01:00
Gymnasiast
e4e4ca1122 Replace occurrence of regs.ax 2021-01-17 20:06:35 +01:00
Gymnasiast
2baf0f992f Remove unused regs.dx 2021-01-17 20:06:35 +01:00
Gymnasiast
d817d595eb Replace occurrence of regs.ax 2021-01-17 20:06:33 +01:00
Gymnasiast
d9fb4616a6 Replace 2 occurences of regs.eax 2021-01-17 20:06:05 +01:00
Gymnasiast
b24962546e Replace an occurence of regs.eax 2021-01-17 20:06:05 +01:00
Gymnasiast
7e50d1bbc5 Integrate loc_6DB967 2021-01-17 20:06:05 +01:00
Gymnasiast
c200d7ab9c Integrate loc_6DBE7F 2021-01-17 20:06:05 +01:00
Gymnasiast
60b0ba809a Integrate loc_6DBE5E 2021-01-17 20:06:05 +01:00
Gymnasiast
39162b8f8e Remove 2 occurrences of regs.ebx 2021-01-17 20:06:03 +01:00
Gymnasiast
9fb46e7fcc Remove occurrence of regs.ebx 2021-01-17 20:05:31 +01:00
Gymnasiast
6561f1cb49 Remove occurrence of regs.ebx 2021-01-17 20:04:49 +01:00
Michael Steenbeek
60d1e94046 Close #7059: Implement landscape doors on Ghost Train (#13636)
* Implement landscape door updating

* Implement door drawing for Ghost Train

* Amend changelog and bump network version

* Apply review requests

* Always return default seat rotation for ride types with landscape doors

* Fix comment

* Update replays

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2021-01-10 21:38:02 +00:00
Mathias Gibbens
b1e5a11bf3 Several more spelling fixes (#13752)
Signed-off-by: Mathias Gibbens <mathias@calenhad.com>

Co-authored-by: Mathias Gibbens <mathias@calenhad.com>
2021-01-10 18:23:35 +00:00
Duncan
d5ada2dca1 Remove type from SpriteBase (#13735)
* Move type field into sub structures

* Use type for misc_type

* Use type for l_type

* Rename to SubType

* Rename SpriteGeneric to MiscEntity

* Rename generic to misc

* Add extra nullptr checks for compilers that cant understand

* Make review changes

* Increment network version

* Update replays
2021-01-10 15:14:34 +00:00
ζeh Matt
acf71315b5 Cleanup variables usage and initialize them 2021-01-06 22:29:40 +01:00
Matt
19b63a1825 Refactor logic of MoveTo to always imply invalidation 2021-01-02 16:22:28 +02:00
Matt
efa1db826e Refactor invalidation logic to be generic to the callee 2021-01-02 16:22:28 +02:00
Matt
cb719a6e10 Add missing case statements for entity scripting 2021-01-02 15:31:26 +02:00
Matt
5f2945d238 Refactor MISC_SPRITE to strong enum 2021-01-02 15:30:44 +02:00
Bas
75f0f21512 Use collision disable flag instead of update car position flag check 2020-12-29 15:41:27 +01:00
Bas
2b2efee7a8 Remove unnecessary MoveTo code from MoveRelativeDistance 2020-12-29 15:41:26 +01:00
Bas
559c327c1e Disable vehicle collision on single car position update 2020-12-29 15:41:26 +01:00
Bas
e44c17957b Replace track position setter with new move method 2020-12-29 15:41:26 +01:00
Bas
d5a9881f91 Add track progress property to vehicles 2020-12-29 15:41:25 +01:00
Tulio Leao
221aa8cece Close #12453: Refactor RCT2_EDITOR_STEP to strong enum 2020-12-23 20:07:53 -03:00
Duncan
6da4a8d6af Add individual vehicle motion update flag (#13607)
This can be used in conjuction with #13593 to change the placement of vehicles on a track
2020-12-21 13:25:39 +00:00