summaryrefslogtreecommitdiffstats
path: root/src/Mobs/Wither.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-04-28 20:58:15 +0200
committerMattes D <github@xoft.cz>2014-04-28 20:58:15 +0200
commit709015369df050d3d5b1d12b7d74ae814cd046df (patch)
tree106568e25f564d0e0e414269a8fbb28ed3f1507e /src/Mobs/Wither.h
parentFixed braces. (diff)
parentRevert "Withers now use the new invulnerable." (diff)
downloadcuberite-709015369df050d3d5b1d12b7d74ae814cd046df.tar
cuberite-709015369df050d3d5b1d12b7d74ae814cd046df.tar.gz
cuberite-709015369df050d3d5b1d12b7d74ae814cd046df.tar.bz2
cuberite-709015369df050d3d5b1d12b7d74ae814cd046df.tar.lz
cuberite-709015369df050d3d5b1d12b7d74ae814cd046df.tar.xz
cuberite-709015369df050d3d5b1d12b7d74ae814cd046df.tar.zst
cuberite-709015369df050d3d5b1d12b7d74ae814cd046df.zip
Diffstat (limited to 'src/Mobs/Wither.h')
-rw-r--r--src/Mobs/Wither.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Mobs/Wither.h b/src/Mobs/Wither.h
index bc78bfaad..08b460009 100644
--- a/src/Mobs/Wither.h
+++ b/src/Mobs/Wither.h
@@ -17,9 +17,9 @@ public:
CLASS_PROTODEF(cWither);
- unsigned int GetNumInvulnerableTicks(void) const { return m_InvulnerableTicks; }
+ unsigned int GetWitherInvulnerableTicks(void) const { return m_WitherInvulnerableTicks; }
- void SetNumInvulnerableTicks(unsigned int a_Ticks) { m_InvulnerableTicks = a_Ticks; }
+ void SetWitherInvulnerableTicks(unsigned int a_Ticks) { m_WitherInvulnerableTicks = a_Ticks; }
/** Returns whether the wither is invulnerable to arrows. */
bool IsArmored(void) const;
@@ -27,13 +27,13 @@ public:
// cEntity overrides
virtual bool Initialize(cWorld * a_World) override;
virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
- virtual void DoTakeDamage(TakeDamageInfo & a_TDI) override;
+ virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override;
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
private:
/** The number of ticks of invulnerability left after being initially created. Zero once invulnerability has expired. */
- unsigned int m_InvulnerableTicks;
+ unsigned int m_WitherInvulnerableTicks;
} ;