mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-22 23:33:04 +01:00
Code Issues Releases Wiki Activity

Refactor window_scroll_to_viewport to use rct_window::ScrollToViewport

Browse Source
This commit is contained in:
Matt
2019-06-15 17:12:14 +02:00
parent b046d45c01
commit 2053ecb688
8 changed files with 35 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/openrct2/interface/Window.cpp
View File

@@ -804,38 +804,6 @@ rct_window* window_get_main()
return nullptr;
}
/**
* Based on
* rct2: 0x696ee9, 0x66842F, 0x006AF3B3
*/
void window_scroll_to_viewport(rct_window* w)
{
int32_t x, y, z;
rct_window* mainWindow;
assert(w != nullptr);
// In original checked to make sure x and y were not -1 as well.
if (w->viewport == nullptr || w->viewport_focus_coordinates.y == -1)
return;
if (w->viewport_focus_sprite.type & VIEWPORT_FOCUS_TYPE_SPRITE)
{
rct_sprite* sprite = get_sprite(w->viewport_focus_sprite.sprite_id);
x = sprite->generic.x;
y = sprite->generic.y;
z = sprite->generic.z;
}
else
{
x = w->viewport_focus_coordinates.x;
y = w->viewport_focus_coordinates.y & VIEWPORT_FOCUS_Y_MASK;
z = w->viewport_focus_coordinates.z;
}
mainWindow = window_get_main();
if (mainWindow != nullptr)
window_scroll_to_location(mainWindow, x, y, z);
}
/**
*
* rct2: 0x006E7C9C