diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-13 01:04:05 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-13 01:04:05 +0300 |
| commit | ea0b61e18f36f28806940b00a2cddaef912c3340 (patch) | |
| tree | 616205f44832d4ced4fc0b50b650eedb0fbf435c /src/net/tmwa | |
| parent | 814e88e5ca69bc54837be27429dbf42dd41f7ac6 (diff) | |
| download | mv-ea0b61e18f36f28806940b00a2cddaef912c3340.tar.gz mv-ea0b61e18f36f28806940b00a2cddaef912c3340.tar.bz2 mv-ea0b61e18f36f28806940b00a2cddaef912c3340.tar.xz mv-ea0b61e18f36f28806940b00a2cddaef912c3340.zip | |
Move actor type into separate file.
Diffstat (limited to 'src/net/tmwa')
| -rw-r--r-- | src/net/tmwa/beinghandler.cpp | 8 | ||||
| -rw-r--r-- | src/net/tmwa/guildhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/partyhandler.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 314f9ee49..5bd39457a 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -287,7 +287,7 @@ void BeingHandler::processBeingChangeLook(Net::MessageIn &msg, id2 = 1; } - if (dstBeing->getType() == Being::PLAYER) + if (dstBeing->getType() == ActorType::PLAYER) dstBeing->setOtherTime(); if (!player_node) @@ -410,7 +410,7 @@ void BeingHandler::processNameResponse2(Net::MessageIn &msg) dstBeing->updateGuild(); dstBeing->addToCache(); - if (dstBeing->getType() == Being::PLAYER) + if (dstBeing->getType() == ActorType::PLAYER) dstBeing->updateColors(); if (player_node) @@ -636,7 +636,7 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, msg.readInt8(); // unknown - if (dstBeing->getType() != Being::PLAYER + if (dstBeing->getType() != ActorType::PLAYER || msgType != 3) { dstBeing->setActionTime(tick_time); @@ -648,7 +648,7 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, dstBeing->setStatusEffectBlock(16, static_cast<uint16_t>( statusEffects & 0xffff)); - if (msgType == 3 && dstBeing->getType() == Being::PLAYER) + if (msgType == 3 && dstBeing->getType() == ActorType::PLAYER) dstBeing->setMoveTime(); } diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp index 4db171545..af45d63cc 100644 --- a/src/net/tmwa/guildhandler.cpp +++ b/src/net/tmwa/guildhandler.cpp @@ -212,7 +212,7 @@ void GuildHandler::invite(const int guildId A_UNUSED, return; const Being *const being = actorManager->findBeingByName( - name, Being::PLAYER); + name, ActorType::PLAYER); if (being) { MessageOut msg(CMSG_GUILD_INVITE); diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp index a7088e33b..310d71783 100644 --- a/src/net/tmwa/partyhandler.cpp +++ b/src/net/tmwa/partyhandler.cpp @@ -127,7 +127,7 @@ void PartyHandler::invite(const std::string &name) const return; const Being *const being = actorManager->findBeingByName( - name, Being::PLAYER); + name, ActorType::PLAYER); if (being) { MessageOut outMsg(CMSG_PARTY_INVITE); |