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/Player.cpp') 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/Player.cpp') 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