1
0

Merge pull request #46 from tonibm19/master

Now zombies spawn in Overworld during night
This commit is contained in:
madmaxoft 2013-08-06 13:38:18 -07:00
commit 5b9478d37b

View File

@ -1,4 +1,3 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "BlockID.h" #include "BlockID.h"
@ -278,7 +277,7 @@ cWorld::cWorld(const AString & a_WorldName) :
m_LastSave = 0; m_LastSave = 0;
m_LastUnload = 0; m_LastUnload = 0;
// preallocate some memory for ticking blocks so we don´t need to allocate that often // preallocate some memory for ticking blocks so we don<EFBFBD>t need to allocate that often
m_BlockTickQueue.reserve(1000); m_BlockTickQueue.reserve(1000);
m_BlockTickQueueCopy.reserve(1000); m_BlockTickQueueCopy.reserve(1000);
@ -634,7 +633,6 @@ void cWorld::TickSpawnMobs(float a_Dt)
{ {
switch (nightRand) switch (nightRand)
{ {
case 1: MobType = E_ENTITY_TYPE_ZOMBIE; break; // _X 2013_06_25: Really? Zombies in the Nether?
case 5: MobType = E_ENTITY_TYPE_GHAST; break; case 5: MobType = E_ENTITY_TYPE_GHAST; break;
case 6: MobType = E_ENTITY_TYPE_ZOMBIE_PIGMAN; break; case 6: MobType = E_ENTITY_TYPE_ZOMBIE_PIGMAN; break;
} }
@ -644,6 +642,7 @@ void cWorld::TickSpawnMobs(float a_Dt)
switch (nightRand) switch (nightRand)
{ {
case 0: MobType = E_ENTITY_TYPE_SPIDER; break; case 0: MobType = E_ENTITY_TYPE_SPIDER; break;
case 1: MobType = E_ENTITY_TYPE_ZOMBIE; break;
case 2: MobType = E_ENTITY_TYPE_ENDERMAN; break; case 2: MobType = E_ENTITY_TYPE_ENDERMAN; break;
case 3: MobType = E_ENTITY_TYPE_CREEPER; break; case 3: MobType = E_ENTITY_TYPE_CREEPER; break;
case 4: MobType = E_ENTITY_TYPE_CAVE_SPIDER; break; case 4: MobType = E_ENTITY_TYPE_CAVE_SPIDER; break;