diff options
| author | worktycho <work.tycho@gmail.com> | 2014-09-26 17:04:26 +0200 |
|---|---|---|
| committer | worktycho <work.tycho@gmail.com> | 2014-09-26 17:04:26 +0200 |
| commit | 411c69b420acdc1e103a76a1a52e2c488aee5718 (patch) | |
| tree | 06e33fb4b17d9c782ebb834a9821571f11ae103c /src/World.cpp | |
| parent | Improved searching for spawn. (diff) | |
| parent | Merge branch 'master' into redstoneTests (diff) | |
| download | cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar.gz cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar.bz2 cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar.lz cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar.xz cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar.zst cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.zip | |
Diffstat (limited to 'src/World.cpp')
| -rw-r--r-- | src/World.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/World.cpp b/src/World.cpp index 60d0ea723..cd23ff191 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -802,8 +802,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()); @@ -3209,7 +3209,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; @@ -3345,7 +3345,7 @@ void cWorld::SetChunkAlwaysTicked(int a_ChunkX, int a_ChunkZ, bool a_AlwaysTicke -cRedstoneSimulator * cWorld::InitializeRedstoneSimulator(cIniFile & a_IniFile) +cRedstoneSimulator<cChunk, cWorld> * cWorld::InitializeRedstoneSimulator(cIniFile & a_IniFile) { AString SimulatorName = a_IniFile.GetValueSet("Physics", "RedstoneSimulator", "Incremental"); @@ -3355,11 +3355,11 @@ cRedstoneSimulator * cWorld::InitializeRedstoneSimulator(cIniFile & a_IniFile) SimulatorName = "Incremental"; } - cRedstoneSimulator * res = NULL; + cRedstoneSimulator<cChunk, cWorld> * res = NULL; if (NoCaseCompare(SimulatorName, "Incremental") == 0) { - res = new cIncrementalRedstoneSimulator(*this); + res = MakeIncrementalRedstoneSimulator(*this); } else if (NoCaseCompare(SimulatorName, "noop") == 0) { |