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

Create ScreenCoordsXY gSavedView from separate x,y variables

Browse Source
This commit is contained in:
Tulio Leao
2020-02-21 20:32:51 -03:00
parent 47025c45b4
commit 1b3f0e9a44
9 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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(gSavedView, 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(gSavedView, 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(gSavedView, gSavedViewZoom, gSavedViewRotation);
if (network_get_mode() != NETWORK_MODE_CLIENT)
{

4
src/openrct2/interface/Screenshot.cpp
View File

@@ -733,8 +733,8 @@ int32_t cmdline_for_screenshot(const char** argv, int32_t argc, ScreenshotOption
}
else
{
viewport.view_x = gSavedViewX - (viewport.view_width / 2);
viewport.view_y = gSavedViewY - (viewport.view_height / 2);
viewport.view_x = gSavedView.x - (viewport.view_width / 2);
viewport.view_y = gSavedView.y - (viewport.view_height / 2);
viewport.zoom = gSavedViewZoom;
gCurrentRotation = gSavedViewRotation;
}

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

@@ -1,4 +1,4 @@
/*****************************************************************************
/*****************************************************************************
* Copyright (c) 2014-2019 OpenRCT2 developers
*
* For a complete list of all authors, please refer to contributors.md
@@ -45,8 +45,7 @@ rct_viewport* g_music_tracking_viewport;
static std::unique_ptr<JobPool> _paintJobs;
int16_t gSavedViewX;
int16_t gSavedViewY;
ScreenCoordsXY gSavedView;
uint8_t gSavedViewZoom;
uint8_t gSavedViewRotation;
@@ -1922,8 +1921,8 @@ void viewport_set_saved_view()
{
rct_viewport* viewport = w->viewport;
gSavedViewX = viewport->view_width / 2 + viewport->view_x;
gSavedViewY = viewport->view_height / 2 + viewport->view_y;
gSavedView = ScreenCoordsXY{ viewport->view_width / 2 + viewport->view_x,
viewport->view_height / 2 + viewport->view_y };
gSavedViewZoom = viewport->zoom;
gSavedViewRotation = get_current_rotation();

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

@@ -121,8 +121,7 @@ extern uint8_t gShowConstuctionRightsRefCount;
// rct2: 0x014234BC
extern rct_viewport g_viewport_list[MAX_VIEWPORT_COUNT];
extern rct_viewport* g_music_tracking_viewport;
extern int16_t gSavedViewX;
extern int16_t gSavedViewY;
extern ScreenCoordsXY gSavedView;
extern uint8_t gSavedViewZoom;
extern uint8_t gSavedViewRotation;

3
src/openrct2/rct1/S4Importer.cpp
View File

@@ -2680,8 +2680,7 @@ private:
void ImportSavedView()
{
gSavedViewX = _s4.view_x;
gSavedViewY = _s4.view_y;
gSavedView = ScreenCoordsXY{ _s4.view_x, _s4.view_y };
gSavedViewZoom = _s4.view_zoom;
gSavedViewRotation = _s4.view_rotation;
}

4
src/openrct2/rct2/S6Exporter.cpp
View File

@@ -360,8 +360,8 @@ void S6Exporter::Export()
this->ExportRides();
_s6.saved_age = gSavedAge;
_s6.saved_view_x = gSavedViewX;
_s6.saved_view_y = gSavedViewY;
_s6.saved_view_x = gSavedView.x;
_s6.saved_view_y = gSavedView.y;
_s6.saved_view_zoom = gSavedViewZoom;
_s6.saved_view_rotation = gSavedViewRotation;

3
src/openrct2/rct2/S6Importer.cpp
View File

@@ -383,8 +383,7 @@ public:
ImportRides();
gSavedAge = _s6.saved_age;
gSavedViewX = _s6.saved_view_x;
gSavedViewY = _s6.saved_view_y;
gSavedView = ScreenCoordsXY{ _s6.saved_view_x, _s6.saved_view_y };
gSavedViewZoom = _s6.saved_view_zoom;
gSavedViewRotation = _s6.saved_view_rotation;