diff options
| author | madmaxoft <github@xoft.cz> | 2013-10-20 13:25:56 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2013-10-20 13:25:56 +0200 |
| commit | 848d061de167be9fd802cc8a6b14a934702af81a (patch) | |
| tree | 5436be82842e1883588fb07dcc634ba2381ea368 /source/MobSpawner.cpp | |
| parent | Rewritten MobTypesManager not to leak memory. (diff) | |
| download | cuberite-848d061de167be9fd802cc8a6b14a934702af81a.tar cuberite-848d061de167be9fd802cc8a6b14a934702af81a.tar.gz cuberite-848d061de167be9fd802cc8a6b14a934702af81a.tar.bz2 cuberite-848d061de167be9fd802cc8a6b14a934702af81a.tar.lz cuberite-848d061de167be9fd802cc8a6b14a934702af81a.tar.xz cuberite-848d061de167be9fd802cc8a6b14a934702af81a.tar.zst cuberite-848d061de167be9fd802cc8a6b14a934702af81a.zip | |
Diffstat (limited to 'source/MobSpawner.cpp')
| -rw-r--r-- | source/MobSpawner.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/MobSpawner.cpp b/source/MobSpawner.cpp index bdeb423c2..75232b30f 100644 --- a/source/MobSpawner.cpp +++ b/source/MobSpawner.cpp @@ -2,8 +2,6 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "MobSpawner.h" -#include "MobTypesManager.h" -#include "Mobs/Monster.h" #include "Mobs/IncludeAllMonsters.h" cMobSpawner::tMobTypes& cMobSpawner::m_MobTypes() @@ -57,7 +55,7 @@ cMobSpawner::cMobSpawner(cMonster::eFamily a_MonsterFamily,const std::set<cMonst { for (std::set<cMonster::eType>::const_iterator itr = a_AllowedTypes.begin(); itr != a_AllowedTypes.end(); itr++) { - if (cMobTypesManager::FamilyFromType(*itr) == a_MonsterFamily) + if (cMonster::FamilyFromType(*itr) == a_MonsterFamily) { m_AllowedTypes.insert(*itr); } @@ -256,7 +254,7 @@ cMonster* cMobSpawner::TryToSpawnHere(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockM if (CanSpawnHere(m_MobType, a_BlockType, a_BlockMeta, a_BlockType_below, a_BlockMeta_below, a_BlockType_above, a_BlockMeta_above, a_Biome, a_Level)) { - cMonster* newMob = cMobTypesManager::NewMonsterFromType(m_MobType); + cMonster * newMob = cMonster::NewMonsterFromType(m_MobType); if (newMob) { m_Spawned.insert(newMob); |