From 2741064fe3e73d069087b0f99a8357d67ec632af Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 24 May 2013 00:19:04 +0300
Subject: fix code style.

---
 src/client.cpp           | 4 ++--
 src/commandhandler.h     | 1 -
 src/commands.h           | 2 +-
 src/gui/minimap.cpp      | 1 +
 src/gui/popupmenu.cpp    | 3 ++-
 src/gui/serverdialog.cpp | 3 ++-
 src/gui/viewport.cpp     | 3 +--
 src/localplayer.h        | 1 -
 8 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/client.cpp b/src/client.cpp
index 67926d50a..fd78d747e 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1231,8 +1231,8 @@ int Client::gameExec()
                             mUpdatesDir + "/local/",
                             "zip");
 
-                        resman->removeFromSearchPath(mLocalDataDir + dirSeparator
-                            + mUpdatesDir + "/local/");
+                        resman->removeFromSearchPath(mLocalDataDir
+                            + dirSeparator + mUpdatesDir + "/local/");
                     }
 
                     resman->clearCache();
diff --git a/src/commandhandler.h b/src/commandhandler.h
index ec75d220f..4e30dce01 100644
--- a/src/commandhandler.h
+++ b/src/commandhandler.h
@@ -92,7 +92,6 @@ class CommandHandler final
         void callFunc(const CommandInfo &info,
                       const std::string &args,
                       ChatTab *const tab);
-
 };
 
 extern CommandHandler *commandHandler;
diff --git a/src/commands.h b/src/commands.h
index fca679726..62f9eaead 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -129,7 +129,7 @@ namespace Commands
 
 enum
 {
-    COMMAND_CLOSEALL,
+    COMMAND_CLOSEALL = 0,
     COMMAND_IGNOREALL,
     COMMAND_HELP,
     COMMAND_ANNOUNCE,
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 15372b928..4acf7944d 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -322,6 +322,7 @@ void Minimap::draw(gcn::Graphics *graphics)
                     type = UserPalette::NPC;
                     break;
 
+                case ActorSprite::AVATAR:
                 case ActorSprite::UNKNOWN:
                 case ActorSprite::PLAYER:
                 case ActorSprite::FLOOR_ITEM:
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 371798eb7..91bf514a3 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -270,9 +270,10 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being)
                         _("Add to ignore list"));
                 }
             }
-        break;
+            break;
         }
 
+        case ActorSprite::AVATAR:
         case ActorSprite::UNKNOWN:
         case ActorSprite::FLOOR_ITEM:
         case ActorSprite::PORTAL:
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 9392a4358..488a3c3d7 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -601,7 +601,8 @@ void ServerDialog::loadServers(const bool addNew)
         if (!xmlNameEqual(serverNode, "server"))
             continue;
 
-        const std::string type = XML::getProperty(serverNode, "type", "unknown");
+        const std::string type = XML::getProperty(
+            serverNode, "type", "unknown");
         ServerInfo server;
         server.type = ServerInfo::parseType(type);
 
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index da771b397..f3ec2a743 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -908,12 +908,10 @@ void Viewport::mouseMoved(gcn::MouseEvent &event A_UNUSED)
     {
         switch (mHoverBeing->getType())
         {
-            // NPCs
             case ActorSprite::NPC:
                 gui->setCursorType(mHoverBeing->getHoverCursor());
                 break;
 
-            // Monsters
             case ActorSprite::MONSTER:
                 gui->setCursorType(mHoverBeing->getHoverCursor());
                 break;
@@ -922,6 +920,7 @@ void Viewport::mouseMoved(gcn::MouseEvent &event A_UNUSED)
                 gui->setCursorType(mHoverBeing->getHoverCursor());
                 break;
 
+            case ActorSprite::AVATAR:
             case ActorSprite::FLOOR_ITEM:
             case ActorSprite::UNKNOWN:
             case ActorSprite::PLAYER:
diff --git a/src/localplayer.h b/src/localplayer.h
index 0e6f2bf8c..750609eb9 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -41,7 +41,6 @@ class ImageSet;
 class Item;
 class Map;
 class OkDialog;
-//struct SkillInfo;
 
 class AwayListener final : public gcn::ActionListener
 {
-- 
cgit v1.2.3-60-g2f50