From ef008d6fd2f3b337fc9a401c3dc0d285c05d9400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 9 Sep 2016 21:56:40 +0200 Subject: [PATCH] Fixes for GCC6.1 on Linux GCC6.1 does not support non-trivial designated initializers, but there are so few fields used, they don't have to be used. --- test/testpaint/intercept_2.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/test/testpaint/intercept_2.cpp b/test/testpaint/intercept_2.cpp index 5a7fd268e3..b04e95f513 100644 --- a/test/testpaint/intercept_2.cpp +++ b/test/testpaint/intercept_2.cpp @@ -308,14 +308,16 @@ namespace Intercept2 RCT2_GLOBAL(0x00F441A4, uint32) = PALETTE_A4; RCT2_GLOBAL(0x00F4419C, uint32) = PALETTE_9C; - rct_drawpixelinfo dpi = {.zoom_level = 1}; + rct_drawpixelinfo dpi = { 0 }; + dpi.zoom_level = 1; unk_140E9A8 = &dpi; rct_vehicle vehicle = {0}; rct_ride ride = {0}; rct_ride_entry rideEntry = {0}; - rct_ride_entry_vehicle vehicleEntry = {.base_image_id = 0x70000}; + rct_ride_entry_vehicle vehicleEntry { 0 }; + vehicleEntry.base_image_id = 0x70000; rideEntry.vehicles[0] = vehicleEntry; @@ -472,14 +474,16 @@ namespace Intercept2 RCT2_GLOBAL(0x00F441A4, uint32) = PALETTE_A4; RCT2_GLOBAL(0x00F4419C, uint32) = PALETTE_9C; - rct_drawpixelinfo dpi = {.zoom_level = 1}; + rct_drawpixelinfo dpi { 0 }; + dpi.zoom_level = 1; unk_140E9A8 = &dpi; rct_vehicle vehicle = {0}; rct_ride ride = {0}; rct_ride_entry rideEntry = {0}; - rct_ride_entry_vehicle vehicleEntry = {.base_image_id = 0x70000}; + rct_ride_entry_vehicle vehicleEntry { 0 }; + vehicleEntry.base_image_id = 0x70000; rideEntry.vehicles[0] = vehicleEntry; @@ -660,14 +664,16 @@ namespace Intercept2 RCT2_GLOBAL(0x00F441A4, uint32) = PALETTE_A4; RCT2_GLOBAL(0x00F4419C, uint32) = PALETTE_9C; - rct_drawpixelinfo dpi = {.zoom_level = 1}; + rct_drawpixelinfo dpi = { 0 }; + dpi.zoom_level = 1; unk_140E9A8 = &dpi; rct_vehicle vehicle = {0}; rct_ride ride = {0}; rct_ride_entry rideEntry = {0}; - rct_ride_entry_vehicle vehicleEntry = {.base_image_id = 0x70000}; + rct_ride_entry_vehicle vehicleEntry = { 0 }; + vehicleEntry.base_image_id = 0x70000; rideEntry.vehicles[0] = vehicleEntry;