summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-02-07 22:51:42 +0300
committerAndrei Karas <akaras@inbox.ru>2016-02-07 22:51:42 +0300
commit17eb4c92bdaf20f66ef576028c67c80fcea93913 (patch)
tree4936eef82e62e6cd3107b2c99a9821b48902a59f /src/resources
parent9fe21fcd8883b37bdc30224822e6e42afb35b8f0 (diff)
downloadmv-17eb4c92bdaf20f66ef576028c67c80fcea93913.tar.gz
mv-17eb4c92bdaf20f66ef576028c67c80fcea93913.tar.bz2
mv-17eb4c92bdaf20f66ef576028c67c80fcea93913.tar.xz
mv-17eb4c92bdaf20f66ef576028c67c80fcea93913.zip
Fix code style.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/db/colordb.cpp2
-rw-r--r--src/resources/db/palettedb.cpp2
-rw-r--r--src/resources/resourcemanager.cpp3
3 files changed, 2 insertions, 5 deletions
diff --git a/src/resources/db/colordb.cpp b/src/resources/db/colordb.cpp
index 07dd7b46e..5345010b3 100644
--- a/src/resources/db/colordb.cpp
+++ b/src/resources/db/colordb.cpp
@@ -26,8 +26,6 @@
#include "resources/beingcommon.h"
-#include "utils/files.h"
-
#include "debug.h"
namespace
diff --git a/src/resources/db/palettedb.cpp b/src/resources/db/palettedb.cpp
index 3ad2b13fa..a3c1fe4a4 100644
--- a/src/resources/db/palettedb.cpp
+++ b/src/resources/db/palettedb.cpp
@@ -27,8 +27,6 @@
#include "resources/dye/dyecolor.h"
-#include <map>
-
#include "debug.h"
namespace
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 34a4d523d..366460a6b 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -31,8 +31,9 @@
#ifdef USE_OPENGL
#include "resources/atlas/atlasmanager.h"
#include "resources/atlas/atlasresource.h"
-#endif
+#else // USE_OPENGL
#include "resources/image.h"
+#endif // USE_OPENGL
#include "resources/imagehelper.h"
#include "resources/imageset.h"
#include "resources/sdlmusic.h"