mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 22:13:07 +01:00
Code Issues Releases Wiki Activity
28,962 Commits 8 Branches 59 Tags
3e11a8efdf03c688cced8beceb2ef7dff395d8ae
Commit Graph

234 Commits

Author SHA1 Message Date
Karst
0687e4f393 Fix #18007: River rapids vehicles glitch/sprites get cut off 
This reverts commit ce95b58d5e,
"Fix #17992: Virginia Reel doesn't show sloped tracks".

The problem this commit aimed to fix has been (mostly) fixed
in 0a571cce29.
 2022-09-21 15:06:45 +02:00
spacek531
ce95b58d5e Fix #17992: Virginia Reel doesn't show sloped tracks 2022-09-09 08:23:56 +02: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
frutiemax
6868b3dcaf Rename IS_SHOP to IS_SHOP_OR_FACILITY and use it for RideObject 2022-08-06 15:00:52 +02:00
frutiemax
bf432cc943 Add name field to RideTypeDescriptor structure 2022-07-25 00:06:37 +02:00
X123M3-256
55c8a3d775 Add extra vehicle sprite groups (new track pieces part 1) (#17352) 
* Add new sprite groups for zero G rolls

* Fix formatting

* Rename vehicle paint functions

* Fix formatting

* Fix parameter name

* Fix formatting
 2022-07-24 05:40:41 +01:00
Gymnasiast
452206701a Drop support for old names for CAR_ENTRY_FLAG_* 2022-07-11 18:06:23 +02:00
Gymnasiast
8871760472 Rename car entry animation flags 2022-07-11 18:06:22 +02:00
Gymnasiast
06c368694a Update variables containing a CarEntry 2022-07-11 18:06:22 +02: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
X123M3-256
502f06af91 Add "Alpine Coaster" ride type (#16825) 
* Implement "Alpine Coaster" ride type


Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
 2022-05-26 21:28:17 +00: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
Ivan
9c04024537 Close #16933: Rename car_visual to PaintStyle (#16969) 2022-04-11 23:18:18 -03:00
spacek531
5ecb7a6c6a Cleanup vehicle drawing code part 2 (#16960) (#16960) 
* Rename assembly variable names

* Repurpose unused rct_ride_entry_vehicle field for NumRotationFrames
 2022-04-10 21:26:00 +01:00
spacek531
435c38b528 Fix vertical sprite count math 2022-04-06 15:36:39 +02:00
X123M3-256
605112297d Implement RIDE_ENTRY_FLAG_RIDER_CONTROLS_SPEED (#16837) 2022-04-06 08:38:24 -03:00
Michael Steenbeek
e78c29ea5c Fix most occurrences of ‘ternary’ (#16832) 2022-03-20 19:22:05 +01:00
Bas
078078416b Replace all 'cars_per_flat_ride' 0xFF with 'NoFlatRideCars' 2022-03-04 20:21:15 +01:00
Gymnasiast
3c8558bba0 Use uint32_t in more places 2021-12-30 12:27:43 +01:00
Gymnasiast
b09898ab3b Clean up ride object rotation frames 2021-12-30 12:26:21 +01:00
Ted John
a324bfab63 Add image manager plugin API (#16144) 2021-12-07 20:55:27 +00:00
Gymnasiast
cbdb2c03cd Use new ImageId in most object previews 2021-12-04 11:55:33 +01:00
Ted John
5f9d03e9df Refactor ImageId and use in more functions 2021-12-03 19:59:33 +01:00
Duncan
79b12d2953 Introduce DATLimits.h for RCT2 Dat file object limits (#16034) 2021-12-01 21:55:52 +00:00
GalBr
c2fa54057a Remove vehicle_colour and replace references to VehicleColour (#16055) 
This is done because we had two identical structs: vehicle_colour and
VehicleColour. We now only use VehicleColour.

See: #16028
 2021-11-29 22:04:31 +00:00
Duncan
cc22b584fd Introduce RCT2 namespace (#16037) 
* Introduce RCT2 namespace

* Drop RCT2:: prefix where possible

* Drop RCT2 from structure names

* Reduce header includes
 2021-11-28 16:51:38 +00:00
Duncan
eba42a9584 Introduce Limits headers. (#15329) 
* Move RCT12 limits to seperate file and namespace

* Remove prefix from constants

* Add rct1 limits file

* Rename constants to remove prefix

* Add RCT2 limits file

* Remove RCT2 prefix from constants

* Move constant to correct header

* Fix rebase mistakes

* Drop prefix
 2021-11-27 16:20:05 +00:00
Hielke Morsink
4b4b3333d6 Remove unnecessary else blocks 2021-09-16 18:31:12 +02:00
ZehMatt
e520e4f991 Use EnumMap for RideObject lookup tables 2021-07-29 17:07:48 +03:00
Michael Steenbeek
380d3a6cbe Turn vehicle sprite flags into a 32-bit integer 
At the request of X7123M3-256.
 2021-05-28 19:16:16 +02:00
Basssiiie
5480c99e0b Rename previously unknown vehicle flags, and json strings to camelCase 2021-05-13 13:34:32 +02:00
Michael Steenbeek
64807147e6 Fix #14126: assertion in research_fix() 
The assertion was hit because of a non-existant ride type being passed into ride_type_set_invented(). Try to avoid this by fixing DAT files when loading them.
 2021-03-06 20:57:48 +01:00
Michael Steenbeek
28c680f97f Merge pull request #14163 from Gymnasiast/refactor/get-rtd 
Use GetRideTypeDescriptor() in more places
 2021-02-26 10:46:38 +01:00
Gymnasiast
44d0e77afb Make all access to RTD table use the bounds checking function 2021-02-26 10:01:00 +01:00
Michał Janiszewski
6baff43f52 Reduce inclusion of Sprite.h 2021-02-25 10:56:27 +01:00
Matt
c30bd1266f Refactor IStream::ReadArray to return unique_ptr 2021-02-12 19:30:53 +02:00
skdltmxn
b0a8ebc808 Refactor to use push_back more efficient (#13726) 2021-01-08 20:59:55 +00:00
Michael Steenbeek
8a4e44be5e Add missing ride types to JSON object loader 2021-01-06 22:30:55 +01:00
X123M3-256
deca5a3881 Add "Single Rail Roller Coaster" ride type 2021-01-06 21:10:15 +01:00
Duncan
c12e1634fc Merge LitterType into the shop item descriptor (#13513) 
* Merge LitterType into the shop item descriptor

* Merge ConsumptionTime into ShopItem descriptor

* Merge in DiscardContainer into ShopItemDiscriptor

* Simplify itemOrderPreference

* Simplify guest code by using 64bit flags

* Remove operators for ShopItem

* Move PeepThoughtType TooMuch GoodValue into ShopItemDescriptor

* Reorg Get Flags and Has functions to make intention clear

* Constexpr shop item descriptors

* Constexpr shop item descriptors to compile time gen constants

* Fix formatting and spelling

* Revert operator++ removal
 2020-12-09 06:55:06 +00:00
Łukasz Pękalski
3de233c796 Close #12395: Refactor PeepItem to use strong enum (#13311) 
* refactor: integrated PEEP_ITEM into SHOP_ITEM

* refactor: converted merged enum to flag

Only former occurrences of PEEP_ITEM

* cleanUp: code cleaned after merging

* refactor: converted ShopItem to strong enum

code reformatting

* refactor: ShopItem enum items renamed

code formatted

* refactor: new getter and setter functions for Item...Flags

* refactor: replaced all occurrences of ItemStandardFlags

with appropriate getter and setter functions.
COMPARE_FIELD macro needs to be commented out or the flag has to stay public.

* refactor: all occurrences of ItemExtraFlags replaced

with proper function calls. COMPARE_FIELD macro issue not resolved.

* refactor: introduced new variable for unified item flags

* refactor: adapted accessor functions

accessor functions were modified to accommodate both standard and extra ShopItem flags

* refactor: ItemExtraFlags accessor functions are replaced

with general functions

* refactor: reverted to original uint32_t flag variables

* refactor: implemented suggested changes

* refactor: integrate additional comments

* refactor: incorporated requested changes

* refactor: incorporated requested changes

added static_cast<PeepThoughtType> in lines 1572 and 1590
 2020-12-03 21:15:59 -03:00
X7123M3-256
6ca16e0a06 Make JSON objects able to use hybrid track 2020-10-15 20:27:33 +01:00
Julia Pinheiro
b628bba704 Close #12429: Refactor OBJECT_ERROR to use strong enum and typo fix in build.sh (#13145) 
* Close #12429: Refactor OBJECT_ERROR to use strong enum

* Typo Fix in build.sh: Unknown
 2020-10-10 16:21:07 +01:00
Matt
091145037e Move the audio code into OpenRCT2 namespace 2020-10-07 00:34:42 +03:00
Simon Jarrett
9c5e9f8dbc Replace includes of Json.hpp in header files with json_fwd.hpp 2020-10-02 11:31:20 +01:00
Simon Jarrett
0c58dfa1b3 Refactor objects to use new JSON library 2020-09-16 20:18:53 +01:00
Łukasz Pękalski
bfdc1f6d2a Close #12430: Refactor OBJ_STRING_ID to use strong enum (#12796) 2020-08-28 23:36:58 -03:00
Aaron van Geffen
7b5087f057 Update copyright year to 2020 2020-07-21 15:04:34 +02:00