From 34d8572d85e9cf2068ce72b49172c2e6e0648130 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Mon, 23 Mar 2020 17:42:16 +0100 Subject: [PATCH] Patch GCC9 in more places. --- src/openrct2/interface/Viewport.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index 36924daeef..c4b7d2bda7 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -434,8 +434,7 @@ static void viewport_move(int16_t x, int16_t y, rct_window* w, rct_viewport* vie } } - rct_viewport view_copy; - std::memcpy(&view_copy, viewport, sizeof(rct_viewport)); + rct_viewport view_copy = *viewport; if (viewport->pos.x < 0) { @@ -454,7 +453,7 @@ static void viewport_move(int16_t x, int16_t y, rct_window* w, rct_viewport* vie if (viewport->width <= 0) { - std::memcpy(viewport, &view_copy, sizeof(rct_viewport)); + *viewport = view_copy; return; } @@ -475,7 +474,7 @@ static void viewport_move(int16_t x, int16_t y, rct_window* w, rct_viewport* vie if (viewport->height <= 0) { - std::memcpy(viewport, &view_copy, sizeof(rct_viewport)); + *viewport = view_copy; return; } @@ -485,7 +484,7 @@ static void viewport_move(int16_t x, int16_t y, rct_window* w, rct_viewport* vie viewport_shift_pixels(dpi, w, viewport, x_diff, y_diff); } - std::memcpy(viewport, &view_copy, sizeof(rct_viewport)); + *viewport = view_copy; } // rct2: 0x006E7A15