From 1fe9a9f2002dc2d04bb52ec79ffa8c198e8f6c06 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 29 Jul 2016 22:38:01 +0300
Subject: Fix code style.

---
 src/net/eathena/beingrecv.cpp | 31 ++++++++++++++++++-------------
 src/net/eathena/itemrecv.cpp  |  4 ++--
 2 files changed, 20 insertions(+), 15 deletions(-)

(limited to 'src/net/eathena')

diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index b918ae108..426003c7f 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -980,15 +980,17 @@ void BeingRecv::processSkillCastingContinue(Net::MessageIn &msg,
     {   // being to being
         Being *const dstBeing = actorManager->findBeing(dstId);
         if (srcBeing)
-            srcBeing->handleSkillCasting(dstBeing, skillId, skillLevel);
-        if (dstBeing)
         {
-            srcBeing->addCast(dstBeing->getTileX(),
-                dstBeing->getTileY(),
-                skillId,
-                skillLevel,
-                range,
-                castTime / MILLISECONDS_IN_A_TICK);
+            srcBeing->handleSkillCasting(dstBeing, skillId, skillLevel);
+            if (dstBeing)
+            {
+                srcBeing->addCast(dstBeing->getTileX(),
+                    dstBeing->getTileY(),
+                    skillId,
+                    skillLevel,
+                    range,
+                    castTime / MILLISECONDS_IN_A_TICK);
+            }
         }
     }
     else if (dstX != 0 || dstY != 0)
@@ -999,11 +1001,14 @@ void BeingRecv::processSkillCastingContinue(Net::MessageIn &msg,
             skillLevel,
             dstX, dstY,
             castTime);
-        srcBeing->addCast(dstX, dstY,
-            skillId,
-            skillLevel,
-            range,
-            castTime / MILLISECONDS_IN_A_TICK);
+        if (srcBeing)
+        {
+            srcBeing->addCast(dstX, dstY,
+                skillId,
+                skillLevel,
+                range,
+                castTime / MILLISECONDS_IN_A_TICK);
+        }
     }
     if (srcBeing == localPlayer &&
         (inf2 & SkillType2::FreeCastAny) == 0)
diff --git a/src/net/eathena/itemrecv.cpp b/src/net/eathena/itemrecv.cpp
index eea55f340..321109290 100644
--- a/src/net/eathena/itemrecv.cpp
+++ b/src/net/eathena/itemrecv.cpp
@@ -26,9 +26,9 @@
 #include "itemcolormanager.h"
 #include "logger.h"
 
-#include "net/messagein.h"
+#include "const/resources/item/cards.h"
 
-#include "resources/item/cardslist.h"
+#include "net/messagein.h"
 
 #include "debug.h"
 
-- 
cgit v1.2.3-70-g09d2