summaryrefslogtreecommitdiffstats
path: root/src/Mobs
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-10-05 22:09:19 +0200
committermadmaxoft <github@xoft.cz>2014-10-05 22:09:19 +0200
commit77c5b410e653433a17c7cf25b115dae4c25bdbd2 (patch)
tree9c83562622c5f554355ddd2ca54605aa04379627 /src/Mobs
parentFixed typo. (diff)
downloadcuberite-77c5b410e653433a17c7cf25b115dae4c25bdbd2.tar
cuberite-77c5b410e653433a17c7cf25b115dae4c25bdbd2.tar.gz
cuberite-77c5b410e653433a17c7cf25b115dae4c25bdbd2.tar.bz2
cuberite-77c5b410e653433a17c7cf25b115dae4c25bdbd2.tar.lz
cuberite-77c5b410e653433a17c7cf25b115dae4c25bdbd2.tar.xz
cuberite-77c5b410e653433a17c7cf25b115dae4c25bdbd2.tar.zst
cuberite-77c5b410e653433a17c7cf25b115dae4c25bdbd2.zip
Diffstat (limited to 'src/Mobs')
-rw-r--r--src/Mobs/CMakeLists.txt1
-rw-r--r--src/Mobs/Monster.cpp10
-rw-r--r--src/Mobs/MonsterTypes.h13
3 files changed, 24 insertions, 0 deletions
diff --git a/src/Mobs/CMakeLists.txt b/src/Mobs/CMakeLists.txt
index 2c092c15f..bbbb9287a 100644
--- a/src/Mobs/CMakeLists.txt
+++ b/src/Mobs/CMakeLists.txt
@@ -54,6 +54,7 @@ SET (HDRS
IronGolem.h
MagmaCube.h
Monster.h
+ MonsterTypes.h
Mooshroom.h
Ocelot.h
PassiveAggressiveMonster.h
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index 12ca6bbbe..cc48dba5e 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -62,6 +62,16 @@ static const struct
+eMonsterType StringToMobType(const AString & a_MobString)
+{
+ LOGWARNING("%s: Function is obsolete, use cMonster::StringToMobType() instead");
+ return cMonster::StringToMobType(a_MobString);
+}
+
+
+
+
+
////////////////////////////////////////////////////////////////////////////////
// cMonster:
diff --git a/src/Mobs/MonsterTypes.h b/src/Mobs/MonsterTypes.h
index 7a73e99f4..852eb3446 100644
--- a/src/Mobs/MonsterTypes.h
+++ b/src/Mobs/MonsterTypes.h
@@ -37,5 +37,18 @@ enum eMonsterType
mtZombie = E_META_SPAWN_EGG_ZOMBIE,
mtZombiePigman = E_META_SPAWN_EGG_ZOMBIE_PIGMAN,
} ;
+
+
+
+
+
+/** Translates a mob string ("ocelot") to mobtype (mtOcelot).
+OBSOLETE, use cMonster::StringToMobType() instead.
+Implemented in Monster.cpp. */
+extern eMonsterType StringToMobType(const AString & a_MobString);
+
// tolua_end
+
+
+