diff options
author | LogicParrot <LogicParrot@users.noreply.github.com> | 2017-08-31 11:39:38 +0200 |
---|---|---|
committer | LogicParrot <LogicParrot@users.noreply.github.com> | 2017-08-31 11:39:38 +0200 |
commit | 209767ea0573df7d89b89874bb1e3a2cf2f4adba (patch) | |
tree | 1e151f350eeb5d13d1f1ee46c8dc20de755a36fc /src/Mobs | |
parent | mbedTLS merge (diff) | |
download | cuberite-209767ea0573df7d89b89874bb1e3a2cf2f4adba.tar cuberite-209767ea0573df7d89b89874bb1e3a2cf2f4adba.tar.gz cuberite-209767ea0573df7d89b89874bb1e3a2cf2f4adba.tar.bz2 cuberite-209767ea0573df7d89b89874bb1e3a2cf2f4adba.tar.lz cuberite-209767ea0573df7d89b89874bb1e3a2cf2f4adba.tar.xz cuberite-209767ea0573df7d89b89874bb1e3a2cf2f4adba.tar.zst cuberite-209767ea0573df7d89b89874bb1e3a2cf2f4adba.zip |
Diffstat (limited to 'src/Mobs')
-rw-r--r-- | src/Mobs/Behaviors/BehaviorAttackerMelee.h | 4 | ||||
-rw-r--r-- | src/Mobs/Behaviors/BehaviorStriker.cpp | 7 | ||||
-rw-r--r-- | src/Mobs/Behaviors/BehaviorStriker.h | 13 | ||||
-rw-r--r-- | src/Mobs/Behaviors/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/Mobs/Zombie.cpp | 2 |
5 files changed, 3 insertions, 25 deletions
diff --git a/src/Mobs/Behaviors/BehaviorAttackerMelee.h b/src/Mobs/Behaviors/BehaviorAttackerMelee.h index b079c94fc..6e990f04c 100644 --- a/src/Mobs/Behaviors/BehaviorAttackerMelee.h +++ b/src/Mobs/Behaviors/BehaviorAttackerMelee.h @@ -2,8 +2,8 @@ #include "BehaviorAttacker.h" -/** Makes the mob fight back any other mob that damages it. Mob should have BehaviorAttacker to work. -This behavior does not make sense in combination with BehaviorCoward. */ +/** Grants the mob that ability to approach a target and then melee attack it. +Use BehaviorAttackerMelee::SetTarget to attack. */ class cBehaviorAttackerMelee : public cBehaviorAttacker { public: diff --git a/src/Mobs/Behaviors/BehaviorStriker.cpp b/src/Mobs/Behaviors/BehaviorStriker.cpp deleted file mode 100644 index e09bb45f9..000000000 --- a/src/Mobs/Behaviors/BehaviorStriker.cpp +++ /dev/null @@ -1,7 +0,0 @@ -/* -bool cAggressiveMonster::Attack(std::chrono::milliseconds a_Dt) -{ - GetTarget()->TakeDamage(dtMobAttack, this, m_AttackDamage, 0); - - return true; -} */ diff --git a/src/Mobs/Behaviors/BehaviorStriker.h b/src/Mobs/Behaviors/BehaviorStriker.h deleted file mode 100644 index 6fc094476..000000000 --- a/src/Mobs/Behaviors/BehaviorStriker.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once -class cBehaviorStriker -{ - -}; - -/* -bool cAggressiveMonster::Attack(std::chrono::milliseconds a_Dt) -{ - GetTarget()->TakeDamage(dtMobAttack, this, m_AttackDamage, 0); - - return true; -} */ diff --git a/src/Mobs/Behaviors/CMakeLists.txt b/src/Mobs/Behaviors/CMakeLists.txt index 686d0937b..e92c850e3 100644 --- a/src/Mobs/Behaviors/CMakeLists.txt +++ b/src/Mobs/Behaviors/CMakeLists.txt @@ -17,7 +17,6 @@ SET (SRCS BehaviorItemFollower.cpp BehaviorItemReplacer.cpp BehaviorAttackerMelee.cpp - BehaviorStriker.cpp BehaviorWanderer.cpp ) @@ -34,7 +33,6 @@ SET (HDRS BehaviorItemFollower.h BehaviorItemReplacer.h BehaviorAttackerMelee.h - BehaviorStriker.h BehaviorWanderer.h ) diff --git a/src/Mobs/Zombie.cpp b/src/Mobs/Zombie.cpp index 4f616c609..43c1fa3d9 100644 --- a/src/Mobs/Zombie.cpp +++ b/src/Mobs/Zombie.cpp @@ -21,7 +21,7 @@ cZombie::cZombie(bool a_IsVillagerZombie) : m_BehaviorAggressive.AttachToMonster(*this); m_BehaviourDayLightBurner.AttachToMonster(*this); GetMonsterConfig("Zombie"); - // Todo I need the config to load after attaching attackerMelee but this is not clean. + // Todo I need the config to load after attaching the Behaviors but this is not clean. } |