diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-12-01 14:43:03 +0100 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-12-01 14:43:03 +0100 |
| commit | 677dde51bd3a8028dc28b004293b7c1b424ead0a (patch) | |
| tree | 23e6e8357a96e0d3920ef00a9c15061f965d822e /src/Mobs | |
| parent | Merge branch 'master' into MobSpawner (diff) | |
| parent | Merge pull request #1624 from mc-server/LuaDeprecating (diff) | |
| download | cuberite-677dde51bd3a8028dc28b004293b7c1b424ead0a.tar cuberite-677dde51bd3a8028dc28b004293b7c1b424ead0a.tar.gz cuberite-677dde51bd3a8028dc28b004293b7c1b424ead0a.tar.bz2 cuberite-677dde51bd3a8028dc28b004293b7c1b424ead0a.tar.lz cuberite-677dde51bd3a8028dc28b004293b7c1b424ead0a.tar.xz cuberite-677dde51bd3a8028dc28b004293b7c1b424ead0a.tar.zst cuberite-677dde51bd3a8028dc28b004293b7c1b424ead0a.zip | |
Diffstat (limited to 'src/Mobs')
| -rw-r--r-- | src/Mobs/Monster.cpp | 10 | ||||
| -rw-r--r-- | src/Mobs/MonsterTypes.h | 10 |
2 files changed, 1 insertions, 19 deletions
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp index 9937e6a95..3011acd85 100644 --- a/src/Mobs/Monster.cpp +++ b/src/Mobs/Monster.cpp @@ -63,16 +63,6 @@ static const struct -eMonsterType StringToMobType(const AString & a_MobString) -{ - LOGWARNING("%s: Function is obsolete, use cMonster::StringToMobType() instead", __FUNCTION__); - return cMonster::StringToMobType(a_MobString); -} - - - - - //////////////////////////////////////////////////////////////////////////////// // cMonster: diff --git a/src/Mobs/MonsterTypes.h b/src/Mobs/MonsterTypes.h index 852eb3446..dc6dd3992 100644 --- a/src/Mobs/MonsterTypes.h +++ b/src/Mobs/MonsterTypes.h @@ -2,6 +2,7 @@ #pragma once /// This identifies individual monster type, as well as their network type-ID + // tolua_begin enum eMonsterType { @@ -38,15 +39,6 @@ enum eMonsterType 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 |