summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-30 16:20:23 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-30 16:20:23 +0300
commit35002b57f36c1ea66daada6a3a0ef05ef37512ec (patch)
tree62ee93fdfacd78484925ab367fb39b6dd1dea49b
parent47f3e53850eae9c714ffad0c1197191a782e72e8 (diff)
downloadmv-35002b57f36c1ea66daada6a3a0ef05ef37512ec.tar.gz
mv-35002b57f36c1ea66daada6a3a0ef05ef37512ec.tar.bz2
mv-35002b57f36c1ea66daada6a3a0ef05ef37512ec.tar.xz
mv-35002b57f36c1ea66daada6a3a0ef05ef37512ec.zip
Remove more extra headers.
-rw-r--r--src/resources/map/maplayer.cpp2
-rw-r--r--src/soundmanager.cpp2
-rw-r--r--src/utils/stringutils.cpp6
3 files changed, 7 insertions, 3 deletions
diff --git a/src/resources/map/maplayer.cpp b/src/resources/map/maplayer.cpp
index f9f154a64..b55637143 100644
--- a/src/resources/map/maplayer.cpp
+++ b/src/resources/map/maplayer.cpp
@@ -31,7 +31,9 @@
#include "gui/userpalette.h"
+#ifdef USE_OPENGL
#include "utils/foreach.h"
+#endif // USE_OPENGL
#include "render/graphics.h"
diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp
index e9e54b046..37a6321a7 100644
--- a/src/soundmanager.cpp
+++ b/src/soundmanager.cpp
@@ -30,7 +30,9 @@
#include "fs/virtfs/fs.h"
+#ifndef TMWA_SUPPORT
#include "utils/cast.h"
+#endif // TMWA_SUPPORT
#include "resources/sdlmusic.h"
#include "resources/soundeffect.h"
diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp
index 71a82f16f..7f3ba988c 100644
--- a/src/utils/stringutils.cpp
+++ b/src/utils/stringutils.cpp
@@ -24,13 +24,13 @@
#include "const/utils/utf8.h"
-#ifndef DYECMD
+#ifdef DYECMD
+#include "utils/cast.h"
+#else // DYECMD
#include "resources/iteminfo.h"
-
#include "resources/db/itemdb.h"
#endif // DYECMD
-#include "utils/cast.h"
#include "utils/gettext.h"
#include "utils/foreach.h"