diff options
| author | Tiger Wang <ziwei.tiger@outlook.com> | 2021-04-06 17:09:16 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@outlook.com> | 2021-04-12 23:35:07 +0200 |
| commit | 6e80f7544d786443d3028308e244b04dd8d5abcb (patch) | |
| tree | 7d9cd372cefa110a4a7c14078a04e9829cba00f4 /src/Entities/Entity.cpp | |
| parent | Streamline player abilities handling (diff) | |
| download | cuberite-6e80f7544d786443d3028308e244b04dd8d5abcb.tar cuberite-6e80f7544d786443d3028308e244b04dd8d5abcb.tar.gz cuberite-6e80f7544d786443d3028308e244b04dd8d5abcb.tar.bz2 cuberite-6e80f7544d786443d3028308e244b04dd8d5abcb.tar.lz cuberite-6e80f7544d786443d3028308e244b04dd8d5abcb.tar.xz cuberite-6e80f7544d786443d3028308e244b04dd8d5abcb.tar.zst cuberite-6e80f7544d786443d3028308e244b04dd8d5abcb.zip | |
Diffstat (limited to 'src/Entities/Entity.cpp')
| -rw-r--r-- | src/Entities/Entity.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index 6c777aca4..c8a6b8ef9 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -33,7 +33,7 @@ static UInt32 GetNextUniqueID(void) //////////////////////////////////////////////////////////////////////////////// // cEntity: -cEntity::cEntity(eEntityType a_EntityType, Vector3d a_Pos, double a_Width, double a_Height): +cEntity::cEntity(eEntityType a_EntityType, Vector3d a_Pos, float a_Width, float a_Height): m_UniqueID(GetNextUniqueID()), m_Health(1), m_MaxHealth(1), @@ -59,8 +59,6 @@ cEntity::cEntity(eEntityType a_EntityType, Vector3d a_Pos, double a_Width, doubl m_IsInLava(false), m_IsInWater(false), m_IsHeadInWater(false), - m_Width(a_Width), - m_Height(a_Height), m_AirLevel(MAX_AIR_LEVEL), m_AirTickTimer(DROWNING_TICKS), m_TicksAlive(0), @@ -71,6 +69,8 @@ cEntity::cEntity(eEntityType a_EntityType, Vector3d a_Pos, double a_Width, doubl m_Position(a_Pos), m_WaterSpeed(0, 0, 0), m_Mass (0.001), // Default 1g + m_Width(a_Width), + m_Height(a_Height), m_InvulnerableTicks(0) { m_WorldChangeInfo.m_NewWorld = nullptr; @@ -1098,7 +1098,7 @@ void cEntity::HandlePhysics(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) NextPos = HitCoords; // Avoid movement in the direction of the blockface that has been hit and correct for collision box: - double HalfWidth = GetWidth() / 2.0; + const auto HalfWidth = GetWidth() / 2; switch (HitBlockFace) { case BLOCK_FACE_XM: @@ -1714,6 +1714,16 @@ void cEntity::SetIsTicking(bool a_IsTicking) +void cEntity::SetSize(const float a_Width, const float a_Height) +{ + m_Width = a_Width; + m_Height = a_Height; +} + + + + + void cEntity::HandleAir(void) { // Ref.: https://minecraft.gamepedia.com/Chunk_format |