diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-09-05 16:26:30 +0200 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-09-05 16:26:30 +0200 |
| commit | aa2495e3867e87ea37729b58b0df3f2ce940dbb6 (patch) | |
| tree | 9f71b03f914cd7b077f6c13cd2b6ae2f691c5c66 /src/Mobs/Monster.cpp | |
| parent | Moved to passing pointers instead of passing by reference. (diff) | |
| parent | Merge pull request #1375 from mc-server/EntitiesInBox (diff) | |
| download | cuberite-aa2495e3867e87ea37729b58b0df3f2ce940dbb6.tar cuberite-aa2495e3867e87ea37729b58b0df3f2ce940dbb6.tar.gz cuberite-aa2495e3867e87ea37729b58b0df3f2ce940dbb6.tar.bz2 cuberite-aa2495e3867e87ea37729b58b0df3f2ce940dbb6.tar.lz cuberite-aa2495e3867e87ea37729b58b0df3f2ce940dbb6.tar.xz cuberite-aa2495e3867e87ea37729b58b0df3f2ce940dbb6.tar.zst cuberite-aa2495e3867e87ea37729b58b0df3f2ce940dbb6.zip | |
Diffstat (limited to 'src/Mobs/Monster.cpp')
| -rw-r--r-- | src/Mobs/Monster.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp index 1af44271b..029930266 100644 --- a/src/Mobs/Monster.cpp +++ b/src/Mobs/Monster.cpp @@ -1,3 +1,4 @@ + #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Monster.h" #include "IncludeAllMonsters.h" @@ -73,7 +74,8 @@ cMonster::cMonster(const AString & a_ConfigName, eType a_MobType, const AString m_DropChanceBoots = 0.0f; } -void cMonster::Tick(float a_Dt, cChunk & a_Chunk) { +void cMonster::Tick(float a_Dt, cChunk & a_Chunk) +{ super::Tick(a_Dt, a_Chunk); if (m_Health <= 0) @@ -106,7 +108,6 @@ void cMonster::SpawnOn(cClientHandle & a_Client) - void cMonster::AddRandomDropItem(cItems & a_Drops, unsigned int a_Min, unsigned int a_Max, short a_Item, short a_ItemHealth) { MTRand r1; @@ -132,9 +133,6 @@ void cMonster::AddRandomUncommonDropItem(cItems & a_Drops, float a_Chance, short } - - - void cMonster::AddRandomRareDropItem(cItems & a_Drops, cItems & a_Items, short a_LootingLevel) { MTRand r1; @@ -176,8 +174,6 @@ void cMonster::AddRandomArmorDropItem(cItems & a_Drops, short a_LootingLevel) - - void cMonster::AddRandomWeaponDropItem(cItems & a_Drops, short a_LootingLevel) { MTRand r1; @@ -191,6 +187,7 @@ void cMonster::AddRandomWeaponDropItem(cItems & a_Drops, short a_LootingLevel) + cMonster::eFamily cMonster::FamilyFromType(eType a_Type) { // Passive-agressive mobs are counted in mob spawning code as passive |