mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
24,365 Commits 7 Branches 39 Tags 357 MiB
Commit Graph

2601 Commits

Author SHA1 Message Date
Gymnasiast b712cc8f07
Refactor checks for ghost tracks while painting 2022-12-31 15:16:07 +01:00
spacek531 09c8e4755f
Rename GetBrakeClosed() to IsBrakeClosed() 2022-12-31 14:06:22 +01:00
mdbckrtn 0ce84204b7
Fix #18911: Update mini golf fencing to draw correctly from all angles (#18946) 
* Fix #18911: Update mini golf fencing to draw on all four angles

SW and SE facing fences were not being drawn correctly due to (seemingly) a typo that caused the game to only check for NW and NE facing fencing when setting up fences for drawing. Ensuring PaintMiniGolfStation checks all four angles resolves the issue.
 2022-12-30 18:18:59 -03:00
frutiemax 580639aa3b
Remove goto label 6DCE02 (#18907) 2022-12-26 10:48:50 +01:00
frutiemax 29d40d0cba
Create Vehicle::IsCableLift() 2022-12-22 12:26:35 +01:00
spacek531 ecef614c93
Split Ride::Test into Ride::Test and Ride::Simulate 2022-12-20 22:56:52 +01:00
Gymnasiast 3af26d2fe7
Create Ride::ChangeStatusGetStartElement() 
Co-authored-by: spacek531 <spacek531@users.noreply.github.com>
 2022-12-20 22:45:48 +01:00
Gymnasiast f848fe5bd4
Create Ride::ChangeStatusDoStationChecks() 
Co-authored-by: spacek531 <spacek531@users.noreply.github.com>
 2022-12-20 22:43:10 +01:00
Gymnasiast 4f48ccc5c8
Create Ride::ChangeStatusCheckCompleteCircuit() 
Co-authored-by: spacek531 <spacek531@users.noreply.github.com>
 2022-12-20 21:59:28 +01:00
Gymnasiast 3329da538b
Create Ride::ChangeStatusCreateVehicles() to reduce codedup 
Co-authored-by: spacek531 <spacek531@users.noreply.github.com>
 2022-12-17 18:01:31 +01:00
Gymnasiast e91d22b203
Use constrefs in a few extra ride functions 2022-12-17 17:52:49 +01:00
Gymnasiast 89ed116664
Create Ride::ChangeStatusCheckTrackValidity() to reduce codedup 
Co-authored-by: spacek531 <spacek531@users.noreply.github.com>
 2022-12-17 17:38:33 +01:00
Gymnasiast 4923847f39
Refactor ride track checking code to use constrefs 2022-12-17 17:34:00 +01:00
Gymnasiast a4f7ca4682
Refactor ride_construct() to RideConstructionStart() 2022-12-17 17:16:34 +01:00
Gymnasiast d0ae004b8f
Remove unused symbol ride_reset_all_names() 2022-12-17 17:08:02 +01:00
Gymnasiast 7f34d626f9
Remove leftover symbol ride_remove_vehicles() 2022-12-17 17:07:26 +01:00
Gymnasiast c244791eda
Refactor ride_find_track_gap() to Ride::FindTrackGap() 2022-12-17 17:00:29 +01:00
frutiemax b67a80aaba
Add RIDE_TYPE_FLAG_IS_SPIRAL_SLIDE flag (#18848) 2022-12-17 16:42:51 +01:00
Spacek531 742294a86f
Add HasMessage() method to ResultWithMessage 2022-12-14 22:56:43 +01:00
Spacek531 d03f5e594e
Refactor track design creation return message 2022-12-14 22:56:43 +01:00
frutiemax 6d804f5323
Add RIDE_TYPE_FLAG_IS_MAZE 2022-12-14 14:21:21 +01:00
Michael Steenbeek 643e33efcd
Fix #1491: Clearance of the Cash Machine is too low 2022-12-13 18:27:12 +01:00
Michael Steenbeek 5de62b774a
Merge pull request #17997 from karst/steep-flume 
Steep track pieces for log flumes
 2022-12-11 15:20:20 +01:00
Gymnasiast 38b34e841a
Use safe method to access ted block 2022-12-10 22:31:23 +01:00
Gymnasiast d90d81c7b3
Create method to safely retrieve track sequence block 2022-12-10 22:08:42 +01:00
Michael Steenbeek c01fe36d80
Fix #18787: Back of stall shown through vertical terrain (#18789) 2022-12-09 19:59:47 +01:00
Gymnasiast 59f6856cd3
Make steep Log Flume pieces in older parks invisible 2022-12-08 20:03:08 +01:00
Rik Smeets 9226448eb1
Fix #18552: Trains clipping through helixes 2022-12-08 19:49:54 +01:00
Karst 2c68c73a24
Add steep drops to the Log Flume 2022-12-07 22:52:22 +01:00
frutiemax b7a1db6e69
Use BoundBoxXYZ for PaintAddImageAsParent (part 1) 2022-12-04 20:43:19 +01:00
GalBr 8d4979588e
Fix #18755: Ferris Wheel and Circus ghosts not coloured correctly 2022-12-04 20:11:11 +01:00
frutiemax 76faa77f6b
Part of #16152: Use BoundBoxXYZ for PaintAddImageAsChild 2022-11-27 18:33:11 +00:00
Michael Steenbeek 06b9dacfaf
Revert "Fix #11679: Facilities clipping issues" (#18660) 
This reverts commit c9b6292b88.

Unfortunately #11679 had side effects more serious than the problem it set out to solve. So unfortunately we’ll have to revert it, unless @rik-smeets has another solution.

See here: https://github.com/OpenRCT2/OpenRCT2/pull/18358#issuecomment-1304615840
 2022-11-23 18:31:37 +00:00
Michał Janiszewski 8439499004
Merge pull request #18555 from janisozaur/imageid-byval 
Pass ImageId by value instead by const-ref
 2022-11-13 22:15:40 +01:00
Ted John a136cf79ca
Add RMC friction as special friction sound 2022-11-12 12:04:11 +01:00
Ted John 7dc0c1dddc
Add new audio object for RMC sounds 2022-11-12 12:04:10 +01:00
Karst 319276dc0e
Add RMC track sounds 2022-11-12 12:04:10 +01:00
Michał Janiszewski 3e4e8bccc5 Pass ImageId by value instead by const-ref 
ImageId struct is 8-bytes large and can fit in CPU register. Passing it
by value lets compiler pass it in register instead of forcing to
reference it from memory.

In my tests this brings
[dome park](https://github.com/OpenRCT2/OpenRCT2/files/6134362/dome-export.zip)
benchgfx results from 42.16s down to 41.08s, or by 2.5%.
 2022-11-12 00:06:05 +01:00
Michael Steenbeek 24cc4d8feb
Merge pull request #18487 from 733737/mini-helis-horror-mansion-tunnel 
allow mini helicopters to draw spinning tunnel
 2022-11-10 22:16:59 +01:00
spacek531 9aa67e77ba
Refactor VehiclePitchCorkscrew to template 2022-11-08 21:38:16 +01:00
Gymnasiast ebb264b702
Add spinning tunnel drawing code to Mini Helicopters 2022-11-08 18:09:29 +01:00
Duncan 482971710d
Apply code style to context functions 2022-11-06 21:49:07 +01:00
spacek531 22a2d11cfc
name more vehicle paint functions (#18520) 
* rename un-renamed vehicle paint functions

* fix unfixed names
 2022-11-06 07:44:59 +00:00
Rik Smeets 1f504fac2d
Add colour preset to Spiral Slide 2022-11-05 23:59:39 +01:00
AuraSpecs 4c218ba443
Allow Inverted RC to draw boosters 2022-11-05 11:59:31 +00:00
Rik Smeets c9b6292b88
Fix #11679: Facilities clipping issues 2022-11-05 12:08:23 +01:00
Duncan 7f085e2752
Update rating skipping unused ride ids (#14425) 
* Skip empty ride ids when evaluating ride ratings

This isn't much of a problem atm but when we increase the limit it may start to become an issue

* Increment network version

* Update changelog
 2022-11-04 20:17:31 +00:00
spacek531 aa685e4cf6
move session flags into new header (#18504) 
* move session flags into new header
 2022-11-04 05:50:36 +00:00
AuraSpecs 2e053a72e7
g2: Remove all possible instances of `SPR_G2_CHAR_BEGIN +` 2022-11-03 18:20:52 +01:00
Michael Steenbeek 7f03a3b5c0
Remove unused Junior RC sprites from g2 
Diagonal flat-to-steep pieces are present in g1.dat, unlike their
orthogonal counterparts, so these images were never used.

Pointed out by @karst.
 2022-11-02 22:50:23 +01:00
Hielke Morsink 31dd4bf604
Use lower-case u integral suffix 2022-10-29 16:33:05 +02:00
Hielke Morsink 97a7fcc110
Consistently use literal suffix in upper-case 2022-10-29 16:28:53 +02:00
Haven Kim 58e2da72c6
Fix #18379 : Mini Golf doesn't render Special E track's tunnel correctly (#18404) 
Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
 2022-10-23 20:32:59 +00:00
Hielke Morsink f91df4138c
Merge pull request #18359 2022-10-18 23:39:49 +02:00
Hielke Morsink 3bb8ea3668
Better annotate some magic numbers in for loops 2022-10-17 16:08:55 +00:00
Hielke Morsink 89fa8d8052
Rename public notification config data members 2022-10-16 21:46:06 +02:00
Hielke Morsink 371470b5d5
Rename public sound config data members 2022-10-16 21:46:05 +02:00
Hielke Morsink abac080d3e
Rename public general config data members 2022-10-16 21:46:01 +02:00
Rik Smeets c80bd455e9
Code style: Remove struct snakes from Paint (#18341) 2022-10-14 20:26:36 +02:00
AuraSpecs 46fa09ca91
Fix: Sides of River Rapids’ corners overlay other parts of the track (#17316) 2022-10-13 20:52:48 +02:00
AuraSpecs dda256ef5f
Add inverted large loops and inverted boosters to Flying RC 2022-10-13 20:51:54 +02:00
Rik Smeets 94e8e9ea6b
Fix #18094: Invisible underground shops/facilities 
Underground shops and facilities placed right next to non-underground path would be connected to the path, but the buildings themselves would remain invisible. Guests could use them though.

This has been fixed by drawing a tunnel, which is the same way ride entrances/exits are drawn.
 2022-10-13 16:54:19 +00:00
Duncan 406b73d904
Remove final snakes from map and world (#18304) 2022-10-12 09:14:45 -03:00
Duncan 7dd8989e70
Next chunk of World/Map.h snakes (#18296) 
* Next chunk of World/Map.h snakes

* Apply clang-format
 2022-10-12 06:35:20 +01:00
Duncan 67bbc8560d
Code style: Remove snakes from everything world apart from Map.h (#18273) 
* Remove remaining snakes from world (outside of map)

* Initial few desnaking of Map.h
 2022-10-11 19:39:24 +01:00
Michael Steenbeek 6fe19878f6
More ImageId cleanup (#18258) 
* Remove more usages of uint32 image indices

* Remove unused gfx_get_sprite_size()

* Remove uint32 images from text drawing

* Remove now-unused ImageId overload

* Default-initialise ttfRunIndex

* Suppress false-alarm GCC error
 2022-10-10 19:42:40 +01:00
Rik Smeets 8e33cf580f Code style: Remove snakes from virtual floor 2022-10-08 20:50:59 +02:00
Rik Smeets 1d557f40ee Code style: Remove snakes from steel supports 2022-10-08 19:59:32 +02:00
Rik Smeets 29f61fd403 Code style: Remove snakes from wooden supports 2022-10-08 19:20:59 +02:00
Duncan 5dba30778d
Code style: Remove more snakes from the park, maphelper, scenery. (#18222) 2022-10-08 06:56:17 -03:00
Rik Smeets 00d2dd8ef7
Code Style: Remove snake casing in PaintHelpers (#18247) 2022-10-08 11:24:50 +02:00
ZeeMajora ea04c0b010
Corkscrew rc's large flat to steep pieces available cheatless (#18230) 
Makes the corkscrew roller coaster's large flat to steep pieces available without cheats for consistency with the looping & twister roller coasters which are similar coaster types that have this element available without cheats.
 2022-10-07 22:27:58 +02:00
Michael Steenbeek fa81f119c2
Merge pull request #18208 from Gymnasiast/fix/18204 
Fix #18204: Crash opening New Ride window with invalid highlight
 2022-10-06 10:54:19 +02:00
Thomas Fai 8e3a0ee814
Part of #16033: VehiclePaint constants 2022-10-05 21:01:06 +00:00
Michael Steenbeek 051ede1598
Merge pull request #18213 from duncanspumpkin/codeStyle4 
Code style: Remove snakes from Location, LargeScenery and MapAnimation
 2022-10-05 22:36:39 +02:00
Rik Smeets c5904d81d6
Code Style: Remove snakes from paint tile elements (#18212) 2022-10-05 21:27:38 +02:00
duncanspumpkin 16581e9288 Address snakes in mapgen and map animation 2022-10-05 20:22:51 +01:00
duncanspumpkin 2a593b6029 Remove snake cases from Location and LargeScenery 2022-10-05 20:21:56 +01:00
Rik Smeets 8ea34a5360
Fix #18134: Photo section clips through terrain 2022-10-05 18:35:37 +00:00
Gymnasiast 33f5fed0e2
Make GetFirstNonNullRideType() member function 2022-10-05 20:24:15 +02:00
Michael Steenbeek 47d040226b
Merge pull request #18186 from duncanspumpkin/codeStyle3 
Code Style: Remove snakes from entrances and footpaths
 2022-10-05 13:24:12 +02:00
X123M3-256 8b00fd1824
Add additional track pieces to LIM Launched Coaster and the Looping Coaster (#18168) 2022-10-05 06:41:10 +00:00
duncanspumpkin 3e8dc1b2ac Remove snakes from the foopaths 2022-10-04 20:08:14 +01:00
duncanspumpkin 2c29190ff8 Remove snakes from entrance 2022-10-04 20:07:35 +01:00
Michael Steenbeek 2e6595fe8a
Merge pull request #18050 from IntelOrca/assetpacks-audio 
Add asset pack manager and asset packs
 2022-10-04 19:08:38 +02:00
73 8c3ff1bfa8
Replace Transparancy with Transparency 2022-10-04 18:28:15 +02:00
Silent 82088f3496
Fix #17664: Ride music channel data leaks when stopping inactive music 2022-10-03 20:02:27 +02:00
Rik Smeets ec12892dba
Remove snake_case from gentle rides (#18173) 2022-10-02 19:54:20 +02:00
Duncan 3565a0172d
Attack snakes in banners and climate (#18163) 2022-10-01 18:54:15 +02:00
Ted John b264a73247 Re-create track sound channel if closed 2022-10-01 13:06:55 +01:00
Ted John 331a5961b1 Implement asset packs for audio 2022-10-01 13:06:52 +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 2e5847d8d4
Merge pull request #18136 from Gymnasiast/refactor/more-imageid 
Refactor/more imageid
 2022-09-30 22:17:57 +02:00
73 1c419bcc9e
fix typo and outdated information (#18157) 
this will not alter the code, only the annotation
 2022-09-30 20:01:30 +00:00
Gymnasiast 26c080a0d7
Remove unused symbols, fixes 2022-09-30 00:01:13 +02:00
Gymnasiast a69a8fa7e8
Remove uint32_t overloads in Paint functions 2022-09-29 21:17:16 +02:00
Michael Steenbeek d352ca3d01
Merge pull request #18146 from ZeeMajora/classic-calculations-2 
More accurate rating calculations for the classic coasters
 2022-09-29 20:18:11 +02:00
73 edc79d77eb fix visual glitch with supports 
maze and shops get their original support colors instead of yellow

Co-authored-by: beam41 <beam_baimon@hotmail.com>
 2022-09-29 11:13:15 -04:00
Michael Steenbeek 6f3790cf98
Modify ride drawing code to use ImageId 2022-09-28 21:36:56 +02:00
Michael Steenbeek 7bb7d97bdc
More bound box refactors 2022-09-27 21:20:49 +02:00