From 814e88e5ca69bc54837be27429dbf42dd41f7ac6 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 12 May 2014 19:12:15 +0300
Subject: Move being action into separate file.

---
 src/net/ea/beinghandler.cpp  | 31 +++++++++++++++++--------------
 src/net/ea/playerhandler.cpp |  6 +++---
 2 files changed, 20 insertions(+), 17 deletions(-)

(limited to 'src/net/ea')

diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index dd38dfdf7..34beab5ad 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -182,13 +182,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
@@ -300,7 +300,7 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg,
         msg.readCoordinatePair(srcX, srcY, dstX, dstY);
         if (!disguiseId)
         {
-            dstBeing->setAction(Being::STAND, 0);
+            dstBeing->setAction(BeingAction::STAND, 0);
             dstBeing->setTileCoords(srcX, srcY);
             if (serverVersion < 10)
                 dstBeing->setDestination(dstX, dstY);
@@ -366,7 +366,7 @@ void BeingHandler::processBeingMove2(Net::MessageIn &msg) const
     msg.readCoordinatePair(srcX, srcY, dstX, dstY);
     msg.readInt32();  // Server tick
 
-    dstBeing->setAction(Being::STAND, 0);
+    dstBeing->setAction(BeingAction::STAND, 0);
     dstBeing->setTileCoords(srcX, srcY);
     dstBeing->setDestination(dstX, dstY);
     if (dstBeing->getType() == Being::PLAYER)
@@ -405,9 +405,9 @@ void BeingHandler::processBeingRemove(Net::MessageIn &msg) const
 
     if (msg.readInt8() == 1)
     {
-        if (dstBeing->getCurrentAction() != Being::DEAD)
+        if (dstBeing->getCurrentAction() != BeingAction::DEAD)
         {
-            dstBeing->setAction(Being::DEAD, 0);
+            dstBeing->setAction(BeingAction::DEAD, 0);
             dstBeing->recalcSpritesOrder();
         }
         if (dstBeing->getName() == "Jack O" && killStats)
@@ -443,7 +443,7 @@ void BeingHandler::processBeingResurrect(Net::MessageIn &msg) const
         player_node->stopAttack();
 
     if (msg.readInt8() == 1)
-        dstBeing->setAction(Being::STAND, 0);
+        dstBeing->setAction(BeingAction::STAND, 0);
 }
 
 
@@ -511,17 +511,17 @@ void BeingHandler::processBeingAction(Net::MessageIn &msg) const
             break;
             // tmw server can send here garbage?
 //            if (srcBeing)
-//                srcBeing->setAction(Being::DEAD, 0);
+//                srcBeing->setAction(BeingAction::DEAD, 0);
 
         case 0x02:  // Sit
             if (srcBeing)
             {
-                srcBeing->setAction(Being::SIT, 0);
+                srcBeing->setAction(BeingAction::SIT, 0);
                 if (srcBeing->getType() == Being::PLAYER)
                 {
                     srcBeing->setMoveTime();
                     if (player_node)
-                        player_node->imitateAction(srcBeing, Being::SIT);
+                        player_node->imitateAction(srcBeing, BeingAction::SIT);
                 }
             }
             break;
@@ -529,12 +529,15 @@ void BeingHandler::processBeingAction(Net::MessageIn &msg) const
         case 0x03:  // Stand up
             if (srcBeing)
             {
-                srcBeing->setAction(Being::STAND, 0);
+                srcBeing->setAction(BeingAction::STAND, 0);
                 if (srcBeing->getType() == Being::PLAYER)
                 {
                     srcBeing->setMoveTime();
                     if (player_node)
-                        player_node->imitateAction(srcBeing, Being::STAND);
+                    {
+                        player_node->imitateAction(srcBeing,
+                            BeingAction::STAND);
+                    }
                 }
             }
             break;
@@ -702,8 +705,8 @@ void BeingHandler::processPlayerStop(Net::MessageIn &msg) const
             const uint16_t x = msg.readInt16();
             const uint16_t y = msg.readInt16();
             dstBeing->setTileCoords(x, y);
-            if (dstBeing->getCurrentAction() == Being::MOVE)
-                dstBeing->setAction(Being::STAND, 0);
+            if (dstBeing->getCurrentAction() == BeingAction::MOVE)
+                dstBeing->setAction(BeingAction::STAND, 0);
         }
     }
 }
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index b299edd5f..efaee8857 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -203,7 +203,7 @@ void PlayerHandler::processPlayerWarp(Net::MessageIn &msg)
             }
         }
 
-        player_node->setAction(Being::STAND, 0);
+        player_node->setAction(BeingAction::STAND, 0);
         player_node->setTileCoords(x, y);
         player_node->updatePets();
         player_node->navigateClean();
@@ -400,9 +400,9 @@ void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg)
         deathNotice = new OkDialog(_("Message"),
             DeadDB::getRandomString(), DIALOG_OK, false);
         deathNotice->addActionListener(&deathListener);
-        if (player_node->getCurrentAction() != Being::DEAD)
+        if (player_node->getCurrentAction() != BeingAction::DEAD)
         {
-            player_node->setAction(Being::DEAD, 0);
+            player_node->setAction(BeingAction::DEAD, 0);
             player_node->recalcSpritesOrder();
         }
     }
-- 
cgit v1.2.3-60-g2f50