diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-08-29 16:56:45 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-08-29 16:56:45 +0300 |
commit | 973606a6dbd201050b7d4cd0a6a782ff742056f6 (patch) | |
tree | 4f951409d7dbde5eb201bf3c6b46f777c3ce39b8 /src/resources | |
parent | d528e58cdbd306a828882eb68855e81dda2a3e62 (diff) | |
download | manaverse-973606a6dbd201050b7d4cd0a6a782ff742056f6.tar.gz manaverse-973606a6dbd201050b7d4cd0a6a782ff742056f6.tar.bz2 manaverse-973606a6dbd201050b7d4cd0a6a782ff742056f6.tar.xz manaverse-973606a6dbd201050b7d4cd0a6a782ff742056f6.zip |
Fix code style.
Diffstat (limited to 'src/resources')
-rw-r--r-- | src/resources/db/colordb.cpp | 5 | ||||
-rw-r--r-- | src/resources/iteminfo.h | 6 | ||||
-rw-r--r-- | src/resources/resourcemanager.h | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/resources/db/colordb.cpp b/src/resources/db/colordb.cpp index 62f7beef6..8913dab9f 100644 --- a/src/resources/db/colordb.cpp +++ b/src/resources/db/colordb.cpp @@ -99,7 +99,10 @@ void ColorDB::loadHair(const std::string &fileName, node, "id", 0), ItemColor); if (colors.find(id) != colors.end()) - logger->log("ColorDB: Redefinition of dye ID %d", toInt(id, int)); + { + logger->log("ColorDB: Redefinition of dye ID %d", + toInt(id, int)); + } colors[id] = ItemColorData(id, XML::langProperty(node, "name", ""), XML::getProperty(node, "value", "#FFFFFF")); diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index c022b650a..063d82958 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -284,8 +284,10 @@ class ItemInfo final { return mColorsList ? static_cast<int>(mColorsList->size()) : 0; } int getIconColorsSize() const - { return mIconColorsList ? static_cast<int>(mIconColorsList->size()) - : 0; } + { + return mIconColorsList ? static_cast<int>(mIconColorsList->size()) + : 0; + } std::string getColorName(const ItemColor idx) const; std::string getColor(const ItemColor idx) const; diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h index 6557afecf..c7c2cffe1 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager.h @@ -249,7 +249,7 @@ class ResourceManager final void clearCache(); - void static init(); + static void init(); private: /** |