summaryrefslogtreecommitdiffstats
path: root/source/Mobs
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-11-10 23:20:25 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-11-10 23:20:25 +0100
commitf713780db31e22345a1faf048ab948b1b4e03200 (patch)
treef05cc95ba5e3eef14c490700456415c6b15bdd7f /source/Mobs
parentBundled fixes [SEE DESC] (diff)
downloadcuberite-f713780db31e22345a1faf048ab948b1b4e03200.tar
cuberite-f713780db31e22345a1faf048ab948b1b4e03200.tar.gz
cuberite-f713780db31e22345a1faf048ab948b1b4e03200.tar.bz2
cuberite-f713780db31e22345a1faf048ab948b1b4e03200.tar.lz
cuberite-f713780db31e22345a1faf048ab948b1b4e03200.tar.xz
cuberite-f713780db31e22345a1faf048ab948b1b4e03200.tar.zst
cuberite-f713780db31e22345a1faf048ab948b1b4e03200.zip
Diffstat (limited to '')
-rw-r--r--source/Mobs/Horse.cpp8
-rw-r--r--source/Mobs/Monster.cpp7
2 files changed, 10 insertions, 5 deletions
diff --git a/source/Mobs/Horse.cpp b/source/Mobs/Horse.cpp
index d18887ea4..bb9a4e3f6 100644
--- a/source/Mobs/Horse.cpp
+++ b/source/Mobs/Horse.cpp
@@ -55,10 +55,10 @@ void cHorse::Tick(float a_Dt, cChunk & a_Chunk)
{
if (m_World->GetTickRandomNumber(50) == 25)
{
- m_World->BroadcastSoundParticleEffect(2000, (int)(floor(GetPosX()) * 8), (int)(floor(GetPosY()) * 8), (int)(floor(GetPosZ()) * 8), 0);
- m_World->BroadcastSoundParticleEffect(2000, (int)(floor(GetPosX()) * 8), (int)(floor(GetPosY()) * 8), (int)(floor(GetPosZ()) * 8), 2);
- m_World->BroadcastSoundParticleEffect(2000, (int)(floor(GetPosX()) * 8), (int)(floor(GetPosY()) * 8), (int)(floor(GetPosZ()) * 8), 6);
- m_World->BroadcastSoundParticleEffect(2000, (int)(floor(GetPosX()) * 8), (int)(floor(GetPosY()) * 8), (int)(floor(GetPosZ()) * 8), 8);
+ m_World->BroadcastSoundParticleEffect(2000, (int)GetPosX(), (int)GetPosY(), (int)GetPosZ(), 0);
+ m_World->BroadcastSoundParticleEffect(2000, (int)GetPosX(), (int)GetPosY(), (int)GetPosZ(), 2);
+ m_World->BroadcastSoundParticleEffect(2000, (int)GetPosX(), (int)GetPosY(), (int)GetPosZ(), 6);
+ m_World->BroadcastSoundParticleEffect(2000, (int)GetPosX(), (int)GetPosY(), (int)GetPosZ(), 8);
m_Attachee->Detach();
m_bIsRearing = true;
diff --git a/source/Mobs/Monster.cpp b/source/Mobs/Monster.cpp
index 33960ea46..167a07486 100644
--- a/source/Mobs/Monster.cpp
+++ b/source/Mobs/Monster.cpp
@@ -633,8 +633,13 @@ cMonster * cMonster::NewMonsterFromType(cMonster::eType a_MobType)
case mtMagmaCube:
case mtSlime: toReturn = new cSlime (RandomDerps.NextInt(2) + 1); break; // Size parameter
case mtSheep: toReturn = new cSheep (RandomDerps.NextInt(15)); break; // Colour parameter
- case mtSkeleton: toReturn = new cSkeleton ((bool)(RandomDerps.NextInt(1))); break; // TODO: Actual detection of spawning in Nether
case mtZombie: toReturn = new cZombie (false); break; // TODO: Infected zombie parameter
+ case mtSkeleton:
+ {
+ // TODO: Actual detection of spawning in Nether
+ toReturn = new cSkeleton(RandomDerps.NextInt(1) == 0 ? false : true);
+ break;
+ }
case mtVillager:
{
int VilType = RandomDerps.NextInt(6);