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

14211 Commits

Author SHA1 Message Date
Breno Rodrigues Guimarães c0d0c7de16
Part of #11389: Replace set_format_arg by Formatter::Common() (#11388) 2020-04-22 21:41:20 -03:00
Breno Rodrigues Guimarães ef8fd20c99
Let Ride::FormatStatusTo return the number of written bytes (#11411) 2020-04-22 21:24:51 -03:00
Mustapha Elghoul b138cb46ba
Name Flags in PeepThoughtToActionMap 2020-04-22 18:50:53 +02:00
Michał Janiszewski 2323cc1596
Use named casts instead of old-style casts 
Change prepared with clang-tidy and google-readability-casting check
 2020-04-22 17:09:29 +02:00
Duncan cfd94d4fa5
Merge pull request #11382 from mustaphaelghoul/eecs481 
Create 5 Vehicle::CableLiftUpdate... member functions from cable_lift_update_... (#9473)
 2020-04-21 22:10:16 +01:00
Mustapha Elghoul 38630eeb59 Update dist_x and dist_y to camelCase. (1 >> 1) to VEHICLE_UPDATE_MOTION_TRACK_FLAG_1, and (1 >> 0) to VEHICLE_UPDATE_MOTION_TRACK_FLAG_VEHICLE_AT_STATION 2020-04-21 16:51:00 -04:00
Breno Rodrigues Guimarães 568e60b13c
Remove duplicated code due to merge issue (#11392) 2020-04-21 17:10:05 +02:00
Michał Janiszewski c4b6897635 Address possible nullptr dereferences 2020-04-21 13:31:01 +02:00
Michał Janiszewski 5f97637d5e Only suggest final when using non-LTO builds 
In LTO builds GCC issues the suggestion-warning from linking stage,
when pragmas are already gone and do nothing.
 2020-04-21 13:31:01 +02:00
Michał Janiszewski eeef01f34b Remove redundant function declaration 2020-04-21 13:31:01 +02:00
Michał Janiszewski de51d97f70 Remove redundant unreachable breaks 2020-04-21 13:31:01 +02:00
Michał Janiszewski 64e9e8aeb9 Add missing override specifier 2020-04-21 13:31:01 +02:00
Michał Janiszewski cb74c5bbb6 Fix globals that really aren't 2020-04-21 13:30:55 +02:00
Breno Rodrigues Guimarães 374b744477
Use Formatter to handle argument formatting for tooltips (#11379) 2020-04-21 12:38:59 +02:00
Michael Steenbeek b94dfab7d0
Merge pull request #11383 from tupaschoal/followup-11163 
Simplify logic in ride_ratings_score_close_proximity_in_direction()
 2020-04-21 12:36:39 +02:00
Tulio Leao 12beb78377
Use enum for PeepState instead of raw Number on NewsItem (#11384) 2020-04-21 12:33:53 +02:00
Mustapha Elghoul b38bf7a438 Grouped Alike Functions in Vehicle.h 2020-04-20 22:52:22 -04:00
Tulio Leao dedd0cd54f Use CoordsXY on ride_ratings_score_close_proximity_in_direction() 2020-04-20 23:33:56 -03:00
Tulio Leao a7c103261a Use BaseZ and ClearanceZ on ride_ratings_score_close_proximity_in_direction() 2020-04-20 23:28:59 -03:00
Mustapha Elghoul e627b1680c Part of #9473: Create 5 Vehicle::CableLiftUpdate... from cable_lift_update_... 2020-04-20 22:12:42 -04:00
Breno Rodrigues Guimarães 2479256bc1
Adjust Formatter function names according to coding style (#11378) 2020-04-20 18:55:15 -03:00
Michael Steenbeek e1e58423fc
Replace RideTypeHasRideGroups with flag (#11375) 2020-04-20 21:50:35 +02:00
Olivier Wervers fc5a5fe320
Fix #11370: Copy and paste shortcuts switched (#11373) 2020-04-20 12:16:50 +02:00
ifimfree fb6dd4bfad
Create constants for a few flags 2020-04-20 10:39:26 +02:00
Breno Rodrigues Guimarães d4a2a98e20
Replacing set_format_arg_on macro in favor of a more C++zy solution (#11350) 2020-04-20 07:10:33 +02:00
Michael Steenbeek d2cf9d46e5
Merge pull request #11365 from Gymnasiast/refactor/rtd-plus-plus 
Move upkeep costs to RTD
 2020-04-19 23:25:00 +02:00
Olivier Wervers 3830347294
Switch tile inspector copy paste button placement (#11358) 2020-04-19 22:41:45 +02:00
Tulio Leao 4d679b7e3e
Fix #11361: rct_object_filters leak in EditorObjectSelection.cpp (#11364) 2020-04-19 16:28:01 -03:00
Gymnasiast d2b71392cf
Move upkeep costs to RTD 2020-04-19 21:27:22 +02:00
Gymnasiast f17014877a
Put all upkeep costs together (as an intermediate step) 2020-04-19 21:27:22 +02:00
Gymnasiast 19646a29a5
Remove duplicated code with function call 2020-04-19 21:13:20 +02:00
Gymnasiast 7d50a2d186
Move alternate ride type to RTD 2020-04-19 18:44:38 +02:00
Gymnasiast 25f363625c
Rename field in RideData5 to something more descriptive 2020-04-19 18:20:20 +02:00
Gymnasiast 9503672730
Remove unused bits from rct_ride_data_5 2020-04-19 18:10:50 +02:00
Gymnasiast 02d3be4d4f
Remove unused variable 2020-04-19 18:06:52 +02:00
Gymnasiast 99d270388b
Move ride start piece to RTD 2020-04-19 18:05:57 +02:00
Duncan a2efc49bcd
Merge pull request #11357 from Gymnasiast/fix/1148 
Fix #1148: Research funding dropdown not shown in finances window
 2020-04-19 16:06:49 +01:00
Breno Rodrigues Guimarães 3c1bdcd201
Create a compile-time table for converting color codepoints to utf8 (#11349) 
For this to be possible, the function to convert a codepoint to urf8 was
moved to the header and made constexpr.

Now it's not necessary to store a std::string just to serve as a buffer
for holding this string. All the computation is done at compile time.
 2020-04-19 15:51:01 +02:00
Michael Steenbeek deb56c2a72
Move LiftData to RTDs (#11347) 2020-04-19 14:41:26 +02:00
Tulio Leao 629181b88d
Fix mistake in #11345: Remove all Peeps also removing staff (#11352) 2020-04-19 14:40:25 +02:00
Gymnasiast 860924dfb0
Fix #1148: Research funding dropdown not shown in finances window 2020-04-19 14:29:56 +02:00
Ted John b9e85f6b90
Fix #11259: Custom JSON object breaks saves (#11356) 
Do not attempt to pack JSON objects into S6 files.
 2020-04-19 14:18:12 +02:00
Michał Janiszewski 5bfc41f49e
openrct2-ui cast fixes (#11348) 2020-04-19 14:08:22 +02:00
Michael Steenbeek d3a5446114
Create ride type flag for suspended rides (#11355) 2020-04-19 13:53:51 +02:00
Michael Steenbeek 957294568f
Use constants in ride_entry_get_supported_track_pieces() (#11337) 2020-04-19 13:33:01 +02:00
Michael Steenbeek 8127437de1
Reduce direct ride type checking; move available piece lookup to RTD (#11353) 2020-04-19 13:32:43 +02:00
frutiemax d3b702603d
Fix #10483: Changing footpath type won't remove the elements on it. (#11306) 
Changing footpath type for an existing footpath does not remove elements on it, such as benches, lamps, etc. Also handles changes from and to queue paths properly.

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
Co-authored-by: Michał Janiszewski <janisozaur@gmail.com>
 2020-04-19 07:11:15 -03:00
Duncan 6a2b4a0a27
Merge pull request #11257 from hdpoliveira/vehicle_update_9473 
Part of #9473: Convert cable_lift_update to Vehicle private method Ca…
 2020-04-19 08:03:09 +01:00
Duncan 6570741a1c
Fix #11343, 11344. Remove all peeps cheat causes a crash/hang (#11345) 
* Fix #11343, 11344. Remove all peeps cheat causes a crash/hang

Caused by a refactor.

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2020-04-18 15:43:05 -03:00
Tulio Leao 523e6ca4a0
Fix #11340: Sound bar only working when maxed out (#11341) 
The changesets replacing c-style casts with named casts mistakenly added some parentheses in the wrong place, changing the evauluation order.
 2020-04-18 20:21:30 +02:00
hdpoliveira fd111403f1 Part of #9473: vehicle_update_track_motion to Vehicle::UpdateTrackMotion 2020-04-18 14:41:47 -03:00
hdpoliveira bbdd70395f Part of #9473: vehicle_current_tower_element_is_top to Vehicle::CurrentTowerElementIsTop 2020-04-18 14:41:47 -03:00
hdpoliveira 49b37aafe8 Part of #9473: vehicle_check_if_missing to Vehicle::CheckIfMissing 2020-04-18 14:41:35 -03:00
hdpoliveira 05b9957527 Part of #9473: vehicle_update_additional_animation to Vehicle::UpdateAdditionalAnimation 2020-04-18 14:40:13 -03:00
hdpoliveira f6624f3b94 Part of #9473: vehicle_update_motion_dodgems to Vehicle::UpdateMotionDodgems 2020-04-18 14:39:14 -03:00
hdpoliveira ed60a4996d Part of #9473: vehicle_update_crash_setup and vehicle_update_collision_setup 2020-04-18 14:39:14 -03:00
hdpoliveira 276e0c5691 Part of #9473: vehicle_update_boat_location to Vehicle::UpdateBoatLocation 2020-04-18 14:39:13 -03:00
hdpoliveira fe9d19bff6 Part of #9473: vehicle_finish_departing to Vehicle::FinishDeparting 2020-04-18 14:39:12 -03:00
hdpoliveira d35591959a Part of #9473: vehicle_update_crossings to Vehicle::UpdateCrossings 2020-04-18 14:39:12 -03:00
hdpoliveira 3a8a2a85c7 Part of #9473: vehicle_update_travelling_boat_hire_setup to Vehicle::UpdateTravellingBoatHireSetup 2020-04-18 14:39:11 -03:00
hdpoliveira 886901b873 Part of #9473: vehicle_update_departing_boat_hire to Vehicle::UpdateDepartingBoatHire 2020-04-18 14:39:11 -03:00
hdpoliveira b69b434c1e Part of #9473: vehicle_update_motion_boat_hire to Vehicle::UpdateMotionBoatHire 2020-04-18 14:39:10 -03:00
hdpoliveira 15b3136c75 Part of #9473: vehicle_update_scream_sound to Vehicle::UpdateScreamSound 2020-04-18 14:39:10 -03:00
hdpoliveira 16d00bd204 Part of #9473: vehicle_update_sound to Vehicle::UpdateSound 2020-04-18 14:39:09 -03:00
hdpoliveira 32b3448b92 Part of #9473: vehicle_update_doing_circus_show to Vehicle::UpdateDoingCircusShow 2020-04-18 14:39:09 -03:00
hdpoliveira 3d673e7d5d Part of #9473: vehicle_update_showing_film to Vehicle::UpdateShowingFilm 2020-04-18 14:39:08 -03:00
hdpoliveira a789241a73 Part of #9473: vehicle_update_waiting_for_cable_lift to Vehicle::UpdateWaitingForCableLift 2020-04-18 14:39:07 -03:00
hdpoliveira ac040a6ed1 Part of #9473: vehicle_update_unloading_passengers to Vehicle::UpdateUnloadingPassengers 2020-04-18 14:39:07 -03:00
hdpoliveira 1fceefbbc8 Part of #9473: vehicle_update_arriving to Vehicle::UpdateArriving 2020-04-18 14:39:03 -03:00
hdpoliveira e901d71efd Part of #9473: vehicle_update_travelling_boat to Vehicle::UpdateTravellingBoat 2020-04-18 14:37:12 -03:00
hdpoliveira d7f3d3f463 Part of #9473: vehicle_update_travelling_cable_lift to Vehicle::UpdateTravellingCableLift 2020-04-18 14:37:12 -03:00
hdpoliveira f6af166f34 Part of #9473: vehicle_update_travelling to Vehicle::UpdateTravelling 2020-04-18 14:37:11 -03:00
hdpoliveira 8e3d9c6f8a Part of #9473: vehicle_update_departing to Vehicle::UpdateDeparting 2020-04-18 14:37:11 -03:00
hdpoliveira 0547f1c500 Part of #9473: vehicle_update_rotating to Vehicle::UpdateRotating 2020-04-18 14:37:03 -03:00
hdpoliveira da4146d72b Part of #9473: vehicle_update_crooked_house_operating to Vehicle::UpdateCrookedHouseOperating 2020-04-18 14:35:31 -03:00
hdpoliveira 960aca09f1 Part of #9473: vehicle_update_haunted_house_operating to Vehicle::UpdateHauntedHouseOperating 2020-04-18 14:33:47 -03:00
hdpoliveira a4a2106d28 Part of #9473: vehicle_update_space_rings_operating to Vehicle::UpdateSpaceRingsOperating 2020-04-18 14:33:46 -03:00
hdpoliveira 20ddfda72c Part of #9473: vehicle_update_ferris_wheel_rotating to Vehicle::UpdateFerrisWheelRotating 2020-04-18 14:33:46 -03:00
hdpoliveira a1cfa63d4f Part of #9473: vehicle_update_top_spin_operating to Vehicle::UpdateTopSpinOperating 2020-04-18 14:33:45 -03:00
hdpoliveira a01d05ccf8 Part of #9473: vehicle_update_simulator_operating to Vehicle::UpdateSimulatorOperating 2020-04-18 14:33:45 -03:00
hdpoliveira da52e69b26 Part of #9473: vehicle_update_swinging to Vehicle::UpdateSwinging 2020-04-18 14:33:34 -03:00
hdpoliveira e214a7e40e Part of #9473: vehicle_update_dodgems_mode to Vehicle::UpdateDodgemsMode 2020-04-18 14:29:21 -03:00
hdpoliveira fe3befcda6 Part of #9473: vehicle_update_crash to Vehicle::UpdateCrash 2020-04-18 14:29:20 -03:00
hdpoliveira d39b4e9400 Part of #9473: vehicle_update_waiting_to_depart to Vehicle::UpdateWaitingToDepart 2020-04-18 14:29:20 -03:00
hdpoliveira 3b5f9a372f Part of #9473: Convert vehicle_update_moving_to_end_of_station to Vehicle::UpdateMovingToEndOfStation 2020-04-18 14:29:19 -03:00
hdpoliveira 857db2925c Part of #9473: Convert cable_lift_update to Vehicle private method CableLiftUpdate 2020-04-18 14:29:19 -03:00
Michael Steenbeek 3bf316ee8c
Merge pull request #11336 from Gymnasiast/refactor/available-breakdowns-to-rtd 
Move available breakdowns, category and independent listing flag to RTD
 2020-04-18 18:31:39 +02:00
Michael Steenbeek 20a0cea903
Fix #11325: Space rings change colours and show incorrect sprites (#11338) 2020-04-18 18:19:01 +02:00
Tulio Leao e2be89648e
Fix #6119: Advertising campaign for ride window not updated properly (#11335) 2020-04-18 16:15:04 +02:00
Eyal Minsky-Fenick 2ef77414d5
Ensure ride->inspection_station is set in ride_prepare_breakdown (#10245) 2020-04-18 15:30:25 +02:00
Gymnasiast 5d3bf2be20
Move category to RTD; move RideTypeIsIndependent to a flag 2020-04-18 15:22:41 +02:00
Gymnasiast c41fb64535
Move available breakdowns to RTD 2020-04-18 15:22:41 +02:00
Michael Steenbeek 35bbf6a166
Fix refactor mistake that prevents compilation (#11334) 2020-04-18 14:56:38 +02:00
Tulio Leao 95b43684d0
Change advertise campaign variable type to avoid casts (#11333) 2020-04-18 14:34:07 +02:00
Tulio Leao 2b68610473
Fix #11331: Create constant for failure on ScenarioCompletedCompanyValue (#11332) 2020-04-18 13:46:18 +02:00
Tulio Leao 935cfe90fc
Use named casts on openrct2-ui/windows (#11136) 2020-04-18 13:32:48 +02:00
Olivier Wervers b71062ce1b
Fix #6530: Make land tools work consistently on park borders (#11181) 
Makes all land tools behave the same
 2020-04-18 08:19:03 -03:00
Duncan 8e178ef0ac
Merge pull request #11274 from TomasZilinek/issue11075fix 
Fix #11075 SpriteListHead Refactor
 2020-04-18 11:55:10 +01:00
Olivier Wervers bb72fd6021
Fix #9029: Set animation frame on doors using the tile inspector (#11206) 2020-04-18 07:43:46 -03:00
duncanspumpkin b81f6d0bed Fix crash caused by bad pointers 2020-04-18 11:41:05 +01:00