mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity
19,196 Commits 8 Branches 59 Tags
8eb735632045555a9841d8209c166bde8ae2c7e0
Commit Graph

19196 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
duncanspumpkin
8eb7356320 Simplify iterator class 2020-06-16 20:27:44 +01:00
duncanspumpkin
9c2f545225 Fix building of testpaint 2020-06-16 20:27:44 +01:00
duncanspumpkin
6ed17b4ff9 Remove FOR_ALL_PEEPS/GUESTS/STAFF macros 
Replaced with an EntityList iterator

Fix formatting

Fix nullptr issues
 2020-06-16 20:27:44 +01:00
duncanspumpkin
c45a0536eb Use new class 2020-06-16 20:27:40 +01:00
duncanspumpkin
225ae3a0a9 Add EntityList iterator 2020-06-16 20:26:56 +01:00
duncanspumpkin
a30374d200 Use new iterator 
Fix mac builds

Fix minor mistake

Fix vehicle loops
 2020-06-16 20:25:47 +01:00
duncanspumpkin
133d8c4a0a Implement GetSprite and use it in a number of places 
This will eventually replace all of the get_sprite and try_get_sprite calls

Further use of GetSprite

Use GetSprite in all remaining easy to use functions

Correct formatting

Rename GetSprite to GetEntity

Make suggested changes

Remove const to allow for building

Fix crashes due to next sprite
 2020-06-16 20:25:03 +01:00
duncanspumpkin
904e6c6987 Implement GetSprite and use it in a number of places 
This will eventually replace all of the get_sprite and try_get_sprite calls

Further use of GetSprite

Use GetSprite in all remaining easy to use functions

Correct formatting

Rename GetSprite to GetEntity

Make suggested changes

Remove const to allow for building

Fix crashes due to next sprite
 2020-06-16 20:21:56 +01:00
Michael Steenbeek
0f12382895 Merge pull request #11959 from irrelevantirreverent/extra-go-karts-subpositions 
Add info for go-kart lanes on some track pieces
 2020-06-16 15:57:39 +02:00
Irrelevant Irreverent
db85f0c78b Bump network version 2020-06-16 09:08:04 -04:00
Irrelevant Irreverent
efd5b869d1 Update changelog with new feature 2020-06-16 08:57:56 -04:00
Irrelevant Irreverent
416fb64e74 Use proper prefix for track piece comments 2020-06-16 08:51:00 -04:00
Irrelevant Irreverent
6c911f203d Fix spacing in track info and adjust comments 2020-06-16 08:24:20 -04:00
Irrelevant Irreverent
fc25fb68de Add info for go-kart lanes on some track pieces 2020-06-16 08:19:31 -04:00
Michael Steenbeek
8c67eede5b Name track vehicle info lists (#11960) 2020-06-16 12:35:13 +01:00
Hudson Oliveira
994dea2722 Pass only TrackLocation instead of whole vehicle (#11954) 2020-06-16 13:01:25 +02:00
Tulio Leao
1336e8ad86 Merge pull request #11900 from hdpoliveira/news_cpp 
Create functions for const access to News queues and refactor use
 2020-06-15 22:56:29 -03:00
Duncan
78d062943b Fix #11953: Incorrect shade used for wall banner text 2020-06-15 23:04:34 +02:00
Sohil Adwani
03f016e9ef Smart pointers (#11852) 
* Part of #11159 Added smart pointers to a few functions

* Use camelCase for variables

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
 2020-06-15 19:47:07 +01:00
Hudson Oliveira
feb3fcfd6e Remove gotos from TrackMotionForwardsGetNewTrack (#11955) 
* Remove gotos from TrackMotionForwardsGetNewTrack

* Move default case to the bottom of the switch

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2020-06-15 01:25:13 +02:00
Duncan
1e5739b739 Vehicle motion update: small cleanup; work towards unifying code paths 2020-06-14 22:54:34 +02:00
Tulio Leao
112ac33a24 Merge pull request #11952 from tupaschoal/draw_string_centred_11564 
Use ScreenCoordsXY for gfx_draw_string_centred_clipped
 2020-06-14 17:42:15 -03:00
hdpoliveira
a3fe90c250 Create SpriteBase::Invalidate methods (#11948) 2020-06-14 15:18:07 -03:00
Tulio Leao
13df05ce32 Part of #11564: Use ScreenCoordsXY instead of <x,y> 2020-06-14 12:51:06 -03:00
Tulio Leao
613cec3f7a Part of #11564: gfx_draw_string_centred_clipped with ScreenCoordsXY 2020-06-14 12:26:53 -03:00
Tulio Leao
ce171164c9 Merge pull request #11932 from tupaschoal/draw_string_right-11569 
Use ScreenCoordsXY for gfx_draw_string_right
 2020-06-14 12:11:10 -03:00
Tulio Leao
e54a3d89f2 Rename some Peep member variables to use TitleCase (#11931) 
* Rename Peep::destination_tolerance to use TitleCase

* Rename Peep::destination_y to use TitleCase

* Rename Peep::destination_x to use TitleCase

* Rename Peep::trousers_colour to use Title Case

* Rename Peep::tshirt_colour to use TitleCase

* Rename Peep::no_of_rides to use Title Case

* Rename Peep::staff_type to use TitleCase

* Rename Peep::type to use TitleCase

* Rename Peep::sprite_type to use TitleCase

* Rename Peep::sub_state to use TitleCase

* Rename Peep::state to use TitleCase

* Rename Peep::outside_of_park to use TitleCase

* Rename Peep::next_flags to use TitleCase

* Rename Peep::name to use TitleCase

* Rename Peep::NoOfRides to GuestNoOfRides

* Rename Peep::Type to AssignedPeepType

* Rename Peep::GuestNoOfRides to GuestNumRides
 2020-06-14 06:31:08 +01:00
hdpoliveira
1b1f812fc9 Create functions for const access to News queues 2020-06-13 19:35:02 -03:00
hdpoliveira
d470c51050 Refactor News.cpp functions 2020-06-13 19:34:13 -03:00
Aaron van Geffen
de045978de Implement #11944: Remember rides sort mode (#11945) 2020-06-13 23:36:43 +02:00
Michael Steenbeek
d695e1d071 Merge pull request #11942 from Gymnasiast/refactor/rtd-build-cost 
Move build costs to RTD
 2020-06-13 22:26:05 +02:00
Michael Steenbeek
aff920c874 Add support for importing RCT Modified ride entrances (#11938) 2020-06-13 20:10:43 +02:00
Gymnasiast
f66d103d9a Move build costs to RTD 2020-06-13 18:48:53 +02:00
Gymnasiast
b73b7e73e7 Move PriceEstimateMultiplier to ride_cost 2020-06-13 18:48:53 +02:00
Michael Steenbeek
8f29810e04 Move RideData4 to RideTypeDescriptors (#11939) 2020-06-13 11:29:00 +01:00
hdpoliveira
2dc98e6370 Remove regs use from minigolf vehicle functions (#11937) 
* Remove regs use from UpdateTrackMotionMiniGolf

* Remove regs from UpdateTrackMotionMiniGolfVehicle
 2020-06-13 07:56:35 +01:00
Michał Janiszewski
a8d21610fb Improve #4617: signs causing crashes (#11094) 2020-06-12 21:33:07 +02:00
lightray22
082dfc4bb0 Fix build on OpenBSD (#11870) 
Co-authored-by: ibara <ibara@users.noreply.github.com>
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2020-06-12 16:45:22 +02:00
OpenRCT2 git bot
3530a00998 Merge Localisation/master into OpenRCT2/develop. 2020-06-12 04:02:56 +00:00
Duncan
319bab8978 Refactor fountain painting (#11891) 
* Refactor fountain painting


Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2020-06-11 20:20:00 -03:00
Duncan
b3d77dd6c9 Remove banner entry when deleting tiles with tile inspector (#11880) 2020-06-11 23:42:48 +02:00
hdpoliveira
5660a59c18 Fix #11914: Notification spam when opening a new scenario 2020-06-11 23:28:44 +02:00
Tulio Leao
d6baec3f66 Reduce scope of ScreenCoordsXY variables 2020-06-11 18:26:16 -03:00
Tulio Leao
8287ef4e7a Merge pull request #11839 from IntelOrca/plugin/vehicle-entity 
[Plugin] Add API for vehicles
 2020-06-11 17:57:54 -03:00
hdpoliveira
ea22d2c8de Vehicle update 9473 11 (#11936) 
* Part of #9473: Create Vehicle::UpdateTrackMotionForwardsGetNewTrack

Converted from vehicle_update_track_motion_forwards_get_new_track

* Part of #9473: Create Vehicle::UpdateTrackMotionBackwardsGetNewTrack

Converted from vehicle_update_track_motion_backwards_get_new_track
 2020-06-11 21:19:11 +01:00
hdpoliveira
55bb2eaec9 Change all invalidate_sprite_2(Vehicle*) to Vehicle->Invalidate() (#11935) 2020-06-11 20:42:11 +01:00
Ted John
a3aed8dce1 Update vehicle powered fields 2020-06-11 17:54:41 +01:00
Ted John
c5b2b2017a Add vehicle API for plugins 2020-06-11 17:54:36 +01:00
Michael Steenbeek
2743629142 Merge pull request #11716 from hdpoliveira/vehicle_update_9473_10 
Remove some of goto from vehicle_update_track_motion_mini_golf
 2020-06-11 17:31:06 +02:00
Tulio Leao
03ba7e5301 Merge pull request #11933 from AaronVanGeffen/unused-vars 
Patch unused variables
 2020-06-11 12:12:06 -03:00