summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-09 15:43:27 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-09 18:44:03 +0300
commite5726a11424ebd48f12d76149ec7e5e2b6278bdd (patch)
treebdcb9987f4109513a99f3a46e01687babc94a243 /src/resources
parentb4bdf86b6dd57045bd2d80cfcd5e0a428a5054b3 (diff)
downloadmv-e5726a11424ebd48f12d76149ec7e5e2b6278bdd.tar.gz
mv-e5726a11424ebd48f12d76149ec7e5e2b6278bdd.tar.bz2
mv-e5726a11424ebd48f12d76149ec7e5e2b6278bdd.tar.xz
mv-e5726a11424ebd48f12d76149ec7e5e2b6278bdd.zip
Fix code style.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/atlasmanager.cpp3
-rw-r--r--src/resources/db/itemdb.cpp2
-rw-r--r--src/resources/iteminfo.cpp3
-rw-r--r--src/resources/iteminfo.h11
-rw-r--r--src/resources/mapreader.cpp1
5 files changed, 16 insertions, 4 deletions
diff --git a/src/resources/atlasmanager.cpp b/src/resources/atlasmanager.cpp
index 1dad94a09..81ae0f2f6 100644
--- a/src/resources/atlasmanager.cpp
+++ b/src/resources/atlasmanager.cpp
@@ -301,7 +301,8 @@ void AtlasManager::convertAtlas(TextureAtlas *const atlas)
void AtlasManager::injectToResources(const AtlasResource *const resource)
{
ResourceManager *const resman = ResourceManager::getInstance();
- FOR_EACH (std::vector<TextureAtlas*>::const_iterator, it, resource->atlases)
+ FOR_EACH (std::vector<TextureAtlas*>::const_iterator,
+ it, resource->atlases)
{
// add each atlas image to resources
TextureAtlas *const atlas = *it;
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index 7d61fedbf..81a153e04 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -22,6 +22,8 @@
#include "resources/db/itemdb.h"
+#include "map.h"
+
#include "configuration.h"
#include "logger.h"
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index b7fc0f4ac..391e546da 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -22,6 +22,9 @@
#include "resources/iteminfo.h"
+#include "map.h"
+
+#include "resources/db/colordb.h"
#include "resources/db/itemdb.h"
#include "configuration.h"
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 93a2d447f..9b8c1656a 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -23,12 +23,19 @@
#ifndef RESOURCES_ITEMINFO_H
#define RESOURCES_ITEMINFO_H
-#include "being/being.h"
+#include "being/gender.h"
-#include "resources/db/colordb.h"
+#include "resources/cursor.h"
+#include "resources/soundinfo.h"
+#include "resources/spritedef.h"
#include <map>
+namespace ColorDB
+{
+ class ItemColor;
+}
+
enum EquipmentSlot
{
// Equipment rules:
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 075891764..44fc5f447 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -986,7 +986,6 @@ Tileset *MapReader::readTileset(XmlNodePtr node,
break;
}
}
-
}
else if (isAnim && !haveAnimation)
{