From dc4c2ca39767932a70ad7a7a2b7f7ded85a131f0 Mon Sep 17 00:00:00 2001 From: LogicParrot Date: Tue, 22 Aug 2017 15:26:28 +0300 Subject: d --- src/Mobs/AggressiveMonster.cpp | 4 ++-- src/Mobs/AggressiveMonster.h | 2 +- src/Mobs/Behaviors/BehaviorBreeder.h | 2 +- src/Mobs/Behaviors/BehaviorItemFollower.cpp | 2 +- src/Mobs/Behaviors/BehaviorItemFollower.h | 2 +- src/Mobs/Blaze.cpp | 2 +- src/Mobs/CaveSpider.cpp | 2 +- src/Mobs/Monster.cpp | 2 +- src/Mobs/PassiveMonster.cpp | 2 +- src/Mobs/Silverfish.h | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/Mobs/AggressiveMonster.cpp b/src/Mobs/AggressiveMonster.cpp index 1cfec1849..7495ca621 100644 --- a/src/Mobs/AggressiveMonster.cpp +++ b/src/Mobs/AggressiveMonster.cpp @@ -12,8 +12,8 @@ -cAggressiveMonster::cAggressiveMonster(const AString & a_ConfigName, eMonsterType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height, int a_AggressionLightLevel) : - super(a_ConfigName, a_MobType, a_SoundHurt, a_SoundDeath, a_Width, a_Height), m_BehaviorAggressive(this, a_AggressionLightLevel) +cAggressiveMonster::cAggressiveMonster(const AString & a_ConfigName, eMonsterType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height) : + super(a_ConfigName, a_MobType, a_SoundHurt, a_SoundDeath, a_Width, a_Height), m_BehaviorAggressive(this, 10) { m_EMPersonality = AGGRESSIVE; ASSERT(GetBehaviorChaser() != nullptr); diff --git a/src/Mobs/AggressiveMonster.h b/src/Mobs/AggressiveMonster.h index 1afcf846e..27ad88834 100644 --- a/src/Mobs/AggressiveMonster.h +++ b/src/Mobs/AggressiveMonster.h @@ -13,7 +13,7 @@ class cAggressiveMonster : public: - cAggressiveMonster(const AString & a_ConfigName, eMonsterType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height, int a_AggressionLightLevel); + cAggressiveMonster(const AString & a_ConfigName, eMonsterType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height); virtual void Tick (std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override; diff --git a/src/Mobs/Behaviors/BehaviorBreeder.h b/src/Mobs/Behaviors/BehaviorBreeder.h index fa52a40d4..51ed0501d 100644 --- a/src/Mobs/Behaviors/BehaviorBreeder.h +++ b/src/Mobs/Behaviors/BehaviorBreeder.h @@ -17,7 +17,7 @@ class cBehaviorBreeder { public: - cBehaviorBreeder(cMonster * a_Parent, cItems & a_BreedingItems); + cBehaviorBreeder(cMonster * a_Parent); // Functions our host Monster should invoke: void Tick(); diff --git a/src/Mobs/Behaviors/BehaviorItemFollower.cpp b/src/Mobs/Behaviors/BehaviorItemFollower.cpp index 275cb8c24..9d64ee0db 100644 --- a/src/Mobs/Behaviors/BehaviorItemFollower.cpp +++ b/src/Mobs/Behaviors/BehaviorItemFollower.cpp @@ -7,7 +7,7 @@ cBehaviorItemFollower::cBehaviorItemFollower(cMonster * a_Parent) : - m_ParentInterface(a_ParentInterface) + m_Parent(a_Parent) { m_Parent = a_Parent; ASSERT(m_Parent != nullptr); diff --git a/src/Mobs/Behaviors/BehaviorItemFollower.h b/src/Mobs/Behaviors/BehaviorItemFollower.h index 28f00c473..ee2bda638 100644 --- a/src/Mobs/Behaviors/BehaviorItemFollower.h +++ b/src/Mobs/Behaviors/BehaviorItemFollower.h @@ -10,7 +10,7 @@ class cItems; class cBehaviorItemFollower { public: - cBehaviorItemFollower(cMonster * a_Parent, cItems & a_Items); + cBehaviorItemFollower(cMonster * a_Parent); void GetBreedingItems(cItems & a_Items); diff --git a/src/Mobs/Blaze.cpp b/src/Mobs/Blaze.cpp index e9126ff2d..7ada21369 100644 --- a/src/Mobs/Blaze.cpp +++ b/src/Mobs/Blaze.cpp @@ -9,7 +9,7 @@ cBlaze::cBlaze(void) : - super("Blaze", mtBlaze, "entity.blaze.hurt", "entity.blaze.death", 0.6, 1.8, 15) + super("Blaze", mtBlaze, "entity.blaze.hurt", "entity.blaze.death", 0.6, 1.8) { SetGravity(-8.0f); SetAirDrag(0.05f); diff --git a/src/Mobs/CaveSpider.cpp b/src/Mobs/CaveSpider.cpp index 78e04f7e0..8d8e15d85 100644 --- a/src/Mobs/CaveSpider.cpp +++ b/src/Mobs/CaveSpider.cpp @@ -8,7 +8,7 @@ cCaveSpider::cCaveSpider(void) : - super("CaveSpider", mtCaveSpider, "entity.spider.hurt", "entity.spider.death", 0.7, 0.5, 15) + super("CaveSpider", mtCaveSpider, "entity.spider.hurt", "entity.spider.death", 0.7, 0.5) { } diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp index 4513ea3f8..3666b9bee 100644 --- a/src/Mobs/Monster.cpp +++ b/src/Mobs/Monster.cpp @@ -1189,7 +1189,7 @@ void cMonster::GetFollowedItems(cItems & a_Items) void cMonster::GetBreedingItems(cItems & a_Items) { - return GetFollowedItems(); + return GetFollowedItems(a_Items); } std::unique_ptr cMonster::NewMonsterFromType(eMonsterType a_MobType) diff --git a/src/Mobs/PassiveMonster.cpp b/src/Mobs/PassiveMonster.cpp index f8bc62c09..e9b913212 100644 --- a/src/Mobs/PassiveMonster.cpp +++ b/src/Mobs/PassiveMonster.cpp @@ -9,7 +9,7 @@ -cPassiveMonster::cPassiveMonster(const AString & a_ConfigName, eMonsterType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height, cItem & a_BreedingItems, cItem & a_FollowedItems) : +cPassiveMonster::cPassiveMonster(const AString & a_ConfigName, eMonsterType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height) : super(a_ConfigName, a_MobType, a_SoundHurt, a_SoundDeath, a_Width, a_Height), m_BehaviorBreeder(this), m_BehaviorItemFollower(this), m_BehaviorCoward(this) { diff --git a/src/Mobs/Silverfish.h b/src/Mobs/Silverfish.h index c5d39a7a4..9988ca015 100644 --- a/src/Mobs/Silverfish.h +++ b/src/Mobs/Silverfish.h @@ -14,7 +14,7 @@ class cSilverfish : public: cSilverfish(void) : - super("Silverfish", mtSilverfish, "entity.silverfish.hurt", "entity.silverfish.death", 0.3, 0.7, 15) + super("Silverfish", mtSilverfish, "entity.silverfish.hurt", "entity.silverfish.death", 0.3, 0.7) { } -- cgit v1.2.3