1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Commit Graph

54 Commits

Author SHA1 Message Date
Michael Steenbeek
d481cca2ed Remove some redundant casts and fix rct_sprite::AsDuck() 2018-02-15 13:04:25 +01:00
duncanspumpkin
4d45053aec Name animation flags 2018-01-30 12:53:50 +00:00
duncanspumpkin
eb5f8485fa Name further entry flags 2018-01-30 12:53:50 +00:00
duncanspumpkin
addf087918 Rename additional_animation to animation as it makes more sense
Label all vehicle animation types based on loading relevant parks
2018-01-30 12:53:50 +00:00
duncanspumpkin
00a9ab1b17 Name every remaining vehicle entry offset!
Removed redundant comments as some were incorrect and its clear from the code now that the flags are named
2018-01-30 12:53:50 +00:00
duncanspumpkin
5401e69b50 Name vehicle animation offsets 2018-01-30 12:53:50 +00:00
duncanspumpkin
f9d6203200 Refactor vehicle spinning.
Fix bug in R8_SPIN and LR_SPIN that would cause vehicles to spin in wrong direction on certain track elements.
Name parameters
Name flag for additional vehicle spinning sprites
Add comments to code to make function easier to understand.
2018-01-30 12:53:50 +00:00
Michael Steenbeek
a116bb530f Remove unused ORI_RIDE_FLAG_SEPARATE 2018-01-09 21:35:10 +01:00
Michael Steenbeek
6a88d6e04d Move and rename RCT{1,2,12}.h 2018-01-09 13:36:41 +01:00
Michael Steenbeek
755add6c9a Compile localisation folder as C++ 2018-01-06 18:32:25 +01:00
Ted John
3dcbebcf68 Refactor drawing.c to C++ 2018-01-05 22:57:57 +01:00
Duncan
12dde3a589 Refactor of Vehicle Sound Functions (#6907)
* Refactor vehicle_update_sound_params

Named known params.
Changed function structure to use more return statements to prevent multiple nested ifs.
Used core memory functions instead of hand rolled version.
Added more comments.
Named sub_6BC2F3.
Added comment on likely source of corruption of sound.

* Refactor vehicle_sounds_update

Split the function up into multiple functions.
Rework code to remove GoTos.

* Label params. Refactor slightly the restraint code to use bools
2018-01-04 21:38:27 +00:00
Gymnasiast
23d70a4ac9 Compile ride.c as C++ 2017-12-31 20:43:17 +01:00
Michael Steenbeek
2e79aaf54c Fold vehicle name into regular name 2017-12-22 15:28:41 +01:00
Hielke Morsink
628039dd8a Use range-based for loops in libopenrct2 2017-12-21 23:47:30 +01:00
Gymnasiast
44651defa7 Fix #6447: Rename friction to mass 2017-12-17 20:11:55 +01:00
Ted John
31e112cf3b Use std::string for objects 2017-12-14 14:38:14 +01:00
Ted John
3de8e0d37e Merge pull request #6772 from IntelOrca/remove-rct2-interop-2
Remove RCT2 interop
2017-12-04 20:10:35 +00:00
Michael Steenbeek
078c2d22c1 Make use of ride preview images clearer and more future-proof 2017-12-04 20:11:38 +01:00
Ted John
99d7aaa2d6 Remove RCT2 interop 2017-12-04 19:04:06 +00:00
Michael Steenbeek
c1400a12eb Allow separate ride and vehicle names per ride entry 2017-11-21 18:55:42 +01:00
Michael Steenbeek
8d7d53de29 Correct Steel twister capacity 2017-11-13 20:37:13 +01:00
Michael Steenbeek
f073ec33fa Fix #6646: Max cars/train increase for RCT1 parity 2017-11-13 17:37:39 +01:00
Michael Steenbeek
5eed8cecd4 Fix typo in 'multiplier' 2017-11-13 16:22:36 +01:00
Michał Janiszewski
8fd2266bda Refactor includes (#6512)
* Refactor Intent.h inclusion

* Use forward declaration of ITcpSocket

* Remove unused include

* Forward declare rct_ride_entry

* Remove unused headers

* Forward-declare rct_drawpixelinfo

* Remove unused headers

* Lower header include from header to source file

* Reduce included headers

* Reduce includes
2017-10-19 10:01:05 +02:00
Michael Steenbeek
bb01699b7d Compile track.c as C++ 2017-10-17 13:51:47 +02:00
Michael Steenbeek
4224193d68 Clean up ride groups 2017-10-06 10:29:24 +02:00
Michael Steenbeek
fa5ec031f1 Clean up ride naming 2017-09-20 21:19:55 +02:00
Michał Janiszewski
00fd18809c Move extern "C" {} blocks to headers (#6282) 2017-09-18 17:05:28 +02:00
Michael Steenbeek
6ab0f2f905 Name some rct_ride_entry_vehicle properties 2017-09-15 18:25:28 +02:00
Michael Steenbeek
a4802983c2 Make var_02/_03 calculation methods private and static 2017-09-14 14:30:09 +02:00
Michael Steenbeek
9cba5436e5 Split off frame calculations; don't set var_02 and _03 2017-09-14 14:07:55 +02:00
Michael Steenbeek
98e15f1cd9 Rewrite confusing if statement 2017-09-14 13:48:14 +02:00
Michael Steenbeek
8c33240c38 Slightly refactor loading of vehicle entries 2017-09-13 10:45:28 +02:00
Michał Janiszewski
d698ad1100 Convert NULL -> nullptr in C++ 2017-08-15 11:51:56 +02:00
Gymnasiast
8eec684545 Use more constants, isolate SV6 limits further 2017-08-14 19:56:29 +02:00
Michael Steenbeek
9c7c553ccc Clean up vehicle flags (#6058) 2017-07-31 11:27:04 +01:00
Michael Steenbeek
367efa2020 Use remap flags, SPRITE_ID_PALETTE_COLOUR_1 and _2 in many more places 2017-07-20 20:56:29 +02:00
Gymnasiast
260f342d73 Fix typos in (unused) defines and comment 2017-07-20 16:18:36 +02:00
Gymnasiast
34073e10ae Fix Junior RC data files to disable steep inclines, fixes #5902 2017-07-15 10:52:35 +02:00
Ted John
4f1cfb4631 Don't load graphics for headless 2017-06-25 23:19:24 +01:00
Gymnasiast
db091032cc Put .DAT fixes into their own method, fix max cars on the Crocodile Ride 2017-06-23 17:29:51 +02:00
Gymnasiast
234bedb8b8 Replace more occurences of vehicles per ride entry 2017-06-23 17:19:51 +02:00
Michał Janiszewski
9903c15e2a Remove various trailing whitespaces
[ci skip]
2017-06-17 13:41:40 +02:00
Gymnasiast
4059d9e8a7 Clean up boosters, ride_type_null, max rides per entry, formatting 2017-06-14 16:06:43 +02:00
Michael Steenbeek
96a7a8ab50 Sort rides into ride groups when in select-by-track-type mode
* Add ride groups

* Convert ride groups to C++

* Fix linking and crashes in Xcode

* Comment out .field syntax to make Visual Studio happy

* Fix alignment, fix changelog, cleanup

* Properly save ride group index in the ride object repository and bump its version

* Fix fallback behaviour when the ride entry is not available or not invented

* Fix include

* Rename RideGroup to RideGroupManager, add const, cleanup

* Break after finding matching ride group
2017-06-14 13:31:27 +02:00
Michał Janiszewski
ff9417f4a6 Validate access to peep_loading_positions (#4475) 2017-06-07 21:56:29 +01:00
Michael Steenbeek
7d9acca1e0 Create define for max ride types per ride entry, closes #5524 2017-06-01 22:00:11 +02:00
Michał Janiszewski
79d76759bb Fix #5516: Update copyrights for 2017
Not all files were necessarily _changed_, but all were touched, see
https://github.com/OpenRCT2/OpenRCT2/pull/4932
2017-06-01 21:55:10 +02:00
Gymnasiast
ab75b8db84 Properly check separate flags when scanning objects and building track list, fixes #3681 2017-05-21 12:19:42 +02:00