diff options
author | LogicParrot <LogicParrot@users.noreply.github.com> | 2017-08-23 21:31:45 +0200 |
---|---|---|
committer | LogicParrot <LogicParrot@users.noreply.github.com> | 2017-08-23 21:31:45 +0200 |
commit | a54cbf40ffa40cd72f20f6491f34e4b2338687dd (patch) | |
tree | a0b656e9b890f8268239bea23a12feb8dcaa738b /src/MonsterConfig.cpp | |
parent | removed some attack code from Monster (diff) | |
download | cuberite-a54cbf40ffa40cd72f20f6491f34e4b2338687dd.tar cuberite-a54cbf40ffa40cd72f20f6491f34e4b2338687dd.tar.gz cuberite-a54cbf40ffa40cd72f20f6491f34e4b2338687dd.tar.bz2 cuberite-a54cbf40ffa40cd72f20f6491f34e4b2338687dd.tar.lz cuberite-a54cbf40ffa40cd72f20f6491f34e4b2338687dd.tar.xz cuberite-a54cbf40ffa40cd72f20f6491f34e4b2338687dd.tar.zst cuberite-a54cbf40ffa40cd72f20f6491f34e4b2338687dd.zip |
Diffstat (limited to 'src/MonsterConfig.cpp')
-rw-r--r-- | src/MonsterConfig.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/MonsterConfig.cpp b/src/MonsterConfig.cpp index 28132607e..97336166c 100644 --- a/src/MonsterConfig.cpp +++ b/src/MonsterConfig.cpp @@ -3,6 +3,7 @@ #include "MonsterConfig.h" #include "Mobs/Monster.h" +#include "Mobs/Behaviors/BehaviorChaser.h" #include "IniFile.h" @@ -90,11 +91,18 @@ void cMonsterConfig::AssignAttributes(cMonster * a_Monster, const AString & a_Na { if (itr->m_Name.compare(a_Name) == 0) { - a_Monster->SetAttackDamage (itr->m_AttackDamage); - a_Monster->SetAttackRange (itr->m_AttackRange); - a_Monster->SetSightDistance(itr->m_SightDistance); - a_Monster->SetAttackRate (static_cast<float>(itr->m_AttackRate)); + cBehaviorChaser * Chaser = a_Monster->GetBehaviorChaser(); + + // mobTodo chaser is kind of "attacker", not really chaser? + if (Chaser != nullptr) + { + Chaser->SetAttackDamage (itr->m_AttackDamage); + Chaser->SetAttackRange (itr->m_AttackRange); + Chaser->SetAttackRate (static_cast<float>(itr->m_AttackRate)); + } + a_Monster->SetMaxHealth (itr->m_MaxHealth); + a_Monster->SetSightDistance(itr->m_SightDistance); a_Monster->SetIsFireproof (itr->m_IsFireproof); return; } |