diff options
| -rw-r--r-- | src/being/being.h | 20 | ||||
| -rw-r--r-- | src/net/eathena/beinghandler.cpp | 16 |
2 files changed, 24 insertions, 12 deletions
diff --git a/src/being/being.h b/src/being/being.h index 1ae269416..b5becbf7a 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -91,12 +91,20 @@ class Being notfinal : public ActorSprite, enum AttackType { - HIT = 0x00, - CRITICAL = 0x0a, - MULTI = 0x08, - REFLECT = 0x04, - FLEE = 0x0b, - SKILL = 0xff, + HIT = 0, + PICKUP = 1, + SIT = 2, + STAND = 3, + REFLECT = 4, + SPLASH = 5, + SKILL = 6, + REPEATE = 7, + MULTI = 8, + MULTI_REFLECT = 9, + CRITICAL = 10, + FLEE = 11, + TOUCH_SKILL = 12, +//? SKILL = 0xff, MISS = 0xffff // pseudo value for miss attacks }; diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index 366bddf85..7db7f0e80 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -1559,8 +1559,12 @@ void BeingHandler::processBeingAction2(Net::MessageIn &msg) const case Being::HIT: // Damage case Being::CRITICAL: // Critical Damage case Being::MULTI: // Critical Damage + case Being::MULTI_REFLECT: case Being::REFLECT: // Reflected Damage case Being::FLEE: // Lucky Dodge + case Being::SPLASH: + case Being::SKILL: + case Being::REPEATE: if (srcBeing) { if (srcSpeed && srcBeing->getType() == ActorType::Player) @@ -1577,13 +1581,13 @@ void BeingHandler::processBeingAction2(Net::MessageIn &msg) const } break; - case 0x01: // dead or pickup? + case Being::PICKUP: break; - // tmw server can send here garbage? -// if (srcBeing) -// srcBeing->setAction(BeingAction::DEAD, 0); - case 0x02: // Sit + case Being::TOUCH_SKILL: + break; + + case Being::SIT: if (srcBeing) { srcBeing->setAction(BeingAction::SIT, 0); @@ -1596,7 +1600,7 @@ void BeingHandler::processBeingAction2(Net::MessageIn &msg) const } break; - case 0x03: // Stand up + case Being::STAND: if (srcBeing) { srcBeing->setAction(BeingAction::STAND, 0); |