summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortonibm19 <tonibm19@gmail.com>2013-08-06 21:38:32 +0200
committertonibm19 <tonibm19@gmail.com>2013-08-06 21:38:32 +0200
commitd48ff88e073526e3e7b1fac28e2ffa97c6e6ccd9 (patch)
tree60c18ec2fbec1b52b0b63bf59b346486c6c5c578
parentExported the cWorld:TryGetHeight() function (diff)
downloadcuberite-d48ff88e073526e3e7b1fac28e2ffa97c6e6ccd9.tar
cuberite-d48ff88e073526e3e7b1fac28e2ffa97c6e6ccd9.tar.gz
cuberite-d48ff88e073526e3e7b1fac28e2ffa97c6e6ccd9.tar.bz2
cuberite-d48ff88e073526e3e7b1fac28e2ffa97c6e6ccd9.tar.lz
cuberite-d48ff88e073526e3e7b1fac28e2ffa97c6e6ccd9.tar.xz
cuberite-d48ff88e073526e3e7b1fac28e2ffa97c6e6ccd9.tar.zst
cuberite-d48ff88e073526e3e7b1fac28e2ffa97c6e6ccd9.zip
-rw-r--r--source/World.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/source/World.cpp b/source/World.cpp
index 880f6e5b2..79c0cd4f1 100644
--- a/source/World.cpp
+++ b/source/World.cpp
@@ -1,4 +1,3 @@
-
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "BlockID.h"
@@ -278,7 +277,7 @@ cWorld::cWorld(const AString & a_WorldName) :
m_LastSave = 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�t need to allocate that often
m_BlockTickQueue.reserve(1000);
m_BlockTickQueueCopy.reserve(1000);
@@ -634,7 +633,6 @@ void cWorld::TickSpawnMobs(float a_Dt)
{
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 6: MobType = E_ENTITY_TYPE_ZOMBIE_PIGMAN; break;
}
@@ -642,8 +640,9 @@ void cWorld::TickSpawnMobs(float a_Dt)
else
{
switch (nightRand)
- {
+ {
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 3: MobType = E_ENTITY_TYPE_CREEPER; break;
case 4: MobType = E_ENTITY_TYPE_CAVE_SPIDER; break;