diff options
| author | archshift <admin@archshift.com> | 2014-04-27 00:32:14 +0200 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2014-04-27 00:32:14 +0200 |
| commit | e2194e6e9083b54914deac3a5a6c2e3e4d262990 (patch) | |
| tree | 9a8ebfcbddfae9fc68e40fad566695f0291751a3 | |
| parent | Merge pull request #941 from archshift/master (diff) | |
| download | cuberite-e2194e6e9083b54914deac3a5a6c2e3e4d262990.tar cuberite-e2194e6e9083b54914deac3a5a6c2e3e4d262990.tar.gz cuberite-e2194e6e9083b54914deac3a5a6c2e3e4d262990.tar.bz2 cuberite-e2194e6e9083b54914deac3a5a6c2e3e4d262990.tar.lz cuberite-e2194e6e9083b54914deac3a5a6c2e3e4d262990.tar.xz cuberite-e2194e6e9083b54914deac3a5a6c2e3e4d262990.tar.zst cuberite-e2194e6e9083b54914deac3a5a6c2e3e4d262990.zip | |
| -rw-r--r-- | src/BlockEntities/CommandBlockEntity.cpp | 3 | ||||
| -rw-r--r-- | src/BlockEntities/MobHeadEntity.cpp | 2 | ||||
| -rw-r--r-- | src/Entities/Entity.cpp | 2 | ||||
| -rw-r--r-- | src/Mobs/AggressiveMonster.cpp | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/src/BlockEntities/CommandBlockEntity.cpp b/src/BlockEntities/CommandBlockEntity.cpp index 96ca0ac37..146ad915b 100644 --- a/src/BlockEntities/CommandBlockEntity.cpp +++ b/src/BlockEntities/CommandBlockEntity.cpp @@ -21,7 +21,8 @@ cCommandBlockEntity::cCommandBlockEntity(int a_X, int a_Y, int a_Z, cWorld * a_World) : super(E_BLOCK_COMMAND_BLOCK, a_X, a_Y, a_Z, a_World), m_ShouldExecute(false), - m_IsPowered(false) + m_IsPowered(false), + m_Result(0) {} diff --git a/src/BlockEntities/MobHeadEntity.cpp b/src/BlockEntities/MobHeadEntity.cpp index c0a1781f6..dc9c18d58 100644 --- a/src/BlockEntities/MobHeadEntity.cpp +++ b/src/BlockEntities/MobHeadEntity.cpp @@ -14,6 +14,8 @@ cMobHeadEntity::cMobHeadEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) : super(E_BLOCK_HEAD, a_BlockX, a_BlockY, a_BlockZ, a_World), + m_Type(SKULL_TYPE_SKELETON), + m_Rotation(SKULL_ROTATION_NORTH), m_Owner("") { } diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index 7c8e18b51..827b88717 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -53,6 +53,8 @@ cEntity::cEntity(eEntityType a_EntityType, double a_X, double a_Y, double a_Z, d , m_TicksSinceLastVoidDamage(0) , m_IsSwimming(false) , m_IsSubmerged(false) + , m_AirLevel(0) + , m_AirTickTimer(0) , m_HeadYaw( 0.0 ) , m_Rot(0.0, 0.0, 0.0) , m_Pos(a_X, a_Y, a_Z) diff --git a/src/Mobs/AggressiveMonster.cpp b/src/Mobs/AggressiveMonster.cpp index 3e5f72dbf..4997952be 100644 --- a/src/Mobs/AggressiveMonster.cpp +++ b/src/Mobs/AggressiveMonster.cpp @@ -108,7 +108,7 @@ void cAggressiveMonster::Attack(float a_Dt) bool cAggressiveMonster::IsMovingToTargetPosition() { - float epsilon = 0.000000000001; + static const float epsilon = 0.000000000001; // Difference between destination x and target x is negligible (to 10^-12 precision) if (fabsf((float)m_FinalDestination.x - (float)m_Target->GetPosX()) < epsilon) { |