From 320eee0d598aae458ca811a1e836f9324045c508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?=
 <janisozaur@users.noreply.github.com>
Date: Wed, 6 Jun 2018 22:30:21 +0200
Subject: [PATCH] Fix -Wunreachable-code-break and add it to deafult warnings
 (#7634)

---
 CMakeLists.txt                            | 3 ++-
 src/openrct2-ui/audio/FileAudioSource.cpp | 1 -
 src/openrct2/core/Guard.cpp               | 1 -
 src/openrct2/network/Network.cpp          | 1 -
 src/openrct2/ride/TrackDesign.cpp         | 1 -
 5 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84d4b6487d..80076d0845 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,7 +93,8 @@ else ()
     ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_DUPLICATED_BRANCHES -Wduplicated-branches)
     ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_RESTRICT -Wrestrict)
     ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_MISSING_FIELD_INITIALIZERS -Wmissing-field-initializers)
-    
+    ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_UNREACHABLE_CODE_BREAK -Wunreachable-code-break)
+
     # Items below are not supported by ICC
     if (NOT MINGW)
         # Do not enable for MinGW, as its headers contain redundant declarations of builtin functions
diff --git a/src/openrct2-ui/audio/FileAudioSource.cpp b/src/openrct2-ui/audio/FileAudioSource.cpp
index 0630ad711d..c85dbf486b 100644
--- a/src/openrct2-ui/audio/FileAudioSource.cpp
+++ b/src/openrct2-ui/audio/FileAudioSource.cpp
@@ -132,7 +132,6 @@ namespace OpenRCT2::Audio
             default:
                 log_verbose("Invalid bits per sample");
                 return false;
-                break;
             }
             _format.channels = waveFormat.channels;
 
diff --git a/src/openrct2/core/Guard.cpp b/src/openrct2/core/Guard.cpp
index 2516324fce..2477b74586 100644
--- a/src/openrct2/core/Guard.cpp
+++ b/src/openrct2/core/Guard.cpp
@@ -98,7 +98,6 @@ namespace Guard
         switch (_assertBehaviour) {
         case ASSERT_BEHAVIOUR::ABORT:
             abort();
-            break;
         default:
         case ASSERT_BEHAVIOUR::CASSERT:
             assert(false);
diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp
index e1bced3531..3d2cbe1e42 100644
--- a/src/openrct2/network/Network.cpp
+++ b/src/openrct2/network/Network.cpp
@@ -1396,7 +1396,6 @@ bool Network::ProcessConnection(NetworkConnection& connection)
                 connection.SetLastDisconnectReason(STR_MULTIPLAYER_CONNECTION_CLOSED);
             }
             return false;
-            break;
         case NETWORK_READPACKET_SUCCESS:
             // done reading in packet
             ProcessPacket(connection, connection.InboundPacket);
diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp
index ed3545dce3..e859aa86ad 100644
--- a/src/openrct2/ride/TrackDesign.cpp
+++ b/src/openrct2/ride/TrackDesign.cpp
@@ -1158,7 +1158,6 @@ track_design_place_scenery(rct_td6_scenery_element * scenery_start, sint32 origi
                 default:
                     _trackDesignPlaceStateSceneryUnavailable = true;
                     continue;
-                    break;
                 }
                 _trackDesignPlaceCost = add_clamp_money32(_trackDesignPlaceCost, cost);
                 if (_trackDesignPlaceOperation != PTD_OPERATION_2)