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

81 Commits

Author SHA1 Message Date
Michael Steenbeek
dd624f9bff Replace remaining usages of money16, money32 (#19469)
* Use money64 for ride prices and shop items

* Use money64 for park entrance fee

* Use money64 for gGuestInitialCash

* Use money64 for upkeep costs

* Use money64 for ride value

* Use money64 for marketing campaign cost

* Use money64 for object prices

* Use money64 for land prices

* Use money64 for guest expenditure

* Replace remaining occurrences of money32 with money64

* Update replays

* Bump network version

---------

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2023-03-02 21:55:42 +00:00
Duncan
e09f27df3c Rename snake_case Class names (Remaining Bits) (#19237)
* Rename snake_case Class names

* Clang format

* Fix build issues
2023-01-21 19:57:17 +00:00
James103
73738bbdc8 Replace 2022 with 2023 in copyright headers
Replace all instances of the year 2022 with 2023 in all copyright headers
2023-01-01 11:58:01 +01:00
Gymnasiast
d90d81c7b3 Create method to safely retrieve track sequence block 2022-12-10 22:08:42 +01: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
ebe38a91ce Return dummy TED when index is out of bounds (#17810) 2022-08-21 17:09:18 +01:00
spacek531
48530026a2 Flying coaster track additions 2022-08-10 22:54:33 +00:00
Michael Steenbeek
80f0d952ad Merge pull request #17638 from X123M3-256/new_track_pieces
Add new track pieces to the hybrid and single rail
2022-08-01 23:24:22 +02:00
Gymnasiast
d3fd31c611 Rename rct_string_id to StringId 2022-07-31 22:30:13 +02:00
X123M3-256
da472ff033 Remove unnecessary changes 2022-07-31 10:22:45 +01:00
X123M3-256
0347ee62cb Remove apparently redundant cast 2022-07-31 10:22:45 +01:00
X123M3-256
8090eab2a3 Fix comments in TrackData 2022-07-31 10:22:45 +01:00
X123M3-256
3b7cd1194c Fix formatting 2022-07-31 10:22:44 +01:00
X123M3-256
77c5bbcafe Finalize track data and G forces 2022-07-31 10:22:04 +01:00
X123M3-256
15d82db8fd Implement zero g rolls, large corkscrews and medium loops 2022-07-31 10:22:00 +01:00
frutiemax
8ab1258af7 Close #15353: Add VerticalFactor and LateralFactor fields to TrackElementDescriptor (#15401)
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2022-05-03 23:27:16 -03:00
norisa118
483548120b Fix #16879: TED::Price is price modifier, not price (#16962)
* Fix #16879: TED::Price is price modifier, not price

Change unit type to uint32_t, change name to 'PriceModifer' &
add comment on how to use PriceModifier.
2022-04-14 20:36:39 +01:00
ζeh Matt
aed98b5d82 Initialize track data table at compile time 2022-02-02 21:10:32 +02:00
Michael Steenbeek
d97ecdd981 Fix #13336: Can no longer place Bumble Bee track design 2022-01-20 10:56:27 +01:00
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