diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-09-10 23:58:39 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-09-10 23:58:39 +0300 |
commit | 0a39e956218ca15bf78803f89141c7c9dfcec0d9 (patch) | |
tree | adfc0fcd42792ddad6b3cb8843d6fe0c22170580 /src/net/ea | |
parent | 69022cd939e572feadaadf1041ae7dadad782ed6 (diff) | |
download | mv-0a39e956218ca15bf78803f89141c7c9dfcec0d9.tar.gz mv-0a39e956218ca15bf78803f89141c7c9dfcec0d9.tar.bz2 mv-0a39e956218ca15bf78803f89141c7c9dfcec0d9.tar.xz mv-0a39e956218ca15bf78803f89141c7c9dfcec0d9.zip |
Change format in ActorType enum.
Diffstat (limited to 'src/net/ea')
-rw-r--r-- | src/net/ea/beinghandler.cpp | 26 | ||||
-rw-r--r-- | src/net/ea/chathandler.cpp | 4 | ||||
-rw-r--r-- | src/net/ea/guildhandler.cpp | 6 | ||||
-rw-r--r-- | src/net/ea/partyhandler.cpp | 4 |
4 files changed, 20 insertions, 20 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 8bb5ec20f..a94f686da 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -59,15 +59,15 @@ Being *BeingHandler::createBeing(const int id, const int16_t job) const if (!actorManager) return nullptr; - ActorType::Type type = ActorType::UNKNOWN; + ActorType::Type type = ActorType::Unknown; if (job <= 25 || (job >= 4001 && job <= 4049)) - type = ActorType::PLAYER; + type = ActorType::Player; else if (job >= 46 && job <= 1000) - type = ActorType::NPC; + type = ActorType::Npc; else if (job > 1000 && job <= 2000) - type = ActorType::MONSTER; + type = ActorType::Monster; else if (job == 45) - type = ActorType::PORTAL; + type = ActorType::Portal; Being *const being = actorManager->createBeing(id, type, job); return being; @@ -123,7 +123,7 @@ void BeingHandler::processBeingRemove(Net::MessageIn &msg) const } else { - if (dstBeing->getType() == ActorType::PLAYER) + if (dstBeing->getType() == ActorType::Player) { if (botCheckerWindow) botCheckerWindow->updateList(); @@ -222,11 +222,11 @@ void BeingHandler::processBeingAction(Net::MessageIn &msg) const case Being::FLEE: // Lucky Dodge if (srcBeing) { - if (srcSpeed && srcBeing->getType() == ActorType::PLAYER) + if (srcSpeed && srcBeing->getType() == ActorType::Player) srcBeing->setAttackDelay(srcSpeed); // attackid=1, type srcBeing->handleAttack(dstBeing, param1, 1); - if (srcBeing->getType() == ActorType::PLAYER) + if (srcBeing->getType() == ActorType::Player) srcBeing->setAttackTime(); } if (dstBeing) @@ -246,7 +246,7 @@ void BeingHandler::processBeingAction(Net::MessageIn &msg) const if (srcBeing) { srcBeing->setAction(BeingAction::SIT, 0); - if (srcBeing->getType() == ActorType::PLAYER) + if (srcBeing->getType() == ActorType::Player) { srcBeing->setMoveTime(); if (localPlayer) @@ -259,7 +259,7 @@ void BeingHandler::processBeingAction(Net::MessageIn &msg) const if (srcBeing) { srcBeing->setAction(BeingAction::STAND, 0); - if (srcBeing->getType() == ActorType::PLAYER) + if (srcBeing->getType() == ActorType::Player) { srcBeing->setMoveTime(); if (localPlayer) @@ -305,7 +305,7 @@ void BeingHandler::processBeingSelfEffect(Net::MessageIn &msg) const effectManager->trigger(effectType, being); // +++ need dehard code effectType == 3 - if (effectType == 3 && being->getType() == ActorType::PLAYER + if (effectType == 3 && being->getType() == ActorType::Player && socialWindow) { // reset received damage socialWindow->resetDamage(being->getName()); @@ -338,7 +338,7 @@ void BeingHandler::processBeingEmotion(Net::MessageIn &msg) const localPlayer->imitateEmote(dstBeing, emote); } } - if (dstBeing->getType() == ActorType::PLAYER) + if (dstBeing->getType() == ActorType::Player) dstBeing->setOtherTime(); BLOCK_END("BeingHandler::processBeingEmotion") } @@ -367,7 +367,7 @@ void BeingHandler::processNameResponse(Net::MessageIn &msg) const dstBeing->updateGuild(); dstBeing->addToCache(); - if (dstBeing->getType() == ActorType::PLAYER) + if (dstBeing->getType() == ActorType::Player) dstBeing->updateColors(); if (localPlayer) diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index 4bec39513..62c6b17f8 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -295,7 +295,7 @@ void ChatHandler::processBeingChat(Net::MessageIn &msg) const std::string chatMsg = msg.readRawString(chatMsgLength, "message"); - if (being->getType() == ActorType::PLAYER) + if (being->getType() == ActorType::Player) being->setTalkTime(); const size_t pos = chatMsg.find(" : ", 0); @@ -310,7 +310,7 @@ void ChatHandler::processBeingChat(Net::MessageIn &msg) const sender_name = "?"; } else if (sender_name != being->getName() - && being->getType() == ActorType::PLAYER) + && being->getType() == ActorType::Player) { if (!being->getName().empty()) sender_name = being->getName(); diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp index de1d2763c..598811fdd 100644 --- a/src/net/ea/guildhandler.cpp +++ b/src/net/ea/guildhandler.cpp @@ -279,7 +279,7 @@ void GuildHandler::processGuildMemberList(Net::MessageIn &msg) const if (actorManager) { Being *const being = actorManager->findBeingByName( - name, ActorType::PLAYER); + name, ActorType::Player); if (being) { being->setGuildName(taGuild->getName()); @@ -481,7 +481,7 @@ void GuildHandler::processGuildLeave(Net::MessageIn &msg) const if (actorManager) { Being *const b = actorManager->findBeingByName( - nick, ActorType::PLAYER); + nick, ActorType::Player); if (b) b->clearGuilds(); @@ -524,7 +524,7 @@ void GuildHandler::processGuildExpulsion(Net::MessageIn &msg) const if (actorManager) { Being *const b = actorManager->findBeingByName( - nick, ActorType::PLAYER); + nick, ActorType::Player); if (b) b->clearGuilds(); diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp index c048178f8..b1d6845f5 100644 --- a/src/net/ea/partyhandler.cpp +++ b/src/net/ea/partyhandler.cpp @@ -92,7 +92,7 @@ void PartyHandler::processPartyInvited(Net::MessageIn &msg) const const Being *const being = actorManager->findBeing(id); if (being) { - if (being->getType() == ActorType::PLAYER) + if (being->getType() == ActorType::Player) nick = being->getName(); } } @@ -214,7 +214,7 @@ void PartyHandler::processPartyLeave(Net::MessageIn &msg) const if (actorManager) { Being *const b = actorManager->findBeing(id); - if (b && b->getType() == ActorType::PLAYER) + if (b && b->getType() == ActorType::Player) { b->setParty(nullptr); b->setPartyName(""); |