From 24a5939846bf593e17e09f3564d941a7c2a5bf27 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 14 Jan 2014 21:47:02 +0300
Subject: fix code style.

---
 src/resources/beingcommon.cpp | 3 ---
 src/resources/db/avatardb.h   | 2 +-
 src/resources/db/colordb.cpp  | 3 +--
 src/resources/db/moddb.h      | 2 +-
 src/resources/db/monsterdb.h  | 2 +-
 src/resources/db/petdb.h      | 2 +-
 src/resources/db/sounddb.h    | 2 +-
 7 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'src/resources')

diff --git a/src/resources/beingcommon.cpp b/src/resources/beingcommon.cpp
index 3e3a81cbf..668d67259 100644
--- a/src/resources/beingcommon.cpp
+++ b/src/resources/beingcommon.cpp
@@ -20,10 +20,7 @@
 
 #include "resources/beingcommon.h"
 
-#include "logger.h"
-
 #include "utils/files.h"
-#include "utils/physfstools.h"
 #include "utils/stringutils.h"
 
 #include "resources/beinginfo.h"
diff --git a/src/resources/db/avatardb.h b/src/resources/db/avatardb.h
index f86ac4882..ba2d8ad47 100644
--- a/src/resources/db/avatardb.h
+++ b/src/resources/db/avatardb.h
@@ -38,6 +38,6 @@ namespace AvatarDB
     BeingInfo *get(const int id) A_WARN_UNUSED;
 
     void loadXmlFile(const std::string &fileName);
-}
+}  // namespace AvatarDB
 
 #endif  // RESOURCES_DB_AVATARDB_H
diff --git a/src/resources/db/colordb.cpp b/src/resources/db/colordb.cpp
index e4d5b83a0..34e0614c0 100644
--- a/src/resources/db/colordb.cpp
+++ b/src/resources/db/colordb.cpp
@@ -79,7 +79,6 @@ void ColorDB::loadHair(const std::string &fileName,
 {
     XML::Document *doc = new XML::Document(fileName);
     XmlNodePtr root = doc->rootNode();
-    bool hairXml = true;
 
     if (!root || !xmlNameEqual(root, "colors"))
     {
@@ -107,7 +106,7 @@ void ColorDB::loadHair(const std::string &fileName,
                 logger->log("ColorDB: Redefinition of dye ID %d", id);
 
             colors[id] = ItemColor(id, XML::langProperty(node, "name", ""),
-                XML::getProperty(node, hairXml ? "value" : "dye", "#FFFFFF"));
+                XML::getProperty(node, "value", "#FFFFFF"));
         }
     }
 
diff --git a/src/resources/db/moddb.h b/src/resources/db/moddb.h
index b09c47747..f1bf1b25d 100644
--- a/src/resources/db/moddb.h
+++ b/src/resources/db/moddb.h
@@ -42,6 +42,6 @@ namespace ModDB
     void loadXmlFile(const std::string &fileName);
 
     const ModInfos &getAll();
-}
+}  // namespace ModDB
 
 #endif  // RESOURCES_DB_MODDB_H
diff --git a/src/resources/db/monsterdb.h b/src/resources/db/monsterdb.h
index a4be8213e..9de5bde3a 100644
--- a/src/resources/db/monsterdb.h
+++ b/src/resources/db/monsterdb.h
@@ -41,6 +41,6 @@ namespace MonsterDB
     void loadXmlFile(const std::string &fileName);
 
     BeingInfo *get(const int id) A_WARN_UNUSED;
-}
+}  // namespace MonsterDB
 
 #endif  // RESOURCES_DB_MONSTERDB_H
diff --git a/src/resources/db/petdb.h b/src/resources/db/petdb.h
index 75175f5c5..17ef7b287 100644
--- a/src/resources/db/petdb.h
+++ b/src/resources/db/petdb.h
@@ -38,6 +38,6 @@ namespace PETDB
     void unload();
 
     BeingInfo *get(const int id) A_WARN_UNUSED;
-}
+}  // namespace PETDB
 
 #endif  // RESOURCES_DB_PETDB_H
diff --git a/src/resources/db/sounddb.h b/src/resources/db/sounddb.h
index 5d1361088..eca7286a2 100644
--- a/src/resources/db/sounddb.h
+++ b/src/resources/db/sounddb.h
@@ -34,6 +34,6 @@ namespace SoundDB
     void unload();
 
     std::string &getSound(const int id);
-}
+}  // namespace SoundDB
 
 #endif  // RESOURCES_DB_SOUNDDB_H
-- 
cgit v1.2.3-60-g2f50