1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 14:02:59 +01:00
Commit Graph

62 Commits

Author SHA1 Message Date
frutiemax
95c63832bb Replace zeros with STR_EMPTY 2021-12-30 11:07:03 -05:00
frutiemax
36f0cce65b Add description field to TrackElementDescriptor 2021-12-25 09:55:03 -05:00
frutiemax
98a52ac934 Part of #13874: Add SpinFunction field 2021-08-29 20:37:59 -04:00
frutiemax
7e5e9bdf13 Part of #13874: Add definition field in TrackElementDescriptor 2021-08-29 20:22:48 -04:00
frutiemax
450bf61ee4 Part of #13874: TrackSequenceProperties, Pricing and MirrorMap renamed 2021-08-29 10:45:17 -04:00
frutiemax
9c53fe252d Part of #13874: ZehMatt review changes 2021-08-27 17:44:33 -04:00
frutiemax
046c060e74 Part of #13874: Replace Track Sequence properties 2021-08-22 18:01:03 -04:00
frutiemax
a29b369ff8 Part of #13874: Replace Sequence Element Wall table 2021-08-22 17:58:52 -04:00
frutiemax
382315b2c3 Part of #13874: Replace block tables 2021-08-22 17:57:56 -04:00
frutiemax
b5219d76d8 Part of #13874: Replace pricing tables 2021-08-22 17:55:17 -04:00
frutiemax
780eb4f287 Part of #13874: Replace piece lengths 2021-08-22 17:53:38 -04:00
frutiemax
716dd3dcb6 Part of #13874: Replace mirror maps 2021-08-22 17:52:56 -04:00
frutiemax
72e6f9a694 Part of #13874: replace height markers positions tables 2021-08-22 17:52:19 -04:00
frutiemax
1bfa26e4c5 Part of #13874: replace flags table 2021-08-22 17:51:35 -04:00
frutiemax
675777efaf Part of #13874: replace curvechain 2021-08-22 17:50:18 -04:00
frutiemax
5a8cc7c610 Part of #13874: Replace alternativeTypes 2021-08-22 17:49:39 -04:00
frutiemax
80418efafb Part of #13874: Replace TrackCoordinates 2021-08-22 17:49:00 -04:00
frutiemax
5c261b6d2e Part of #13874: TrackElementDescriptor loader 2021-08-22 17:47:10 -04:00
Gymnasiast
1b964c0f2e Refactor flat ride track pieces 2021-02-18 17:50:19 +01:00
spacek531
ea6fdc4708 fix piece height 2021-02-07 22:07:24 +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
1ab3f4b250 Introduce constant for max sequences (#13405) 2020-11-10 21:24:02 -03:00
Simon Jarrett
088db4a7c3 Fix incorrect const names of long base pieces
- Fix function names referring to that of the renamed consts
- Fix incorrect mirror of TrackType::FlatToDown60Long in TrackData
2020-10-01 19:57:52 +01:00
Simon Jarrett
52209af94d Rename TRACK_ELEM_* enums to TrackElemType::*
- Replace enum in Track.h with namespace and constexpr
- Find and replace all instances of TRACK_ELEM_* enums
2020-10-01 19:57:52 +01:00
Simon Jarrett
9fb51c18d4 Fix: Incomplete loop collision box allowed overlap (original bug) 2020-08-18 17:03:35 +01:00
Aaron van Geffen
7b5087f057 Update copyright year to 2020 2020-07-21 15:04:34 +02:00
Gymnasiast
b948302dc6 Use constants in gTrackCurveChain 2020-07-14 01:37:33 +02:00
Michael Steenbeek
c31ef8e635 Extract vehicle subposition data to its own file (#10912) 2020-03-15 11:27:45 +01:00
Michael Steenbeek
e29149e455 Deduplicate flat/regular ride track blocks (#10911) 2020-03-12 11:04:52 +01:00
Michael Steenbeek
e441019b04 Refactor rct_track_preview flags (#10906)
* Refactor rct_track_preview flags

* Zero-index rct_track_preview flags
2020-03-11 15:53:16 +00:00
Gymnasiast
08ad1816d3 Move track paint function to RTDs 2020-02-22 20:15:00 +01:00
Michael Steenbeek
86a79e742f Use RideTypeDescriptor for available track pieces 2020-02-22 20:13:44 +01:00
Michael Steenbeek
08ca829ac2 Create RideTypeDescriptors (#10707) 2020-02-20 11:00:03 +01:00
Gymnasiast
af12421f2d Apply fixes 2020-01-19 17:34:11 +01:00
modulo7
fdf0c17fd8 Name field var_CD of vehicle struct. Refactor to enum 2020-01-19 17:34:11 +01:00
Michael Steenbeek
8a9f0eeca5 Prepare track piece handling code for more than 256 pieces (#10575) 2020-01-17 12:27:14 +01:00
Duncan
c3e14328f1 Little Refactor (#10075)
* Correct the label for track elem 255.

* Catch last little change
2019-10-19 10:00:42 +02:00
Gymnasiast
2a99c42242 Fix code to determine number of golf holes 2019-03-27 12:53:15 +01:00
Aaron van Geffen
2af13904c5 Update copyright notices for 2019. (#8903) 2019-03-17 07:16:15 +00:00
duncanspumpkin
921062d073 Start transferring trackdata to use the seperate values
Finish the conversion
2019-02-25 13:51:04 +00:00
deurklink
51fc2fe84a Feature #8583: Add booster pieces for water coaster
Co-Authored-By: deurklink
2019-01-14 22:17:52 +01:00
Hielke Morsink
354d973a48 Use std::size instead of Util::CountOf 2018-11-23 21:59:08 +01:00
Michael Steenbeek
a8f526ae48 Allow on-ride photos and water S-bends on the Water Coaster 2018-11-01 10:12:45 +01:00
Topodic
a320cd0eb8 Fix #8083: The mini roller coaster has access to spiral lifts 2018-10-17 21:52:27 +02:00
Michael Steenbeek
9ff79e65aa Implement #4418: Steep slopes for the Side-Friction RC 2018-09-27 08:55:29 +02:00
clang-format
e8310d079d clang-format ride 2018-07-23 16:00:09 +02:00
Michael Steenbeek
1b08fb4e69 Replace our own integer types with standard ones 2018-06-20 17:30:40 +02:00
Michael Steenbeek
323162cfe8 Fix #7711: Inverted Hairpin RC allows building invisible banked pieces 2018-06-20 11:32:29 +02:00
Hielke Morsink
0cf256ac9e Ready copyright notice for clang-format
Clang-format sees the text behind `#pragma region` as code and formats it. Instead of stating the copyright and date there, it's now in the comment block right below it. The text "Copyright" is left in the `#pragma region` line, as clang-format sees it as a single identifier.

I took the opportunity to normalize the dates, and add the copyright notice to the source files where it was missing them (except for third-party and the generated resources.h file).
2018-06-15 14:07:34 +02:00
Hielke Morsink
9c8c2a2820 Missing field initializers part 2
This commit tackles the more difficult-to-fix warnings that -Wmissing-field-initializers reported. I've compares the new tables in TrackData with the old ones through a script to make sure they are in fact the same.
2018-06-05 00:18:07 +02:00