summaryrefslogtreecommitdiffstats
path: root/src/Mobs
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-02-05 20:08:10 +0100
committerTycho <work.tycho+git@gmail.com>2014-02-05 20:08:10 +0100
commit9015e56c604b2ad3ce47ddae8e9556187fe8978e (patch)
tree60b23762504cfb9eb4cba9758f15c0e5fab46123 /src/Mobs
parentModified automatic test for boundingBox (diff)
parentMerge pull request #645 from mc-server/GroupsPermissions (diff)
downloadcuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar
cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar.gz
cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar.bz2
cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar.lz
cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar.xz
cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar.zst
cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.zip
Diffstat (limited to '')
-rw-r--r--src/Mobs/Monster.cpp8
-rw-r--r--src/Mobs/Villager.cpp4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index 340761a7e..be901ac61 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -69,20 +69,20 @@ cMonster::cMonster(const AString & a_ConfigName, eType a_MobType, const AString
: super(etMonster, a_Width, a_Height)
, m_EMState(IDLE)
, m_EMPersonality(AGGRESSIVE)
- , m_SightDistance(25)
, m_Target(NULL)
- , m_AttackRate(3)
- , m_IdleInterval(0)
, m_bMovingToDestination(false)
+ , m_LastGroundHeight(POSY_TOINT)
+ , m_IdleInterval(0)
, m_DestroyTimer(0)
, m_MobType(a_MobType)
, m_SoundHurt(a_SoundHurt)
, m_SoundDeath(a_SoundDeath)
+ , m_AttackRate(3)
, m_AttackDamage(1)
, m_AttackRange(2)
, m_AttackInterval(0)
+ , m_SightDistance(25)
, m_BurnsInDaylight(false)
- , m_LastGroundHeight(POSY_TOINT)
{
if (!a_ConfigName.empty())
{
diff --git a/src/Mobs/Villager.cpp b/src/Mobs/Villager.cpp
index 08e5e4315..09a6e2d09 100644
--- a/src/Mobs/Villager.cpp
+++ b/src/Mobs/Villager.cpp
@@ -13,9 +13,9 @@
cVillager::cVillager(eVillagerType VillagerType) :
super("Villager", mtVillager, "", "", 0.6, 1.8),
+ m_ActionCountDown(-1),
m_Type(VillagerType),
- m_VillagerAction(false),
- m_ActionCountDown(-1)
+ m_VillagerAction(false)
{
}