flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed Clang warnings.

Browse Source
This commit is contained in:
Mattes D
2016-01-06 16:20:12 +01:00
parent 4823e78440
commit 491dbda7d3
7 changed files with 50 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Entities/CMakeLists.txt
View File

@@ -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)

10
src/Entities/Player.cpp
View File

@@ -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);