diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-09-20 13:37:01 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-09-20 13:47:58 +0300 |
| commit | ca7de6f8ca1277318d0f4a445b50942870df926f (patch) | |
| tree | 36a7cccd88c281de20bb71080b26590411f30495 /src/net/eathena/beinghandler.cpp | |
| parent | 9260ff92edf7f77e254ccdc71c4082005f66d852 (diff) | |
| download | mv-ca7de6f8ca1277318d0f4a445b50942870df926f.tar.gz mv-ca7de6f8ca1277318d0f4a445b50942870df926f.tar.bz2 mv-ca7de6f8ca1277318d0f4a445b50942870df926f.tar.xz mv-ca7de6f8ca1277318d0f4a445b50942870df926f.zip | |
eathena: create being based on being type and not job.
Diffstat (limited to 'src/net/eathena/beinghandler.cpp')
| -rw-r--r-- | src/net/eathena/beinghandler.cpp | 56 |
1 files changed, 50 insertions, 6 deletions
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index 1d341e520..f222feada 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -285,6 +285,47 @@ void BeingHandler::handleMessage(Net::MessageIn &msg) } } +Being *BeingHandler::createBeing2(const int id, + const int16_t job, + const BeingType::BeingType beingType) const +{ + if (!actorManager) + return nullptr; + + ActorType::Type type = ActorType::Unknown; + switch (beingType) + { + case BeingType::PC: + type = ActorType::Player; + break; + case BeingType::NPC: + case BeingType::NPC_EVENT: + type = ActorType::Npc; + break; + case BeingType::MONSTER: + type = ActorType::Monster; + break; + case BeingType::ITEM: + case BeingType::SKILL: + case BeingType::ELEMENTAL: + logger->log("not supported object type: %d, job: %d", + static_cast<int>(beingType), static_cast<int>(job)); + break; + 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)); + break; + } + if (job == 45 && beingType == BeingType::NPC_EVENT) + type = ActorType::Portal; + + return actorManager->createBeing(id, type, job); +} + void BeingHandler::undress(Being *const being) const { being->setSprite(SPRITE_BOTTOMCLOTHES, 0); @@ -885,7 +926,8 @@ void BeingHandler::processBeingVisible(Net::MessageIn &msg) return; msg.readInt16("len"); - msg.readUInt8("object type"); + const BeingType::BeingType type = static_cast<BeingType::BeingType>( + msg.readUInt8("object type")); // Information about a being in range const int id = msg.readInt32("being id"); @@ -919,7 +961,7 @@ void BeingHandler::processBeingVisible(Net::MessageIn &msg) if (actorManager->isBlocked(id) == true) return; - dstBeing = createBeing(id, job); + dstBeing = createBeing2(id, job, type); if (!dstBeing) return; @@ -1047,7 +1089,8 @@ void BeingHandler::processBeingMove(Net::MessageIn &msg) return; msg.readInt16("len"); - msg.readUInt8("object type"); + const BeingType::BeingType type = static_cast<BeingType::BeingType>( + msg.readUInt8("object type")); // Information about a being in range const int id = msg.readInt32("being id"); @@ -1089,7 +1132,7 @@ void BeingHandler::processBeingMove(Net::MessageIn &msg) if (actorManager->isBlocked(id) == true) return; - dstBeing = createBeing(id, job); + dstBeing = createBeing2(id, job, type); if (!dstBeing) return; @@ -1217,7 +1260,8 @@ void BeingHandler::processBeingSpawn(Net::MessageIn &msg) return; msg.readInt16("len"); - msg.readUInt8("object type"); + const BeingType::BeingType type = static_cast<BeingType::BeingType>( + msg.readUInt8("object type")); // Information about a being in range const int id = msg.readInt32("being id"); @@ -1255,7 +1299,7 @@ void BeingHandler::processBeingSpawn(Net::MessageIn &msg) if (actorManager->isBlocked(id) == true) return; - dstBeing = createBeing(id, job); + dstBeing = createBeing2(id, job, type); if (!dstBeing) return; |