From 814e88e5ca69bc54837be27429dbf42dd41f7ac6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 12 May 2014 19:12:15 +0300 Subject: Move being action into separate file. --- src/net/eathena/beinghandler.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/net/eathena/beinghandler.cpp') diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index efa22e490..a6716a661 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -544,8 +544,8 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, dstBeing->setDirectionDelayed(static_cast(d)); } - if (player_node->getCurrentAction() != Being::STAND) - player_node->imitateAction(dstBeing, Being::STAND); + if (player_node->getCurrentAction() != BeingAction::STAND) + player_node->imitateAction(dstBeing, BeingAction::STAND); if (player_node->getDirection() != dstBeing->getDirection()) { player_node->imitateDirection(dstBeing, @@ -573,21 +573,21 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, switch (type) { case 0: - dstBeing->setAction(Being::STAND, 0); - player_node->imitateAction(dstBeing, Being::STAND); + dstBeing->setAction(BeingAction::STAND, 0); + player_node->imitateAction(dstBeing, BeingAction::STAND); break; case 1: - if (dstBeing->getCurrentAction() != Being::DEAD) + if (dstBeing->getCurrentAction() != BeingAction::DEAD) { - dstBeing->setAction(Being::DEAD, 0); + dstBeing->setAction(BeingAction::DEAD, 0); dstBeing->recalcSpritesOrder(); } break; case 2: - dstBeing->setAction(Being::SIT, 0); - player_node->imitateAction(dstBeing, Being::SIT); + dstBeing->setAction(BeingAction::SIT, 0); + player_node->imitateAction(dstBeing, BeingAction::SIT); break; default: @@ -690,13 +690,13 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg, if (spawnId) { - dstBeing->setAction(Being::SPAWN, 0); + dstBeing->setAction(BeingAction::SPAWN, 0); } else if (visible) { dstBeing->clearPath(); dstBeing->setActionTime(tick_time); - dstBeing->setAction(Being::STAND, 0); + dstBeing->setAction(BeingAction::STAND, 0); } // Prevent division by 0 when calculating frame @@ -776,7 +776,7 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg, { uint16_t srcX, srcY, dstX, dstY; msg.readCoordinatePair(srcX, srcY, dstX, dstY); - dstBeing->setAction(Being::STAND, 0); + dstBeing->setAction(BeingAction::STAND, 0); dstBeing->setTileCoords(srcX, srcY); dstBeing->setDestination(dstX, dstY); } -- cgit v1.2.3-60-g2f50