mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 20:13:07 +01:00
Code Issues Releases Wiki Activity
17,694 Commits 8 Branches 59 Tags
77494bbc733467727367eeba7b17864be3cc0318
Commit Graph

17694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Steenbeek
77494bbc73 Create definitions for some coords related stuff (#10456) 
* Create definitions for some coords related stuff

* Use constexpr; add define for Z step
 2019-12-30 15:03:51 +00:00
Tulio Leao
2d7dccb0c2 Make Map::map_can_construct_*() use CoordsXYRangedZ (#10462) 
* Make Map::map_can_construct_with_clear_at() use CoordsXYRangedZ

* Make Map::map_can_construct_at() use CoordsXYRangedZ
 2019-12-30 15:00:42 +00:00
Michael Steenbeek
9de8fa233f Fix #5249: No collision detection when building ride entrance at heights > 85.5m (#10473) 2019-12-30 14:01:36 +01:00
Michael Steenbeek
4b0dff92aa Name word_981D6C (#10471) 2019-12-30 12:29:08 +01:00
Duncan
7a64eb4402 Fix #10470. Mistake caused by reusing variable names for different functions. (#10476) 
Added in comments to clarify why function is required. Renamed variables again to clarify what they are used for
 2019-12-30 12:26:58 +01:00
Michael Steenbeek
fa4ed37895 Fix #10468: Ride's Entrance/Exit is not buildable above a certain height level (#10472) 2019-12-29 23:48:15 +01:00
OpenRCT2 git bot
e36d87eb07 Merge Localisation/master into OpenRCT2/develop. 2019-12-29 04:00:19 +00:00
Michael Steenbeek
bad5e326d1 Merge pull request #10103 from tupaschoal/compilation-warnings 
Fix some compilation warnings
 2019-12-28 23:09:14 +01:00
Tulio Leao
98110c0544 Make Map::map_invalidate*() use CoordsXY (#10437) 
* Make Map::map_invalidate_element() use CoordsXY

* Make Map::map_invalidate_tile_full() use CoordsXY

* Make Map::map_invalidate_tile_zoom0() use CoordsXY

* Make Map::map_invalidate_tile_zoom1() use CoordsXY

* Make Map::map_invalidate_tile() use CoordsXY

* Use CoordsXYRangedZ for map invalidation

* Fix vehicle tile invalidation use Z instead of Y coord

* Fix BannerRemoveAction sending Z TileCoords to invalidate tile

* Fix wrong tile invalidation on peep_update_walking_break_scenery

* Prefer ToTileStart over bitwise and
 2019-12-28 08:44:33 +00:00
Tulio Leao
84928cb4ef Comment why GetOrLoadImageTexture returns BasicTextureInfo 2019-12-27 15:05:28 -03:00
Tulio Leao
f790fb9079 Improve variable initialisation, if statements and assertions 2019-12-27 15:05:28 -03:00
Tulio Leao
d4feed81e6 Fix C6031: return value ignored 2019-12-27 15:05:28 -03:00
Tulio Leao
1bc399537e Fix C6001: using uninitialized memory 2019-12-27 15:05:27 -03:00
Tulio Leao
6cdbb901a5 Fix C26439 SPECIAL_NOEXCEPT 2019-12-27 15:05:27 -03:00
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