summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-20 14:10:11 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-20 14:10:11 +0300
commit2f8076f6c51cd969da927d12d6cd89a46899322e (patch)
tree5455a5751377f5123f4ac9164a627a7c829a06ad /src/net
parentca7de6f8ca1277318d0f4a445b50942870df926f (diff)
downloadmanaplus-2f8076f6c51cd969da927d12d6cd89a46899322e.tar.gz
manaplus-2f8076f6c51cd969da927d12d6cd89a46899322e.tar.bz2
manaplus-2f8076f6c51cd969da927d12d6cd89a46899322e.tar.xz
manaplus-2f8076f6c51cd969da927d12d6cd89a46899322e.zip
Add mercenary actor type. Use it for now in samw way with monster type.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/eathena/beinghandler.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index f222feada..e2617dc98 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -305,6 +305,9 @@ Being *BeingHandler::createBeing2(const int id,
case BeingType::MONSTER:
type = ActorType::Monster;
break;
+ case BeingType::MERSOL:
+ type = ActorType::Mercenary;
+ break;
case BeingType::ITEM:
case BeingType::SKILL:
case BeingType::ELEMENTAL:
@@ -314,7 +317,6 @@ Being *BeingHandler::createBeing2(const int id,
case BeingType::CHAT:
case BeingType::PET:
case BeingType::HOMUN:
- case BeingType::MERSOL:
type = ActorType::Monster;
logger->log("not supported object type: %d, job: %d",
static_cast<int>(beingType), static_cast<int>(job));