summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-29 20:13:40 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-29 20:53:57 +0300
commit36c45ae7d8d2577a900ec266b64448d4b488013d (patch)
tree419024ce46e507c2abb0578d15d787093556b246 /src/resources
parent864e023e0faeca5aa662023a54af7e4f9797fafa (diff)
downloadmv-36c45ae7d8d2577a900ec266b64448d4b488013d.tar.gz
mv-36c45ae7d8d2577a900ec266b64448d4b488013d.tar.bz2
mv-36c45ae7d8d2577a900ec266b64448d4b488013d.tar.xz
mv-36c45ae7d8d2577a900ec266b64448d4b488013d.zip
Move cast macroses into separate file.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/image/subimage.cpp2
-rw-r--r--src/resources/iteminfo.h1
-rw-r--r--src/resources/map/map.h6
-rw-r--r--src/resources/map/mapheights.h2
-rw-r--r--src/resources/map/objectslayer.cpp2
-rw-r--r--src/resources/wallpaper.cpp1
6 files changed, 12 insertions, 2 deletions
diff --git a/src/resources/image/subimage.cpp b/src/resources/image/subimage.cpp
index 77d0eb889..735ed27f5 100644
--- a/src/resources/image/subimage.cpp
+++ b/src/resources/image/subimage.cpp
@@ -22,6 +22,8 @@
#include "resources/image/subimage.h"
+#include "utils/cast.h"
+
#ifdef DEBUG_IMAGES
#include "logger.h"
#endif // DEBUG_IMAGES
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 384626856..dd91dc738 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -35,6 +35,7 @@
#include "resources/sprite/spritedisplay.h"
+#include "utils/cast.h"
#include "utils/intmap.h"
// sprite, <itemfrom, itemto>
diff --git a/src/resources/map/map.h b/src/resources/map/map.h
index 1d5ccefdc..3ae809058 100644
--- a/src/resources/map/map.h
+++ b/src/resources/map/map.h
@@ -33,12 +33,14 @@
#include "enums/resources/map/maplayerposition.h"
#include "enums/resources/map/maptype.h"
+#include "utils/cast.h"
+
+#include "listeners/configlistener.h"
+
#include "resources/memorycounter.h"
#include "resources/map/properties.h"
-#include "listeners/configlistener.h"
-
#include <vector>
class AmbientLayer;
diff --git a/src/resources/map/mapheights.h b/src/resources/map/mapheights.h
index 43721e817..ef8c4151b 100644
--- a/src/resources/map/mapheights.h
+++ b/src/resources/map/mapheights.h
@@ -23,6 +23,8 @@
#include "resources/memorycounter.h"
+#include "utils/cast.h"
+
#include "localconsts.h"
class MapHeights final : public MemoryCounter
diff --git a/src/resources/map/objectslayer.cpp b/src/resources/map/objectslayer.cpp
index 3224da0e6..05d00c61e 100644
--- a/src/resources/map/objectslayer.cpp
+++ b/src/resources/map/objectslayer.cpp
@@ -20,6 +20,8 @@
#include "resources/map/objectslayer.h"
+#include "utils/cast.h"
+
#include "resources/map/mapobjectlist.h"
#include "debug.h"
diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp
index e474d2315..2cc4c5754 100644
--- a/src/resources/wallpaper.cpp
+++ b/src/resources/wallpaper.cpp
@@ -29,6 +29,7 @@
#include "resources/wallpaperdata.h"
+#include "utils/cast.h"
#include "utils/foreach.h"
#include <algorithm>