mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #10315 from duncanspumpkin/screen_2_refactor 

Refactor return value of screen_coord_to_viewport_cord
This commit is contained in:
Duncan 2019-12-01 13:22:50 +00:00 committed by GitHub
parent 1532ee2b23 0c6e062d5a
commit 3bd46ed602
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/interface/ViewportInteraction.cpp
View File

@ -680,7 +680,7 @@ CoordsXY sub_68A15E(ScreenCoordsXY screenCoords)
waterHeight = tileElement->AsSurface()->GetWaterHeight() << 4;
}
LocationXY16 initialVPPos = screen_coord_to_viewport_coord(viewport, screenCoords);
auto initialVPPos = screen_coord_to_viewport_coord(viewport, screenCoords);
CoordsXY mapPos = initialPos + CoordsXY{ 16, 16 };
for (int32_t i = 0; i < 5; i++)

6
src/openrct2/interface/Viewport.cpp
View File

@ -1042,9 +1042,9 @@ CoordsXY screen_pos_to_map_pos(ScreenCoordsXY screenCoords, int32_t* direction)
return mapCoords->ToTileStart();
}
LocationXY16 screen_coord_to_viewport_coord(rct_viewport* viewport, ScreenCoordsXY screenCoords)
ScreenCoordsXY screen_coord_to_viewport_coord(rct_viewport* viewport, ScreenCoordsXY screenCoords)
{
LocationXY16 ret;
ScreenCoordsXY ret;
ret.x = ((screenCoords.x - viewport->x) << viewport->zoom) + viewport->view_x;
ret.y = ((screenCoords.y - viewport->y) << viewport->zoom) + viewport->view_y;
return ret;
@ -1763,7 +1763,7 @@ std::optional<CoordsXY> screen_get_map_xy(ScreenCoordsXY screenCoords, rct_viewp
return std::nullopt;
}
LocationXY16 start_vp_pos = screen_coord_to_viewport_coord(myViewport, screenCoords);
auto start_vp_pos = screen_coord_to_viewport_coord(myViewport, screenCoords);
CoordsXY modifiedPos = { map_pos.x + 16, map_pos.y + 16 };
for (int32_t i = 0; i < 5; i++)

2
src/openrct2/interface/Viewport.h
View File

@ -140,7 +140,7 @@ void viewport_paint(
CoordsXYZ viewport_adjust_for_map_height(const ScreenCoordsXY startCoords);
LocationXY16 screen_coord_to_viewport_coord(rct_viewport* viewport, ScreenCoordsXY screenCoords);
ScreenCoordsXY screen_coord_to_viewport_coord(rct_viewport* viewport, ScreenCoordsXY screenCoords);
CoordsXY viewport_coord_to_map_coord(int32_t x, int32_t y, int32_t z);
CoordsXY screen_pos_to_map_pos(ScreenCoordsXY screenCoords, int32_t* direction);

2
src/openrct2/world/Footpath.cpp
View File

@ -284,7 +284,7 @@ void footpath_get_coordinates_from_pos(
}
}
LocationXY16 start_vp_pos = screen_coord_to_viewport_coord(viewport, screenCoords);
auto start_vp_pos = screen_coord_to_viewport_coord(viewport, screenCoords);
for (int32_t i = 0; i < 5; i++)
{