diff options
| author | peterbell10 <peterbell10@live.co.uk> | 2017-09-14 10:48:57 +0200 |
|---|---|---|
| committer | Alexander Harkness <me@bearbin.net> | 2017-09-14 10:48:57 +0200 |
| commit | 307e7aaff5c454b703db4d536c40d5715d96032b (patch) | |
| tree | e217d6a073e6b87aaeb6618a933676d3251b9355 /src/UI | |
| parent | Updated compile.sh script (#4009) (diff) | |
| download | cuberite-307e7aaff5c454b703db4d536c40d5715d96032b.tar cuberite-307e7aaff5c454b703db4d536c40d5715d96032b.tar.gz cuberite-307e7aaff5c454b703db4d536c40d5715d96032b.tar.bz2 cuberite-307e7aaff5c454b703db4d536c40d5715d96032b.tar.lz cuberite-307e7aaff5c454b703db4d536c40d5715d96032b.tar.xz cuberite-307e7aaff5c454b703db4d536c40d5715d96032b.tar.zst cuberite-307e7aaff5c454b703db4d536c40d5715d96032b.zip | |
Diffstat (limited to 'src/UI')
| -rw-r--r-- | src/UI/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/UI/SlotArea.cpp | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/UI/CMakeLists.txt b/src/UI/CMakeLists.txt index d71e08ade..54236a929 100644 --- a/src/UI/CMakeLists.txt +++ b/src/UI/CMakeLists.txt @@ -34,11 +34,6 @@ SET (HDRS MinecartWithChestWindow.h WindowOwner.h) -if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set_source_files_properties(SlotArea.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=switch-enum ") - set_source_files_properties(Window.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=switch-enum ") -endif() - if(NOT MSVC) add_library(UI ${SRCS} ${HDRS}) endif() diff --git a/src/UI/SlotArea.cpp b/src/UI/SlotArea.cpp index 94fd958d5..865e9cb44 100644 --- a/src/UI/SlotArea.cpp +++ b/src/UI/SlotArea.cpp @@ -1235,8 +1235,11 @@ bool cSlotAreaBeacon::IsPlaceableItem(short a_ItemType) { return true; } + default: + { + return false; + } } - return false; } @@ -2406,8 +2409,8 @@ bool cSlotAreaArmor::CanPlaceArmorInSlot(int a_SlotNum, const cItem & a_Item) case 1: return ItemCategory::IsChestPlate(a_Item.m_ItemType); case 2: return ItemCategory::IsLeggings(a_Item.m_ItemType); case 3: return ItemCategory::IsBoots(a_Item.m_ItemType); + default: return false; } - return false; } |