Commit Graph

17680 Commits

Author SHA1 Message Date
Tulio Leao 28812760e7 Fix some compilation warnings 2019-12-27 15:05:27 -03:00
Tulio Leao 19b7bed37e Use CoordsXY for Map::clear functions (#10439) 2019-12-27 15:58:40 +01:00
Michael Steenbeek d0744df22f
Merge pull request #10443 from tupaschoal/reduce-locationxy
Remove LocationXY usage on windows and actions
2019-12-27 15:58:26 +01:00
Michael Steenbeek 64f7cac6d6
Create getters for station height and start (#10453) 2019-12-27 15:57:40 +01:00
Michael Steenbeek 8ca0cf52a7
Replace more direct accesses to base/clearance Z with getter/setter (#10454) 2019-12-27 15:26:40 +01:00
Tulio Leao 109a90269c Prefer setNull/isNull on TopToolbar over LOCATION_NULL 2019-12-27 09:52:31 -03:00
Tulio Leao 48c2dc31bc Remove LocationXY usage on openrct2\actions\RideDemolishAction.hpp 2019-12-27 09:52:31 -03:00
Tulio Leao 4f58fd5568 Remove LocationXY usage on openrct2\actions\LandSmoothAction.hpp 2019-12-27 09:52:31 -03:00
Tulio Leao 15f873c018 Remove LocationXY usage on openrct2-ui\windows\ViewClipping.cpp 2019-12-27 09:52:27 -03:00
Tulio Leao 05ef277cbd Remove LocationXY usage on openrct2-ui\windows\TopToolbar.cpp 2019-12-27 09:22:51 -03:00
Tulio Leao 3c3e179e7f Remove LocationXY usage on openrct2-ui\windows\RideConstruction.cpp 2019-12-27 09:22:51 -03:00
Michael Steenbeek 26cce7e82b
Merge pull request #10444 from tupaschoal/reduce-locationxy-ride
Remove LocationXY usage on ride and peep
2019-12-27 13:13:11 +01:00
Tulio Leao a4e99695d4 Remove LocationXY usage on openrct2\peep\Staff.cpp 2019-12-27 08:49:35 -03:00
Tulio Leao 37973c162f Remove LocationXY usage on openrct2\peep\Guest.cpp 2019-12-27 08:49:35 -03:00
Tulio Leao 9ec25e85cb Coords for map_get_tile* (#10440)
* Make Map::map_get_tile_side() use CoordsXY
* Make Map::map_get_tile_quadrant() use CoordsXY
2019-12-27 12:36:47 +01:00
Tulio Leao 99002ec8e4 Remove LocationXY usage on openrct2\ride\thrill\MagicCarpet.cpp 2019-12-27 08:31:15 -03:00
Tulio Leao 1d011630be Remove LocationXY usage on openrct2\ride\Ride.cpp 2019-12-27 08:31:15 -03:00
Tulio Leao d47ac61578 Remove LocationXY usage on openrct2\ride\coaster\WoodenRollerCoaster.cpp 2019-12-27 08:31:15 -03:00
Tulio Leao 4f93d6a0f9 Remove LocationXY usage on openrct2\ride\CableLift.cpp 2019-12-27 08:31:15 -03:00
Tulio Leao e827509786 Make Map::sign_set_colour() use CoordsXYZD (#10441)
* Make Map::sign_set_colour() use CoordsXYZD

* Rename Map::sign_set_colour()
2019-12-26 15:18:51 +00:00
ζeh Matt daebab266a
Merge pull request #10428 from ZehMatt/refactor/guest-happiness-calc
Use integer math for guest initial happiness calculation
2019-12-26 13:56:35 +01:00
Matt cfe90c3c3b
Bump up network version 2019-12-26 13:30:02 +01:00
Matt ef4245572c
Use integer math for guest initial happiness calculation 2019-12-26 13:29:35 +01:00
ζeh Matt 518780c3e8
Merge pull request #10422 from ZehMatt/refactor/gCommandExpenditure
Refactor out gCommandExpenditureType
2019-12-25 01:49:46 +01:00
Michael Steenbeek b8687511a4
Merge pull request #10436 from tupaschoal/coords-large-scenery
Make Map's large scenery functions use Coords objects
2019-12-24 15:51:20 +01:00
Michael Steenbeek 471a085fba
Merge pull request #10435 from tupaschoal/coords-for-get-track
Make Map::map_get_track_element_at*() use CoordsXYZ*
2019-12-24 15:47:31 +01:00
Tulio Leao ef31ce8149 Improve readability on ride_create_vehicles_find_first_block 2019-12-24 11:19:06 -03:00
Tulio Leao 0c2e5747b8 Clarify test coords conversions 2019-12-24 11:19:06 -03:00
Tulio Leao 81647b3dd8 Make Map::map_get_track_element_at_with_direction_from_ride() use CoordsXYZD 2019-12-24 11:19:06 -03:00
Tulio Leao 6ab46bd74a Make Map::map_get_track_element_at_from_ride() use CoordsXYZ 2019-12-24 11:19:06 -03:00
Tulio Leao c718d2be42 Make Map::map_get_track_element_at_of_type_from_ride() use CoordsXYZ 2019-12-24 11:19:06 -03:00
Tulio Leao 21435a4d01 Make Map::map_get_track_element_at_of_type_seq() use CoordsXYZ 2019-12-24 11:19:05 -03:00
Tulio Leao 77503fee97 Make Map::map_get_track_element_at_of_type() use CoordsXYZ 2019-12-24 11:19:05 -03:00
Tulio Leao 6c998d7b4d Make Map::map_get_track_element_at() use CoordsXYZ 2019-12-24 11:19:03 -03:00
Michael Steenbeek 10c9a48fd6
Merge pull request #10438 from duncanspumpkin/refactor_ride
Refactor ride remove LocationXY8
2019-12-24 14:31:34 +01:00
duncanspumpkin 18af061c16 Fix formatting 2019-12-24 12:22:54 +00:00
duncanspumpkin 38434ad688 Use CoordsXYZ for cable lift location 2019-12-24 12:04:14 +00:00
duncanspumpkin a3a4a7f153 Make suggested changes 2019-12-24 12:04:07 +00:00
duncanspumpkin 0f90b2c353 Rename variable as its technically new 2019-12-24 11:46:56 +00:00
duncanspumpkin 370a9b1113 Change type of cur_test_track_location 2019-12-24 11:44:01 +00:00
duncanspumpkin c08958a705 Prepare cur_test_track_location for type change 2019-12-24 11:43:55 +00:00
duncanspumpkin a5ad2f9a87 Change overall view and boat hire return type to TileCoordsXY 2019-12-24 08:51:48 +00:00
duncanspumpkin 58339cff2b Prepare overall_view for type change 2019-12-24 08:39:20 +00:00
duncanspumpkin 0a5d094785 Change type of ChairLiftBullwheel to TileCoordsXYZ 2019-12-24 08:28:10 +00:00
Michael Steenbeek 606f74af37
Merge pull request #10414 from Gymnasiast/refactor/getter-base-height
Create getters for GetBaseHeight()/GetClearanceHeight()
2019-12-23 20:30:30 +01:00
Gymnasiast 62fcbb07ca
Rename methods to GetBaseZ/GetClearanceZ 2019-12-23 20:08:37 +01:00
Gymnasiast 85ecb52e7c
Manually replace more Z occurrences 2019-12-23 20:05:26 +01:00
Gymnasiast 7d11858dbe
Create getter for GetBaseHeight()/GetClearanceHeight() 2019-12-23 20:05:24 +01:00
Duncan b330d3816f Reduce LocationXY usage in vehicle.cpp (#10431)
Note changed logic on boat hire (Now uses ToTileCentre() before didn't do the & ~0x1F)
and chairlift (Now actually checks the z coordinate of the bullwheel when going backwards {not sure if that is even possible}).
Both likely minor bugs.
2019-12-23 17:53:36 +01:00
Tulio Leao 27866e992d Make Map::check_max_allowable_land_rights_for_tile() receive CoordsXYZ (#10433) 2019-12-23 17:24:41 +01:00