From 2bd59adc7c456ce6f377feac8bc838e8011ebfc8 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 5 Jun 2015 21:49:04 +0300
Subject: Fix code style.

---
 src/being/actorsprite.cpp     | 3 +++
 src/being/being.cpp           | 7 +------
 src/being/crazymoves.cpp      | 2 --
 src/being/localplayer.cpp     | 5 +----
 src/being/localplayer.h       | 4 ----
 src/being/playerrelations.cpp | 1 +
 src/being/playerrelations.h   | 2 --
 7 files changed, 6 insertions(+), 18 deletions(-)

(limited to 'src/being')

diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp
index 1f7ea4b95..6f213903e 100644
--- a/src/being/actorsprite.cpp
+++ b/src/being/actorsprite.cpp
@@ -359,6 +359,8 @@ static const char *cursorType(const TargetCursorTypeT type)
         case TargetCursorType::IN_RANGE:
             return "in-range";
         default:
+        case TargetCursorType::NONE:
+        case TargetCursorType::NUM_TCT:
         case TargetCursorType::NORMAL:
             return "normal";
     }
@@ -373,6 +375,7 @@ static const char *cursorSize(const TargetCursorSizeT size)
         case TargetCursorSize::MEDIUM:
             return "m";
         default:
+        case TargetCursorSize::NUM_TC:
         case TargetCursorSize::SMALL:
             return "s";
     }
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 59ceb04d7..2fdbfe55a 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -39,14 +39,12 @@
 #include "being/playerinfo.h"
 #include "being/playerrelations.h"
 
-#include "enums/being/attributes.h"
 #include "enums/being/beingdirection.h"
 
-#include "enums/net/packettype.h"
-
 #include "particle/particleinfo.h"
 
 #include "gui/gui.h"
+#include "gui/userpalette.h"
 
 #include "gui/fonts/font.h"
 
@@ -61,7 +59,6 @@
 #include "net/gamehandler.h"
 #include "net/npchandler.h"
 #include "net/packetlimiter.h"
-#include "net/pethandler.h"
 #include "net/playerhandler.h"
 #include "net/serverfeatures.h"
 
@@ -1681,7 +1678,6 @@ void Being::petLogic()
         setAction(BeingAction::STAND, 0);
         fixPetSpawnPos(dstX, dstY);
         setTileCoords(dstX, dstY);
-        //petHandler->spawn(mOwner, mId, dstX, dstY);
         mPetAi = true;
     }
     else if (!followDist || divX > followDist || divY > followDist)
@@ -3354,7 +3350,6 @@ void Being::addPet(const BeingId id)
         int dstY = mY;
         being->fixPetSpawnPos(dstX, dstY);
         being->setTileCoords(dstX, dstY);
-        //petHandler->spawn(this, being->mId, dstX, dstY);
     }
 }
 
diff --git a/src/being/crazymoves.cpp b/src/being/crazymoves.cpp
index 83eed7bd9..0405a0fcc 100644
--- a/src/being/crazymoves.cpp
+++ b/src/being/crazymoves.cpp
@@ -28,8 +28,6 @@
 
 #include "enums/being/beingdirection.h"
 
-#include "enums/net/packettype.h"
-
 #include "gui/windows/outfitwindow.h"
 
 #include "net/packetlimiter.h"
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 23d3422f7..e85301754 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -40,11 +40,7 @@
 #include "being/playerinfo.h"
 #include "being/playerrelations.h"
 
-#include "enums/being/attributes.h"
 #include "enums/being/beingdirection.h"
-#include "enums/being/reachable.h"
-
-#include "enums/net/packettype.h"
 
 #include "particle/particle.h"
 
@@ -52,6 +48,7 @@
 
 #include "gui/chatconsts.h"
 #include "gui/gui.h"
+#include "gui/userpalette.h"
 #include "gui/popupmanager.h"
 
 #include "gui/windows/chatwindow.h"
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index 2425f7502..475101528 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -27,12 +27,8 @@
 
 #include "enums/being/pickup.h"
 
-#include "enums/gui/usercolorid.h"
-
 #include "enums/simpletypes/keep.h"
 
-#include "gui/userpalette.h"
-
 #include "listeners/actorspritelistener.h"
 #include "listeners/attributelistener.h"
 #include "listeners/playerdeathlistener.h"
diff --git a/src/being/playerrelations.cpp b/src/being/playerrelations.cpp
index 20192be07..2ebaf3f2f 100644
--- a/src/being/playerrelations.cpp
+++ b/src/being/playerrelations.cpp
@@ -24,6 +24,7 @@
 
 #include "actormanager.h"
 #include "configuration.h"
+#include "logger.h"
 
 #include "being/localplayer.h"
 #include "being/playerignorestrategy.h"
diff --git a/src/being/playerrelations.h b/src/being/playerrelations.h
index 0976fe167..5f7e6e2a4 100644
--- a/src/being/playerrelations.h
+++ b/src/being/playerrelations.h
@@ -23,8 +23,6 @@
 #ifndef BEING_PLAYERRELATIONS_H
 #define BEING_PLAYERRELATIONS_H
 
-#include "enums/being/relation.h"
-
 #include "utils/stringvector.h"
 
 #include "being/playerrelation.h"
-- 
cgit v1.2.3-70-g09d2