summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-24 23:30:21 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-24 23:30:21 +0300
commit22b5ab21f9354294def23a6205359d5763c30739 (patch)
tree714a7822ba1cc54bb81371d6a93b1fff0121feeb /src
parentd2fade5787cb2fa315056410af6d6e6b92438b14 (diff)
downloadplus-22b5ab21f9354294def23a6205359d5763c30739.tar.gz
plus-22b5ab21f9354294def23a6205359d5763c30739.tar.bz2
plus-22b5ab21f9354294def23a6205359d5763c30739.tar.xz
plus-22b5ab21f9354294def23a6205359d5763c30739.zip
For homunculus being use same data like for monster.
Diffstat (limited to 'src')
-rw-r--r--src/being/actortype.h3
-rw-r--r--src/being/being.cpp2
-rw-r--r--src/net/eathena/beinghandler.cpp4
3 files changed, 6 insertions, 3 deletions
diff --git a/src/being/actortype.h b/src/being/actortype.h
index f39216d32..6b6acce88 100644
--- a/src/being/actortype.h
+++ b/src/being/actortype.h
@@ -35,7 +35,8 @@ namespace ActorType
LocalPet,
Pet,
Avatar,
- Mercenary
+ Mercenary,
+ Homunculus
};
} // namespace ActorType
diff --git a/src/being/being.cpp b/src/being/being.cpp
index fd71e5f9a..869d7d8b1 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -303,7 +303,7 @@ void Being::setSubtype(const uint16_t subtype, const uint8_t look)
mSubType = subtype;
mLook = look;
- if (mType == ActorType::Monster)
+ if (mType == ActorType::Monster || mType == ActorType::Homunculus)
{
mInfo = MonsterDB::get(mSubType);
if (mInfo)
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 23e7d1149..c51651f38 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -313,6 +313,9 @@ Being *BeingHandler::createBeing2(const int id,
case BeingType::PET:
type = ActorType::Pet;
break;
+ case BeingType::HOMUN:
+ type = ActorType::Homunculus;
+ break;
case BeingType::ITEM:
case BeingType::SKILL:
case BeingType::ELEMENTAL:
@@ -320,7 +323,6 @@ Being *BeingHandler::createBeing2(const int id,
static_cast<int>(beingType), static_cast<int>(job));
break;
case BeingType::CHAT:
- case BeingType::HOMUN:
default:
type = ActorType::Monster;
logger->log("not supported object type: %d, job: %d",