diff options
Diffstat (limited to 'source/World.cpp')
| -rw-r--r-- | source/World.cpp | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/source/World.cpp b/source/World.cpp index 92098bd8b..ef56e7fe9 100644 --- a/source/World.cpp +++ b/source/World.cpp @@ -40,7 +40,7 @@ #include "Mobs/Giant.h" #include "Mobs/Horse.h" #include "Mobs/IronGolem.h" -#include "Mobs/MagmaCube.h" +#include "Mobs/Magmacube.h" #include "Mobs/Mooshroom.h" #include "Mobs/Ocelot.h" #include "Mobs/Pig.h" @@ -56,9 +56,8 @@ #include "Mobs/Wither.h" #include "Mobs/Wolf.h" #include "Mobs/Zombie.h" -#include "Mobs/ZombiePigman.h" +#include "Mobs/Zombiepigman.h" -#include "OSSupport/MakeDir.h" #include "MersenneTwister.h" #include "Generating/Trees.h" #include "PluginManager.h" @@ -261,7 +260,7 @@ cWorld::cWorld(const AString & a_WorldName) : { LOGD("cWorld::cWorld(\"%s\")", a_WorldName.c_str()); - cMakeDir::MakeDir(m_WorldName.c_str()); + cFile::CreateFolder(FILE_IO_PREFIX + m_WorldName); } @@ -773,16 +772,36 @@ void cWorld::TickSpawnMobs(float a_Dt) // Spawn nether mobs switch (nightRand) { - case 5: MobType = cMonster::mtGhast; break; + case 0: MobType = cMonster::mtBlaze; break; + case 1: MobType = cMonster::mtGhast; break; + case 2: MobType = cMonster::mtGhast; break; + case 3: MobType = cMonster::mtGhast; break; + case 4: MobType = cMonster::mtZombiePigman; break; + case 5: MobType = cMonster::mtZombiePigman; break; case 6: MobType = cMonster::mtZombiePigman; break; + case 7: MobType = cMonster::mtZombiePigman; break; + case 8: MobType = cMonster::mtZombiePigman; break; + case 9: MobType = cMonster::mtZombiePigman; break; } break; } case biEnd: { - // Only endermen spawn in the End - MobType = cMonster::mtEnderman; + // Spawn only The End mobs + switch (nightRand) + { + case 0: MobType = cMonster::mtEnderDragon; break; + case 1: MobType = cMonster::mtEnderman; break; + case 2: MobType = cMonster::mtEnderman; break; + case 3: MobType = cMonster::mtEnderman; break; + case 4: MobType = cMonster::mtEnderman; break; + case 5: MobType = cMonster::mtEnderman; break; + case 6: MobType = cMonster::mtEnderman; break; + case 7: MobType = cMonster::mtEnderman; break; + case 8: MobType = cMonster::mtEnderman; break; + case 9: MobType = cMonster::mtEnderman; break; + } break; } @@ -823,6 +842,7 @@ void cWorld::TickSpawnMobs(float a_Dt) case 3: MobType = cMonster::mtSheep; break; case 4: MobType = cMonster::mtSquid; break; case 5: MobType = cMonster::mtWolf; break; + case 6: MobType = cMonster::mtHorse; break; } } // else (night) } // case overworld biomes @@ -849,7 +869,7 @@ void cWorld::TickQueuedTasks(void) } // Execute and delete each task: - for (cTasks::iterator itr = m_Tasks.begin(), end = m_Tasks.end(); itr != end; ++itr) + for (cTasks::iterator itr = Tasks.begin(), end = Tasks.end(); itr != end; ++itr) { (*itr)->Run(*this); delete *itr; |