diff options
| author | Mattes D <github@xoft.cz> | 2016-08-24 21:45:03 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2016-08-24 22:26:53 +0200 |
| commit | d2e8643607424cd74616e2e863f5609e7b8458a5 (patch) | |
| tree | d5afab6035ca6bb0b58fd03ad5cfe3b3f8e1da55 /src/Mobs | |
| parent | Merge pull request #3342 from cuberite/FixEmptyHeader (diff) | |
| download | cuberite-d2e8643607424cd74616e2e863f5609e7b8458a5.tar cuberite-d2e8643607424cd74616e2e863f5609e7b8458a5.tar.gz cuberite-d2e8643607424cd74616e2e863f5609e7b8458a5.tar.bz2 cuberite-d2e8643607424cd74616e2e863f5609e7b8458a5.tar.lz cuberite-d2e8643607424cd74616e2e863f5609e7b8458a5.tar.xz cuberite-d2e8643607424cd74616e2e863f5609e7b8458a5.tar.zst cuberite-d2e8643607424cd74616e2e863f5609e7b8458a5.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Mobs/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Mobs/Rabbit.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/Mobs/CMakeLists.txt b/src/Mobs/CMakeLists.txt index 85fdb4b1b..44c664b6e 100644 --- a/src/Mobs/CMakeLists.txt +++ b/src/Mobs/CMakeLists.txt @@ -81,7 +81,7 @@ SET (HDRS ZombiePigman.h) if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set_source_files_properties(Monster.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=sign-conversion -Wno-error=conversion -Wno-error=switch -Wno-error=switch-enum -Wno-error=float-equal ") + set_source_files_properties(Monster.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=switch -Wno-error=switch-enum") endif() if(NOT MSVC) diff --git a/src/Mobs/Rabbit.h b/src/Mobs/Rabbit.h index aafd979d1..289ff0282 100644 --- a/src/Mobs/Rabbit.h +++ b/src/Mobs/Rabbit.h @@ -42,7 +42,6 @@ public: } eRabbitType GetRabbitType() const { return m_Type; } - UInt8 GetRabbitTypeAsNumber() const { return static_cast<UInt8>(GetRabbitType()); } int GetMoreCarrotTicks() const { return m_MoreCarrotTicks; } private: |