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

Patch GCC9 in more places.

This commit is contained in:
Aaron van Geffen 2020-03-23 17:42:16 +01:00
parent bd0265f1bc
commit 34d8572d85
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -434,8 +434,7 @@ static void viewport_move(int16_t x, int16_t y, rct_window* w, rct_viewport* vie
} }
} }
rct_viewport view_copy; rct_viewport view_copy = *viewport;
std::memcpy(&view_copy, viewport, sizeof(rct_viewport));
if (viewport->pos.x < 0) 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) if (viewport->width <= 0)
{ {
std::memcpy(viewport, &view_copy, sizeof(rct_viewport)); *viewport = view_copy;
return; 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) if (viewport->height <= 0)
{ {
std::memcpy(viewport, &view_copy, sizeof(rct_viewport)); *viewport = view_copy;
return; 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); viewport_shift_pixels(dpi, w, viewport, x_diff, y_diff);
} }
std::memcpy(viewport, &view_copy, sizeof(rct_viewport)); *viewport = view_copy;
} }
// rct2: 0x006E7A15 // rct2: 0x006E7A15