diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-09-17 19:40:10 +0200 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-09-17 19:40:10 +0200 |
| commit | 6e7c0e33b5dd6d86d66ac2eb1a07a33652a708fd (patch) | |
| tree | 69681d2a6bd1f3572305f7120d9231b394ac9c88 /src/World.cpp | |
| parent | IncrementalRedstoneSimulator now has no dependencies on cChunk (diff) | |
| download | cuberite-6e7c0e33b5dd6d86d66ac2eb1a07a33652a708fd.tar cuberite-6e7c0e33b5dd6d86d66ac2eb1a07a33652a708fd.tar.gz cuberite-6e7c0e33b5dd6d86d66ac2eb1a07a33652a708fd.tar.bz2 cuberite-6e7c0e33b5dd6d86d66ac2eb1a07a33652a708fd.tar.lz cuberite-6e7c0e33b5dd6d86d66ac2eb1a07a33652a708fd.tar.xz cuberite-6e7c0e33b5dd6d86d66ac2eb1a07a33652a708fd.tar.zst cuberite-6e7c0e33b5dd6d86d66ac2eb1a07a33652a708fd.zip | |
Diffstat (limited to 'src/World.cpp')
| -rw-r--r-- | src/World.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/World.cpp b/src/World.cpp index ded42f093..43f7faf94 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -791,8 +791,8 @@ void cWorld::InitialiseAndLoadMobSpawningValues(cIniFile & a_IniFile) AStringVector SplitList = StringSplitAndTrim(AllMonsters, ","); for (AStringVector::const_iterator itr = SplitList.begin(), end = SplitList.end(); itr != end; ++itr) { - cMonster::eType ToAdd = cMonster::StringToMobType(*itr); - if (ToAdd != cMonster::mtInvalidType) + eMonsterType ToAdd = cMonster::StringToMobType(*itr); + if (ToAdd != mtInvalidType) { m_AllowedMobs.insert(ToAdd); LOGD("Allowed mob: %s", itr->c_str()); @@ -3126,7 +3126,7 @@ bool cWorld::IsBlockDirectlyWatered(int a_BlockX, int a_BlockY, int a_BlockZ) -int cWorld::SpawnMob(double a_PosX, double a_PosY, double a_PosZ, cMonster::eType a_MonsterType) +int cWorld::SpawnMob(double a_PosX, double a_PosY, double a_PosZ, eMonsterType a_MonsterType) { cMonster * Monster = NULL; |