diff options
| author | ANAND <ClobberXD@gmail.com> | 2019-08-21 18:34:47 +0530 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2019-09-14 20:16:55 +0200 |
| commit | e2d6445f2a64c45437f9762b891413142c4a66a3 (patch) | |
| tree | a0fd8d7160f1647b9f65199edfec6fa1fffc7b59 /src | |
| parent | 81c7f0ae044b1131ad082e5e705c5276f82ac6ce (diff) | |
| download | minetest-e2d6445f2a64c45437f9762b891413142c4a66a3.tar.gz minetest-e2d6445f2a64c45437f9762b891413142c4a66a3.tar.bz2 minetest-e2d6445f2a64c45437f9762b891413142c4a66a3.zip | |
Fix LocalPlayer::isDead always returning false if player is immortal
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/localplayer.cpp | 5 | ||||
| -rw-r--r-- | src/client/localplayer.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/client/localplayer.cpp b/src/client/localplayer.cpp index 1b0b667c8..3007a86e3 100644 --- a/src/client/localplayer.cpp +++ b/src/client/localplayer.cpp @@ -732,6 +732,11 @@ v3f LocalPlayer::getEyeOffset() const return v3f(0, BS * eye_height, 0); } +bool LocalPlayer::isDead() const +{ + return !getCAO()->isImmortal() && hp == 0; +} + // 3D acceleration void LocalPlayer::accelerate(const v3f &target_speed, const f32 max_increase_H, const f32 max_increase_V, const bool use_pitch) diff --git a/src/client/localplayer.h b/src/client/localplayer.h index 252519aaa..539f1ba2a 100644 --- a/src/client/localplayer.h +++ b/src/client/localplayer.h @@ -149,7 +149,7 @@ public: bool getAutojump() const { return m_autojump; } - bool isDead() const { return hp <= 0; } + bool isDead() const; inline void addVelocity(const v3f &vel) { |