mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 16:24:35 +01:00
Code Issues Releases Wiki Activity

Make setMainView() use ScreenCoordsXY

Browse Source
This commit is contained in:
Tulio Leao
2020-02-21 20:27:26 -03:00
parent 826478a8ef
commit 47025c45b4
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2-ui/WindowManager.cpp
View File

@@ -488,7 +488,7 @@ public:
return std::string(buffer);
}
void SetMainView(int32_t x, int32_t y, int32_t zoom, int32_t rotation) override
void SetMainView(const ScreenCoordsXY& viewPos, int32_t zoom, int32_t rotation) override
{
auto mainWindow = window_get_main();
if (mainWindow != nullptr)
@@ -497,8 +497,8 @@ public:
auto zoomDifference = zoom - viewport->zoom;
mainWindow->viewport_target_sprite = SPRITE_INDEX_NULL;
mainWindow->saved_view_x = x;
mainWindow->saved_view_y = y;
mainWindow->saved_view_x = viewPos.x;
mainWindow->saved_view_y = viewPos.y;
viewport->zoom = zoom;
gCurrentRotation = rotation;

2
src/openrct2-ui/title/TitleSequencePlayer.cpp
View File

@@ -452,7 +452,7 @@ private:
void PrepareParkForPlayback()
{
auto windowManager = GetContext()->GetUiContext()->GetWindowManager();
windowManager->SetMainView(gSavedViewX, gSavedViewY, gSavedViewZoom, gSavedViewRotation);
windowManager->SetMainView({ gSavedViewX, gSavedViewY }, gSavedViewZoom, gSavedViewRotation);
reset_sprite_spatial_index();
reset_all_sprite_quadrant_placements();
auto intent = Intent(INTENT_ACTION_REFRESH_NEW_RIDES);

2
src/openrct2/Editor.cpp
View File

@@ -425,7 +425,7 @@ namespace Editor
static void FinaliseMainView()
{
auto windowManager = GetContext()->GetUiContext()->GetWindowManager();
windowManager->SetMainView(gSavedViewX, gSavedViewY, gSavedViewZoom, gSavedViewRotation);
windowManager->SetMainView({ gSavedViewX, gSavedViewY }, gSavedViewZoom, gSavedViewRotation);
reset_all_sprite_quadrant_placements();
scenery_set_default_placement_configuration();

2
src/openrct2/Game.cpp
View File

@@ -553,7 +553,7 @@ void game_load_init()
}
auto windowManager = GetContext()->GetUiContext()->GetWindowManager();
windowManager->SetMainView(gSavedViewX, gSavedViewY, gSavedViewZoom, gSavedViewRotation);
windowManager->SetMainView({ gSavedViewX, gSavedViewY }, gSavedViewZoom, gSavedViewRotation);
if (network_get_mode() != NETWORK_MODE_CLIENT)
{

2
src/openrct2/ui/DummyWindowManager.cpp
View File

@@ -53,7 +53,7 @@ namespace OpenRCT2::Ui
{
return std::string();
}
void SetMainView(int32_t x, int32_t y, int32_t zoom, int32_t rotation) override
void SetMainView(const ScreenCoordsXY& viewPos, int32_t zoom, int32_t rotation) override
{
}
void UpdateMouseWheel() override

2
src/openrct2/ui/WindowManager.h
View File

@@ -35,7 +35,7 @@ namespace OpenRCT2::Ui
virtual void HandleInput() abstract;
virtual void HandleKeyboard(bool isTitle) abstract;
virtual std::string GetKeyboardShortcutString(int32_t shortcut) abstract;
virtual void SetMainView(int32_t x, int32_t y, int32_t zoom, int32_t rotation) abstract;
virtual void SetMainView(const ScreenCoordsXY& viewPos, int32_t zoom, int32_t rotation) abstract;
virtual void UpdateMouseWheel() abstract;
virtual rct_window* GetOwner(const rct_viewport* viewport) abstract;
};