diff options
| author | Mattes D <github@xoft.cz> | 2016-01-06 16:20:12 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2016-01-06 16:20:12 +0100 |
| commit | 491dbda7d33a154e71c68f2fd79e55436cc24eae (patch) | |
| tree | 58db7ffefac6b6878f9ebc37ff7d754f56cceabd /src/Entities | |
| parent | Merge pull request #2844 from mathias-github/silktouch (diff) | |
| download | cuberite-491dbda7d33a154e71c68f2fd79e55436cc24eae.tar cuberite-491dbda7d33a154e71c68f2fd79e55436cc24eae.tar.gz cuberite-491dbda7d33a154e71c68f2fd79e55436cc24eae.tar.bz2 cuberite-491dbda7d33a154e71c68f2fd79e55436cc24eae.tar.lz cuberite-491dbda7d33a154e71c68f2fd79e55436cc24eae.tar.xz cuberite-491dbda7d33a154e71c68f2fd79e55436cc24eae.tar.zst cuberite-491dbda7d33a154e71c68f2fd79e55436cc24eae.zip | |
Diffstat (limited to 'src/Entities')
| -rw-r--r-- | src/Entities/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/Entities/Player.cpp | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/Entities/CMakeLists.txt b/src/Entities/CMakeLists.txt index 71964e90d..0416d5338 100644 --- a/src/Entities/CMakeLists.txt +++ b/src/Entities/CMakeLists.txt @@ -61,10 +61,7 @@ SET (HDRS WitherSkullEntity.h) if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set_source_files_properties(Entity.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=sign-conversion -Wno-error=global-constructors -Wno-error=switch-enum ") - set_source_files_properties(EntityEffect.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=switch-enum ") - set_source_files_properties(Floater.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=sign-conversion ") - set_source_files_properties(Player.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=sign-conversion -Wno-error=switch-enum -Wno-error=conversion ") + set_source_files_properties(Entity.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=global-constructors") endif() if(NOT MSVC) diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index bede603e2..80f07cb65 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -908,7 +908,15 @@ void cPlayer::KilledBy(TakeDamageInfo & a_TDI) case dtEnderPearl: DamageText = "misused an ender pearl"; break; case dtAdmin: DamageText = "was administrator'd"; break; case dtExplosion: DamageText = "blew up"; break; - default: DamageText = "died, somehow; we've no idea how though"; break; + case dtAttack: DamageText = "was attacked by thin air"; break; + #ifndef __clang__ + default: + { + ASSERT(!"Unknown damage type"); + DamageText = "died, somehow; we've no idea how though"; + break; + } + #endif // __clang__ } AString DeathMessage = Printf("%s %s", GetName().c_str(), DamageText.c_str()); PluginManager->CallHookKilled(*this, a_TDI, DeathMessage); |