summaryrefslogtreecommitdiffstats
path: root/src/Mobs/PassiveMonster.h
diff options
context:
space:
mode:
authorLogicParrot <LogicParrot@users.noreply.github.com>2017-08-24 22:21:25 +0200
committerLogicParrot <LogicParrot@users.noreply.github.com>2017-08-24 22:21:25 +0200
commit810230b5466f1363d69763670fc9b85fa385c99a (patch)
treea9d4dcfd43ac28ef2fb9e61e73a34f7246a695bb /src/Mobs/PassiveMonster.h
parentMerge branch 'master' into mobs2 (diff)
downloadcuberite-810230b5466f1363d69763670fc9b85fa385c99a.tar
cuberite-810230b5466f1363d69763670fc9b85fa385c99a.tar.gz
cuberite-810230b5466f1363d69763670fc9b85fa385c99a.tar.bz2
cuberite-810230b5466f1363d69763670fc9b85fa385c99a.tar.lz
cuberite-810230b5466f1363d69763670fc9b85fa385c99a.tar.xz
cuberite-810230b5466f1363d69763670fc9b85fa385c99a.tar.zst
cuberite-810230b5466f1363d69763670fc9b85fa385c99a.zip
Diffstat (limited to '')
-rw-r--r--src/Mobs/PassiveMonster.h31
1 files changed, 14 insertions, 17 deletions
diff --git a/src/Mobs/PassiveMonster.h b/src/Mobs/PassiveMonster.h
index 4a1d5513e..0c1d00a3e 100644
--- a/src/Mobs/PassiveMonster.h
+++ b/src/Mobs/PassiveMonster.h
@@ -11,26 +11,23 @@
typedef std::string AString;
class cPassiveMonster : public cMonster
{
- typedef cMonster super;
+ typedef cMonster super;
public:
- cPassiveMonster(const AString & a_ConfigName, eMonsterType a_MobType,
- const AString & a_SoundHurt, const AString & a_SoundDeath,
- double a_Width, double a_Height);
- virtual ~cPassiveMonster();
- virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override;
- virtual void OnRightClicked(cPlayer & a_Player) override;
+ cPassiveMonster(const AString & a_ConfigName, eMonsterType a_MobType,
+ const AString & a_SoundHurt, const AString & a_SoundDeath,
+ double a_Width, double a_Height);
+ virtual ~cPassiveMonster();
+ virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override;
+ virtual void OnRightClicked(cPlayer & a_Player) override;
- /** When hit by someone, run away */
- virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override;
+ /** When hit by someone, run away */
+ virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override;
- virtual void Destroyed(void) override;
-
- virtual cBehaviorBreeder * GetBehaviorBreeder() override;
- virtual const cBehaviorBreeder * GetBehaviorBreeder() const override;
+ virtual void Destroyed(void) override;
private:
- cBehaviorBreeder m_BehaviorBreeder;
- cBehaviorItemFollower m_BehaviorItemFollower;
- cBehaviorCoward m_BehaviorCoward;
- cBehaviorWanderer m_BehaviorWanderer;
+ cBehaviorBreeder m_BehaviorBreeder;
+ cBehaviorItemFollower m_BehaviorItemFollower;
+ cBehaviorCoward m_BehaviorCoward;
+ cBehaviorWanderer m_BehaviorWanderer;
};