From a5e4a0965f9cb9f7bc8fd323282a16d3bbc7b286 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Fri, 9 Jun 2017 21:02:24 +0100
Subject: [PATCH] Ignore final warnings for X8DrawingEngine

---
 openrct2.common.props                    | 3 ++-
 src/openrct2/drawing/X8DrawingEngine.cpp | 5 +++++
 src/openrct2/drawing/X8DrawingEngine.h   | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/openrct2.common.props b/openrct2.common.props
index f66464cbb9..fae5b0cf83 100644
--- a/openrct2.common.props
+++ b/openrct2.common.props
@@ -28,8 +28,9 @@
 
   <ItemDefinitionGroup>
     <ClCompile>
-      <DisableSpecificWarnings>4091;4100;4132;4200;4201;4204;4206;4221;4244;4245;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4068;4091;4100;4132;4200;4201;4204;4206;4221;4244;4245;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <!-- Warnings:
+             C4068: unknown pragma
              C4091: 'keyword': ignored on left of 'type' when no variable is declared
              C4100: 'identifier': unreferenced formal parameter
              C4132: 'identifier': const object should be initialized
diff --git a/src/openrct2/drawing/X8DrawingEngine.cpp b/src/openrct2/drawing/X8DrawingEngine.cpp
index fb539a8ab4..120ffe8a6d 100644
--- a/src/openrct2/drawing/X8DrawingEngine.cpp
+++ b/src/openrct2/drawing/X8DrawingEngine.cpp
@@ -133,6 +133,9 @@ void X8RainDrawer::Restore()
     }
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsuggest-final-methods"
+
 X8DrawingEngine::X8DrawingEngine()
 {
     _drawingContext = new X8DrawingContext(this);
@@ -464,6 +467,8 @@ void X8DrawingEngine::DrawDirtyBlocks(uint32 x, uint32 y, uint32 columns, uint32
     window_draw_all(&_bitsDPI, left, top, right, bottom);
 }
 
+#pragma GCC diagnostic pop
+
 X8DrawingContext::X8DrawingContext(X8DrawingEngine * engine)
 {
     _engine = engine;
diff --git a/src/openrct2/drawing/X8DrawingEngine.h b/src/openrct2/drawing/X8DrawingEngine.h
index 791945114a..6d47961cc7 100644
--- a/src/openrct2/drawing/X8DrawingEngine.h
+++ b/src/openrct2/drawing/X8DrawingEngine.h
@@ -59,6 +59,8 @@ namespace OpenRCT2 { namespace Drawing
         void Restore();
     };
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsuggest-final-types"
     class X8DrawingEngine : public IDrawingEngine
     {
     protected:
@@ -107,6 +109,7 @@ namespace OpenRCT2 { namespace Drawing
         void DrawAllDirtyBlocks();
         void DrawDirtyBlocks(uint32 x, uint32 y, uint32 columns, uint32 rows);
     };
+#pragma GCC diagnostic pop
 
     class X8DrawingContext final : public IDrawingContext
     {