From 010bc94a342770e96a005353d23d7ebf6cc5aa39 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Tue, 10 Sep 2013 22:51:07 +0100 Subject: Entities now maintain speed outside of world --- source/Entities/Entity.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'source/Entities') diff --git a/source/Entities/Entity.cpp b/source/Entities/Entity.cpp index 4066e81ab..0aaa2e899 100644 --- a/source/Entities/Entity.cpp +++ b/source/Entities/Entity.cpp @@ -491,8 +491,15 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk) if ((BlockY >= cChunkDef::Height) || (BlockY < 0)) { // Outside of the world - // TODO: Current speed should still be added to the entity position - // Otherwise TNT explosions in the void will still effect the bottommost layers of the world + + cChunk * NextChunk = a_Chunk.GetNeighborChunk(BlockX,BlockZ); + // See if we can commit our changes. If not, we will discard them. + if (NextChunk != NULL) + { + SetSpeed(NextSpeed); + NextPos += (NextSpeed * a_Dt); + SetPosition(NextPos); + } return; } -- cgit v1.2.3 From c8f8597774c47e755597eae4a120bea9479d0479 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Tue, 10 Sep 2013 23:01:02 +0100 Subject: Added void damage --- source/Entities/Entity.cpp | 23 +++++++++++++++++++++++ source/Entities/Entity.h | 6 ++++++ 2 files changed, 29 insertions(+) (limited to 'source/Entities') diff --git a/source/Entities/Entity.cpp b/source/Entities/Entity.cpp index 0aaa2e899..846d756dd 100644 --- a/source/Entities/Entity.cpp +++ b/source/Entities/Entity.cpp @@ -55,6 +55,7 @@ cEntity::cEntity(eEntityType a_EntityType, double a_X, double a_Y, double a_Z, d , m_TicksSinceLastBurnDamage(0) , m_TicksSinceLastLavaDamage(0) , m_TicksSinceLastFireDamage(0) + , m_TicksSinceLastVoidDamage(0) , m_TicksLeftBurning(0) , m_WaterSpeed(0, 0, 0) , m_Width(a_Width) @@ -472,6 +473,11 @@ void cEntity::Tick(float a_Dt, cChunk & a_Chunk) { TickBurning(a_Chunk); } + if ((a_Chunk.IsValid()) && (GetPosY() < -46)) + { + TickInVoid(a_Chunk); + } + else { m_TicksSinceLastVoidDamage = 0; } } @@ -803,6 +809,23 @@ void cEntity::TickBurning(cChunk & a_Chunk) +void cEntity::TickInVoid(cChunk & a_Chunk) +{ + if (m_TicksSinceLastVoidDamage == 20) + { + TakeDamage(dtInVoid, NULL, 2, 0); + m_TicksSinceLastVoidDamage = 0; + } + else + { + m_TicksSinceLastVoidDamage++; + } +} + + + + + /// Called when the entity starts burning void cEntity::OnStartedBurning(void) { diff --git a/source/Entities/Entity.h b/source/Entities/Entity.h index b4777d249..df671a564 100644 --- a/source/Entities/Entity.h +++ b/source/Entities/Entity.h @@ -255,6 +255,9 @@ public: /// Updates the state related to this entity being on fire virtual void TickBurning(cChunk & a_Chunk); + + /// Handles when the entity is in the void + virtual void TickInVoid(cChunk & a_Chunk); /// Called when the entity starts burning virtual void OnStartedBurning(void); @@ -377,6 +380,9 @@ protected: /// Time, in ticks, until the entity extinguishes its fire int m_TicksLeftBurning; + + /// Time, in ticks, since the last damage dealt by the void. Reset to zero when moving out of the void. + int m_TicksSinceLastVoidDamage; virtual void Destroyed(void) {} // Called after the entity has been destroyed -- cgit v1.2.3 From cb167f78e3b2592fa26acb789d2dd34bd97c687d Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Tue, 10 Sep 2013 23:02:35 +0100 Subject: Added player void damage --- source/Entities/Player.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'source/Entities') diff --git a/source/Entities/Player.cpp b/source/Entities/Player.cpp index 0943f61ff..1f4f392ef 100644 --- a/source/Entities/Player.cpp +++ b/source/Entities/Player.cpp @@ -611,10 +611,13 @@ void cPlayer::SetSprint(bool a_IsSprinting) void cPlayer::DoTakeDamage(TakeDamageInfo & a_TDI) { - if (m_GameMode == eGameMode_Creative) + if (a_TDI.DamageType != dtInVoid) { - // No damage / health in creative mode - return; + if (m_GameMode == eGameMode_Creative) + { + // No damage / health in creative mode + return; + } } super::DoTakeDamage(a_TDI); -- cgit v1.2.3 From e9321bc715b5298553b114666ccc3418591fbfdc Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Wed, 11 Sep 2013 18:50:14 +0100 Subject: Better player gamemode detection --- source/Entities/Player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/Entities') diff --git a/source/Entities/Player.cpp b/source/Entities/Player.cpp index 1f4f392ef..bf96a6eaa 100644 --- a/source/Entities/Player.cpp +++ b/source/Entities/Player.cpp @@ -613,7 +613,7 @@ void cPlayer::DoTakeDamage(TakeDamageInfo & a_TDI) { if (a_TDI.DamageType != dtInVoid) { - if (m_GameMode == eGameMode_Creative) + if (IsGameModeCreative()) { // No damage / health in creative mode return; -- cgit v1.2.3 From 3a1def2c905a8e6d8807d14c5953cceb04f6b8a6 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Wed, 11 Sep 2013 20:07:51 +0100 Subject: More changes [SEE DESC] * Improved (again) pumpkin direction handling * Fixed spacing in Entity.cpp --- source/Entities/Entity.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/Entities') diff --git a/source/Entities/Entity.cpp b/source/Entities/Entity.cpp index 846d756dd..3d6c2887a 100644 --- a/source/Entities/Entity.cpp +++ b/source/Entities/Entity.cpp @@ -498,7 +498,7 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk) { // Outside of the world - cChunk * NextChunk = a_Chunk.GetNeighborChunk(BlockX,BlockZ); + cChunk * NextChunk = a_Chunk.GetNeighborChunk(BlockX, BlockZ); // See if we can commit our changes. If not, we will discard them. if (NextChunk != NULL) { -- cgit v1.2.3