diff options
| author | madmaxoft <github@xoft.cz> | 2013-10-20 10:23:30 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2013-10-20 10:23:30 +0200 |
| commit | 34928378b8e3464326de38787bfada9adc0bfb11 (patch) | |
| tree | f057fec656fcead894b49315b948c078c2ba07d7 /source/Mobs/Monster.cpp | |
| parent | Merge branch 'htmlescape'. (diff) | |
| download | cuberite-34928378b8e3464326de38787bfada9adc0bfb11.tar cuberite-34928378b8e3464326de38787bfada9adc0bfb11.tar.gz cuberite-34928378b8e3464326de38787bfada9adc0bfb11.tar.bz2 cuberite-34928378b8e3464326de38787bfada9adc0bfb11.tar.lz cuberite-34928378b8e3464326de38787bfada9adc0bfb11.tar.xz cuberite-34928378b8e3464326de38787bfada9adc0bfb11.tar.zst cuberite-34928378b8e3464326de38787bfada9adc0bfb11.zip | |
Diffstat (limited to 'source/Mobs/Monster.cpp')
| -rw-r--r-- | source/Mobs/Monster.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/Mobs/Monster.cpp b/source/Mobs/Monster.cpp index 51ea644d3..591c41e22 100644 --- a/source/Mobs/Monster.cpp +++ b/source/Mobs/Monster.cpp @@ -25,7 +25,7 @@ -cMonster::cMonster(const AString & a_ConfigName, char a_ProtocolMobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height) +cMonster::cMonster(const AString & a_ConfigName, eType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height) : super(etMonster, a_Width, a_Height) , m_Target(NULL) , m_AttackRate(3) @@ -34,7 +34,7 @@ cMonster::cMonster(const AString & a_ConfigName, char a_ProtocolMobType, const A , m_DestinationTime( 0 ) , m_DestroyTimer( 0 ) , m_Jump(0) - , m_MobType(a_ProtocolMobType) + , m_MobType(a_MobType) , m_SoundHurt(a_SoundHurt) , m_SoundDeath(a_SoundDeath) , m_EMState(IDLE) @@ -514,5 +514,9 @@ void cMonster::HandleDaylightBurning(cChunk & a_Chunk) cMonster::eFamily cMonster::GetMobFamily(void) const { - return cMobTypesManager::getFamilyFromType(GetMobTypeAsEnum()); + return cMobTypesManager::FamilyFromType(m_MobType); } + + + + |