mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
17,661 Commits 9 Branches 40 Tags 384 MiB
Commit Graph

17661 Commits

Author SHA1 Message Date
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
Tulio Leao c169a92f1f Make ClearAction::ClearSceneryFromTile() receive a CoordsXY object (#10432) 2019-12-23 17:12:54 +01:00
Tulio Leao 32259326bf Fix formatting on TrackDesignSave 2019-12-23 11:13:31 -03:00
Tulio Leao 6fb5524e1e Make Map::map_large_scenery_get_origin() use CoordsXYZ* 2019-12-23 10:07:20 -03:00
Tulio Leao 00e1030d09 Make Map::map_get_large_scenery_segment() use CoordsXYZD 2019-12-23 09:53:21 -03:00
Tulio Leao a2c7ecc6e5 Make Map::map_get_first_element_at() use CoordsXY (#10413) 
* Make Map::map_get_first_element_at() use CoordsXY

* Fix clang-format on ClearAction.hpp

* Prefer TileDIrectionDelta over hardcoded delta on RideConstruction

* Use named Direction constants

* Make Compat::map_get_first_element_at() use CoordsXY
 2019-12-23 07:35:41 +00:00
Matt 0aa6fc7431
Fix formatting 2019-12-22 22:06:10 +01:00
Matt 5c490b408b
Print clang-format version 2019-12-22 21:48:34 +01:00
ζeh Matt 19deee3e3a
Merge pull request #10421 from ZehMatt/fix-10420 
Fix #10420: Money effect causing false positive desync
 2019-12-22 20:55:16 +01:00
Matt 52ee9c6896
Use enum class for ExpenditureType 2019-12-22 20:51:55 +01:00
Matt 79acb6a073
Move staff wage data to Staff.cpp/h 2019-12-22 20:51:55 +01:00
Matt c24112ffad
Refactor out gCommandExpenditureType 2019-12-22 20:51:49 +01:00
nia addd27d4dc Support NetBSD and simplify platform ifdefs. (#10271) 
For files intended to support unixy freedesktopy systems,
reduce the ifdef down to __unix__ && !__APPLE__ && !__ANDROID__,
rather than naming linux and all the BSDs and so on by hand.

Should simplify adding support for systems like illumos in the
future.

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2019-12-22 17:07:39 +01:00
Duncan 96ff8fe7a1 Change value of COORDS_NULL to a less likely to collide value. (#10423) 
It will also now match LOCATION_NULL. As this change should only affect in memory coords there should be no save, replay, network issues.
 2019-12-22 14:03:32 +01:00
Duncan e61401e48c Fix #10410: Tile Inspector does not hightlight tile correctly 
Mistake made when refactoring not passing the error up through the chain and silently working.
 2019-12-22 13:59:24 +01:00
Tulio Leao 0416c2eaa3 Merge pull request #10427 from tupaschoal/fix-10426 
Fix #10426: Deleting path moves preview in opposite direction
 2019-12-22 12:45:23 +00:00
Matt 3a3367f179
[ci skip] Update changelog.txt 2019-12-22 07:50:55 +01:00
Matt 69eb3f5d91
Bump up network version 2019-12-22 07:50:55 +01:00
Matt d60cdbe5f2
Fix #10420: Money effect causing false positive desync 2019-12-22 07:50:51 +01:00
ζeh Matt 341f85ef5f
Merge pull request #10419 from tupaschoal/fix-10417 
Fix #10417: Ride preview incorrectly centered
 2019-12-22 06:25:23 +01:00