summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-07-17 23:32:01 +0200
committerHowaner <franzi.moos@googlemail.com>2014-07-17 23:32:01 +0200
commitfba93aac2aa90fa654fef9fe4252042aae53893f (patch)
tree7a9df6a085de3c1f718696b999068badfe675401
parentFixed many slime bugs. (diff)
downloadcuberite-fba93aac2aa90fa654fef9fe4252042aae53893f.tar
cuberite-fba93aac2aa90fa654fef9fe4252042aae53893f.tar.gz
cuberite-fba93aac2aa90fa654fef9fe4252042aae53893f.tar.bz2
cuberite-fba93aac2aa90fa654fef9fe4252042aae53893f.tar.lz
cuberite-fba93aac2aa90fa654fef9fe4252042aae53893f.tar.xz
cuberite-fba93aac2aa90fa654fef9fe4252042aae53893f.tar.zst
cuberite-fba93aac2aa90fa654fef9fe4252042aae53893f.zip
-rw-r--r--src/Mobs/Slime.cpp14
-rw-r--r--src/Mobs/Slime.h2
2 files changed, 10 insertions, 6 deletions
diff --git a/src/Mobs/Slime.cpp b/src/Mobs/Slime.cpp
index d74b66e5b..4e12fca51 100644
--- a/src/Mobs/Slime.cpp
+++ b/src/Mobs/Slime.cpp
@@ -11,7 +11,13 @@
/// Creates a slime of the specified size; size is 1 .. 3, with 1 being the smallest
cSlime::cSlime(int a_Size) :
- super("Slime", mtSlime, Printf("mob.slime.%s", GetSizeName(a_Size).c_str()), Printf("mob.slime.%s", GetSizeName(a_Size).c_str()), 0.6 * a_Size, 0.6 * a_Size),
+ super("Slime",
+ mtSlime,
+ Printf("mob.slime.%s", GetSizeName(a_Size).c_str()),
+ Printf("mob.slime.%s", GetSizeName(a_Size).c_str()),
+ 0.6 * a_Size,
+ 0.6 * a_Size
+ ),
m_Size(a_Size)
{
SetMaxHealth(a_Size * a_Size);
@@ -72,9 +78,7 @@ void cSlime::KilledBy(TakeDamageInfo & a_TDI)
cSlime * NewSlime = new cSlime(m_Size / 2);
NewSlime->SetPosition(GetPosX() + AddX, GetPosY() + 0.5, GetPosZ() + AddZ);
- NewSlime->SetYaw(Random.NextFloat(2.0f) * 360.0f);
- NewSlime->SetPitch(0.0f);
-
+ NewSlime->SetYaw(Random.NextFloat(1.0f) * 360.0f);
m_World->SpawnMobFinalize(NewSlime);
}
}
@@ -85,7 +89,7 @@ void cSlime::KilledBy(TakeDamageInfo & a_TDI)
-const AString & cSlime::GetSizeName(int a_Size)
+const AString cSlime::GetSizeName(int a_Size) const
{
if (a_Size > 1)
{
diff --git a/src/Mobs/Slime.h b/src/Mobs/Slime.h
index 1f66d9afb..87c5a8e5e 100644
--- a/src/Mobs/Slime.h
+++ b/src/Mobs/Slime.h
@@ -23,7 +23,7 @@ public:
virtual void KilledBy(TakeDamageInfo & a_TDI) override;
int GetSize(void) const { return m_Size; }
- const AString & GetSizeName(int a_Size);
+ const AString GetSizeName(int a_Size) const;
protected: