diff options
| author | Mattes D <github@xoft.cz> | 2014-12-01 09:50:34 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-12-01 09:50:34 +0100 |
| commit | 36500f88b279c73c6110762260f46a7cd706d7f8 (patch) | |
| tree | 4e7b9219d5e2151beba3e818fe67eadb91611ceb /src/Mobs | |
| parent | DistortedHeightmap: Added missing initialization. (diff) | |
| parent | Removed old StringToMobType() function from Monster.cpp (diff) | |
| download | cuberite-36500f88b279c73c6110762260f46a7cd706d7f8.tar cuberite-36500f88b279c73c6110762260f46a7cd706d7f8.tar.gz cuberite-36500f88b279c73c6110762260f46a7cd706d7f8.tar.bz2 cuberite-36500f88b279c73c6110762260f46a7cd706d7f8.tar.lz cuberite-36500f88b279c73c6110762260f46a7cd706d7f8.tar.xz cuberite-36500f88b279c73c6110762260f46a7cd706d7f8.tar.zst cuberite-36500f88b279c73c6110762260f46a7cd706d7f8.zip | |
Diffstat (limited to '')
| -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 5319bdf91..e422521b6 100644 --- a/src/Mobs/Monster.cpp +++ b/src/Mobs/Monster.cpp @@ -62,16 +62,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 |