summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-07 15:54:27 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-07 15:54:27 +0300
commitc43a3b024bf3da2b0c7b6eb177b662d63db41808 (patch)
tree0be376f2f92a4ef1671636f9a9e55ec01ce544b4
parentf69f346518f473f4f8fb13966e5831d105d1239c (diff)
downloadmv-c43a3b024bf3da2b0c7b6eb177b662d63db41808.tar.gz
mv-c43a3b024bf3da2b0c7b6eb177b662d63db41808.tar.bz2
mv-c43a3b024bf3da2b0c7b6eb177b662d63db41808.tar.xz
mv-c43a3b024bf3da2b0c7b6eb177b662d63db41808.zip
Move subimage class into image directory.
-rw-r--r--src/CMakeLists.txt8
-rw-r--r--src/Makefile.am4
-rw-r--r--src/resources/image/image.cpp3
-rw-r--r--src/resources/image/subimage.cpp (renamed from src/resources/subimage.cpp)2
-rw-r--r--src/resources/image/subimage.h (renamed from src/resources/subimage.h)0
-rw-r--r--src/resources/map/map.cpp7
6 files changed, 13 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7d7c154f0..6984556c4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -782,8 +782,8 @@ SET(SRCS
enums/resources/spritedirection.h
resources/sprite/spritedisplay.h
resources/sprite/spritereference.h
- resources/subimage.cpp
- resources/subimage.h
+ resources/image/subimage.cpp
+ resources/image/subimage.h
resources/surfaceimagehelper.cpp
resources/surfaceimagehelper.h
resources/atlas/textureatlas.h
@@ -1476,8 +1476,8 @@ SET(DYE_CMD_SRCS
resources/skillconsts.h
resources/soundeffect.cpp
resources/soundeffect.h
- resources/subimage.cpp
- resources/subimage.h
+ resources/image/subimage.cpp
+ resources/image/subimage.h
resources/surfaceimagehelper.cpp
resources/surfaceimagehelper.h
resources/atlas/textureatlas.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 048c064ad..b262d71ba 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -447,8 +447,8 @@ SRC += events/actionevent.h \
resources/sprite/spritedef.cpp \
resources/sprite/spritedef.h \
enums/resources/spritedirection.h \
- resources/subimage.cpp \
- resources/subimage.h \
+ resources/image/subimage.cpp \
+ resources/image/subimage.h \
resources/surfaceimagehelper.cpp \
resources/surfaceimagehelper.h \
resources/wallpaper.cpp \
diff --git a/src/resources/image/image.cpp b/src/resources/image/image.cpp
index 683129e7a..fe21631e6 100644
--- a/src/resources/image/image.cpp
+++ b/src/resources/image/image.cpp
@@ -30,7 +30,8 @@
#include "resources/memorymanager.h"
#include "resources/sdlimagehelper.h"
-#include "resources/subimage.h"
+
+#include "resources/image/subimage.h"
#include "resources/resourcemanager/resourcemanager.h"
diff --git a/src/resources/subimage.cpp b/src/resources/image/subimage.cpp
index b6ec02479..615474334 100644
--- a/src/resources/subimage.cpp
+++ b/src/resources/image/subimage.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "resources/subimage.h"
+#include "resources/image/subimage.h"
#ifdef DEBUG_IMAGES
#include "logger.h"
diff --git a/src/resources/subimage.h b/src/resources/image/subimage.h
index 29f7fed1e..29f7fed1e 100644
--- a/src/resources/subimage.h
+++ b/src/resources/image/subimage.h
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index 98a29a8e8..9e72684fe 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -46,14 +46,15 @@
#include "particle/particle.h"
#include "resources/ambientlayer.h"
-#include "resources/subimage.h"
+
+#include "resources/image/subimage.h"
+
+#include "resources/loaders/imageloader.h"
#include "resources/map/location.h"
#include "resources/map/mapobjectlist.h"
#include "resources/map/tileanimation.h"
-#include "resources/loaders/imageloader.h"
-
#ifdef USE_OPENGL
#include "render/renderers.h"
#endif