summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-03-21 19:20:13 +0300
committerAndrei Karas <akaras@inbox.ru>2015-03-21 19:20:13 +0300
commitf047361a2306705b85ee6074c7d47434d80fa4d3 (patch)
tree208c4972b8da2217a006759fae9d847bc0c42356 /src/net/tmwa
parentb55dc94736c2402df4e2376fd5e49966eddd6694 (diff)
downloadmanaplus-f047361a2306705b85ee6074c7d47434d80fa4d3.tar.gz
manaplus-f047361a2306705b85ee6074c7d47434d80fa4d3.tar.bz2
manaplus-f047361a2306705b85ee6074c7d47434d80fa4d3.tar.xz
manaplus-f047361a2306705b85ee6074c7d47434d80fa4d3.zip
Revert "Move processBeingAction from ea namespace into tmwa."
This reverts commit 4688d64d9881d296193b03d3dd6f5a7305bbf3a7.
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/beinghandler.cpp91
-rw-r--r--src/net/tmwa/beinghandler.h2
2 files changed, 0 insertions, 93 deletions
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 0f9373d01..33c1db769 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -1619,95 +1619,4 @@ void BeingHandler::processIpResponse(Net::MessageIn &msg)
BLOCK_END("BeingHandler::processIpResponse")
}
-void BeingHandler::processBeingAction(Net::MessageIn &msg)
-{
- BLOCK_START("BeingHandler::processBeingAction")
- if (!actorManager)
- {
- BLOCK_END("BeingHandler::processBeingAction")
- return;
- }
-
- Being *const srcBeing = actorManager->findBeing(
- msg.readInt32("src being id"));
- Being *const dstBeing = actorManager->findBeing(
- msg.readInt32("dst being id"));
-
- msg.readInt32("tick");
- const int srcSpeed = msg.readInt32("src speed");
- msg.readInt32("dst speed");
- const int param1 = msg.readInt16("param1");
- msg.readInt16("param 2");
- const uint8_t type = msg.readUInt8("type");
- msg.readInt16("param 3");
-
- switch (type)
- {
- case AttackType::HIT: // Damage
- case AttackType::CRITICAL: // Critical Damage
- case AttackType::MULTI: // Critical Damage
- case AttackType::REFLECT: // Reflected Damage
- case AttackType::FLEE: // Lucky Dodge
- if (srcBeing)
- {
- if (srcSpeed && srcBeing->getType() == ActorType::Player)
- srcBeing->setAttackDelay(srcSpeed);
- // attackid=1, type
- srcBeing->handleAttack(dstBeing, param1, 1);
- if (srcBeing->getType() == ActorType::Player)
- srcBeing->setAttackTime();
- }
- if (dstBeing)
- {
- dstBeing->takeDamage(srcBeing, param1,
- static_cast<AttackType::Type>(type));
- }
- break;
-
- case 0x01: // dead or pickup?
- break;
- // tmw server can send here garbage?
-// if (srcBeing)
-// srcBeing->setAction(BeingAction::DEAD, 0);
-
- case 0x02: // Sit
- if (srcBeing)
- {
- srcBeing->setAction(BeingAction::SIT, 0);
- if (srcBeing->getType() == ActorType::Player)
- {
- srcBeing->setMoveTime();
- if (localPlayer)
- localPlayer->imitateAction(srcBeing, BeingAction::SIT);
- }
- }
- break;
-
- case 0x03: // Stand up
- if (srcBeing)
- {
- srcBeing->setAction(BeingAction::STAND, 0);
- if (srcBeing->getType() == ActorType::Player)
- {
- srcBeing->setMoveTime();
- if (localPlayer)
- {
- localPlayer->imitateAction(srcBeing,
- BeingAction::STAND);
- }
- }
- }
- break;
- default:
- logger->log("QQQ1 SMSG_BEING_ACTION:");
- if (srcBeing)
- logger->log("srcBeing:" + toString(srcBeing->getId()));
- if (dstBeing)
- logger->log("dstBeing:" + toString(dstBeing->getId()));
- logger->log("type: " + toString(type));
- break;
- }
- BLOCK_END("BeingHandler::processBeingAction")
-}
-
} // namespace TmwAthena
diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h
index 4ce315446..f2117e2bc 100644
--- a/src/net/tmwa/beinghandler.h
+++ b/src/net/tmwa/beinghandler.h
@@ -94,8 +94,6 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
static void processSkillCastCancel(Net::MessageIn &msg);
static void processIpResponse(Net::MessageIn &msg);
-
- static void processBeingAction(Net::MessageIn &msg);
};
} // namespace TmwAthena