diff options
| author | tycho <work.tycho@gmail.com> | 2015-05-19 20:32:10 +0200 |
|---|---|---|
| committer | tycho <work.tycho@gmail.com> | 2015-05-19 20:32:10 +0200 |
| commit | 77f1f58c0a7eb55001b375f1945690ed5c1e87a2 (patch) | |
| tree | 99e4b53b2966bd4d9bf545d18ddb7edb89472830 /src/BlockEntities | |
| parent | Added LuaState support for all integral types (diff) | |
| download | cuberite-77f1f58c0a7eb55001b375f1945690ed5c1e87a2.tar cuberite-77f1f58c0a7eb55001b375f1945690ed5c1e87a2.tar.gz cuberite-77f1f58c0a7eb55001b375f1945690ed5c1e87a2.tar.bz2 cuberite-77f1f58c0a7eb55001b375f1945690ed5c1e87a2.tar.lz cuberite-77f1f58c0a7eb55001b375f1945690ed5c1e87a2.tar.xz cuberite-77f1f58c0a7eb55001b375f1945690ed5c1e87a2.tar.zst cuberite-77f1f58c0a7eb55001b375f1945690ed5c1e87a2.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/BlockEntities/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/BlockEntities/MobSpawnerEntity.cpp | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/BlockEntities/CMakeLists.txt b/src/BlockEntities/CMakeLists.txt index 5f4af288d..b0bfca5e4 100644 --- a/src/BlockEntities/CMakeLists.txt +++ b/src/BlockEntities/CMakeLists.txt @@ -41,6 +41,11 @@ SET (HDRS NoteEntity.h SignEntity.h) +if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + set_source_files_properties(BeaconEntity.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=conversion -Wno-error=switch-enum") + set_source_files_properties(NoteEntity.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=conversion -Wno-error=sign-conversion") +endif() + if(NOT MSVC) add_library(BlockEntities ${SRCS} ${HDRS}) endif() diff --git a/src/BlockEntities/MobSpawnerEntity.cpp b/src/BlockEntities/MobSpawnerEntity.cpp index 764d7af84..f8222822c 100644 --- a/src/BlockEntities/MobSpawnerEntity.cpp +++ b/src/BlockEntities/MobSpawnerEntity.cpp @@ -246,9 +246,9 @@ int cMobSpawnerEntity::GetNearbyMonsterNum(eMonsterType a_EntityType) class cCallback : public cChunkDataCallback { public: - cCallback(Vector3d a_SpawnerPos, eMonsterType a_EntityType, int & a_NumEntities) : + cCallback(Vector3d a_SpawnerPos, eMonsterType a_CallbackEntityType, int & a_NumEntities) : m_SpawnerPos(a_SpawnerPos), - m_EntityType(a_EntityType), + m_EntityType(a_CallbackEntityType), m_NumEntities(a_NumEntities) { } |