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

17624 Commits

Author SHA1 Message Date
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 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
ζ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
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
Tulio Leao 461095ab6c Fix #10417: Ride preview incorrectly centered 2019-12-22 01:48:28 -03:00
OpenRCT2 git bot 7f3c7ea936 Merge Localisation/master into OpenRCT2/develop. 2019-12-22 04:00:18 +00:00
Michael Steenbeek 30b03d998c
Merge pull request #10409 from tupaschoal/coords-for-set-tile-elements 
Make Map::map_set_tile_elements() use TileCoordsXY
 2019-12-21 19:12:51 +01:00
Michael Steenbeek fb2f907414
Merge pull request #10363 from duncanspumpkin/refactor 
Refactor to reduce LocationXY usage
 2019-12-21 16:24:24 +01:00
Michael Steenbeek c2565bfe1c
Merge pull request #10407 from duncanspumpkin/refactor_stations 
Fixing COORDS_NULL: Refactor stations
 2019-12-21 16:13:48 +01:00
Michael Steenbeek ef4e494532
Merge pull request #10412 from Gymnasiast/refactor/lesslocationxy 
Remove MakeXY16
 2019-12-21 15:34:40 +01:00
Tulio Leao 5fcfc6af00 Rename map_set_tile_elements to singular 2019-12-21 10:28:52 -03:00
Tulio Leao d7efe4de90 Make Map::map_set_tile_elements() use TileCoordsXY 2019-12-21 10:28:33 -03:00
Tulio Leao 9b1395bfb8 Make Map::map_get_banner_element_at() use CoordsXYZ (#10408) 2019-12-21 14:15:40 +01:00
Duncan 228205a199 Fix crash in dev builds due to sign issues (#10405) 2019-12-21 14:08:57 +01:00
Tulio Leao 5cd6c67abd Make Map::map_get_small_scenery_element_at() receive CoordsXY (#10406) 2019-12-21 14:08:18 +01:00
Tulio Leao 38cf4728ef Make Map::map_get_nth_element_at() use CoordsXY (#10411) 2019-12-21 14:04:00 +01:00
Gymnasiast 11cc07a2b8
Replace hard-coded index with constant 2019-12-21 14:00:45 +01:00
Gymnasiast dcc720c1ec
Remove MakeXY16() 2019-12-21 13:51:59 +01:00
duncanspumpkin 64656cdc0e Fix mistake made by auto complete 2019-12-21 12:43:13 +00:00
duncanspumpkin 521e5db4c2 Make constant values more explicit. 
Fix mistake in z coordinate conversion
 2019-12-21 12:22:59 +00:00
duncanspumpkin b34defa907 Fix testpaint 2019-12-21 12:18:34 +00:00
duncanspumpkin f346e439fc Change type of map selection a and b 2019-12-21 12:18:34 +00:00
duncanspumpkin 1f80dee4df Refactor footpath.cpp to remove LocationXY and use CoordsXY 2019-12-21 12:18:34 +00:00
duncanspumpkin 6b72b0992d Removal of LocationXY and simplify 2019-12-21 12:18:34 +00:00
duncanspumpkin df2393c3f0 Fix clang format 2019-12-21 12:17:57 +00:00
Michael Steenbeek 6b5be4765d
Merge pull request #10399 from duncanspumpkin/refactor_map_animation 
Refactor MapAnimation to use CoordsXYZ
 2019-12-21 13:12:11 +01:00
duncanspumpkin b3dafc64c3 Refactor to improve readability as per suggestions 2019-12-21 12:12:10 +00:00
duncanspumpkin 21128c5389 Undo clang format mistakes 2019-12-21 11:52:32 +00:00
duncanspumpkin 45403ac2d3 Move station_starts to TileCoordsXY 2019-12-21 11:48:13 +00:00
duncanspumpkin 7297125cae Refactor stations ready for TileCoordsXY 2019-12-21 11:26:37 +00:00
Michael Steenbeek a2b9598341
Modify code using Location8 to use isNull()/setNull() (#10403) 2019-12-21 11:34:46 +01:00
Duncan 19f9fef532
Merge pull request #10401 from tupaschoal/std-coords 
Standardize Coords and TileCoords objects
 2019-12-21 10:22:11 +00:00
duncanspumpkin f64563e0a7 Make suggested changes 2019-12-21 09:07:34 +00:00
Tulio Leao 780e3265d1 Standardize Coords and TileCoords objects 2019-12-20 08:29:42 -03:00
Duncan 3be7d824ac
Merge pull request #10397 from duncanspumpkin/refactor_gcommand 
Remove gCommandPosition. Use GameActionRes instead.
 2019-12-19 20:48:20 +00:00
duncanspumpkin 86cc7e9734 Add temporary variable to clear up shifting. 
Fix clang format.
Simplify compare
 2019-12-19 18:58:33 +00:00
duncanspumpkin ee206546bf Refactor MapAnimation to use CoordsXYZ 2019-12-19 18:38:46 +00:00
nia 1f220f2d62 Simplify OS-specific FileStream code (#10270) 
Define ftello/fseeko to ftello64/fseeko64 only on Linux,
these functions are Linux-specific extensions.

Define ftello/fseeko to _ftelli64/_fseeki64 on MSC.

Otherwise, just use the standardized ftello/fseeko, and avoid
duplicating code for different names of the same function.

This allows this code to be reused on e.g. NetBSD without piling
on additional #ifdefs for any other POSIX operating systems.
 2019-12-19 18:34:31 +01:00
Tulio Leao 918624e090 Fix #10396: Function returning TileCoordsXYZD'z coord in a CoordsXYZD object (#10398) 2019-12-19 15:41:22 +01:00
Michael Steenbeek 6ede67d50a
Merge pull request #10371 from tupaschoal/coords-for-get-surface-element-at 
Make map_get_surface_element_at only accept Coords objects
 2019-12-19 13:24:17 +01:00
Tulio Leao 7e7b4029a9 Simplified conversions from TileCoordsXYZ to CoordsXY 2019-12-19 08:12:42 -03:00