summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTri125 <kraig.tri125@gmail.com>2015-05-07 05:12:17 +0200
committerTri125 <kraig.tri125@gmail.com>2015-05-07 05:12:17 +0200
commit63af47832d37de7829bb2dbfe2df9b63045cf556 (patch)
tree2a06598efbbddbe973fa27181e6be6e2ac2e9d97
parentMerge pull request #1953 from mc-server/bearbin-fadwp (diff)
downloadcuberite-63af47832d37de7829bb2dbfe2df9b63045cf556.tar
cuberite-63af47832d37de7829bb2dbfe2df9b63045cf556.tar.gz
cuberite-63af47832d37de7829bb2dbfe2df9b63045cf556.tar.bz2
cuberite-63af47832d37de7829bb2dbfe2df9b63045cf556.tar.lz
cuberite-63af47832d37de7829bb2dbfe2df9b63045cf556.tar.xz
cuberite-63af47832d37de7829bb2dbfe2df9b63045cf556.tar.zst
cuberite-63af47832d37de7829bb2dbfe2df9b63045cf556.zip
-rw-r--r--src/Mobs/MagmaCube.cpp14
-rw-r--r--src/Mobs/MagmaCube.h4
2 files changed, 16 insertions, 2 deletions
diff --git a/src/Mobs/MagmaCube.cpp b/src/Mobs/MagmaCube.cpp
index 3e9abc108..e56cfa4b8 100644
--- a/src/Mobs/MagmaCube.cpp
+++ b/src/Mobs/MagmaCube.cpp
@@ -7,7 +7,7 @@
cMagmaCube::cMagmaCube(int a_Size) :
- super("MagmaCube", mtMagmaCube, "mob.MagmaCube.big", "mob.MagmaCube.big", 0.6 * a_Size, 0.6 * a_Size),
+ super("MagmaCube", mtMagmaCube, Printf("mob.magmacube.%s", GetSizeName(a_Size).c_str()), Printf("mob.magmacube.%s", GetSizeName(a_Size).c_str()), 0.6 * a_Size, 0.6 * a_Size),
m_Size(a_Size)
{
}
@@ -27,4 +27,14 @@ void cMagmaCube::GetDrops(cItems & a_Drops, cEntity * a_Killer)
-
+const AString cMagmaCube::GetSizeName(int a_Size) const
+{
+ if (a_Size > 1)
+ {
+ return "big";
+ }
+ else
+ {
+ return "small";
+ }
+}
diff --git a/src/Mobs/MagmaCube.h b/src/Mobs/MagmaCube.h
index d66ea423a..62dd83944 100644
--- a/src/Mobs/MagmaCube.h
+++ b/src/Mobs/MagmaCube.h
@@ -19,6 +19,10 @@ public:
virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = nullptr) override;
int GetSize(void) const { return m_Size; }
+
+ /** Returns the text describing the slime's size, as used by the client's resource subsystem for sounds.
+ Returns either "big" or "small". */
+ const AString GetSizeName(int a_Size) const;
protected: