summaryrefslogtreecommitdiff
path: root/src/particle
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-07 15:41:00 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-07 15:41:00 +0300
commitf69f346518f473f4f8fb13966e5831d105d1239c (patch)
tree4c5f44aaedbeb07af2197720c43ed86d68d0605d /src/particle
parent0ea2569615fb54cfd3d0606fb9cb86aee9efea4c (diff)
downloadmanaverse-f69f346518f473f4f8fb13966e5831d105d1239c.tar.gz
manaverse-f69f346518f473f4f8fb13966e5831d105d1239c.tar.bz2
manaverse-f69f346518f473f4f8fb13966e5831d105d1239c.tar.xz
manaverse-f69f346518f473f4f8fb13966e5831d105d1239c.zip
Move image class into image directory.
Diffstat (limited to 'src/particle')
-rw-r--r--src/particle/imageparticle.cpp2
-rw-r--r--src/particle/particle.cpp4
-rw-r--r--src/particle/particleemitter.cpp3
3 files changed, 5 insertions, 4 deletions
diff --git a/src/particle/imageparticle.cpp b/src/particle/imageparticle.cpp
index 8d53bddce..c7dfa1c7d 100644
--- a/src/particle/imageparticle.cpp
+++ b/src/particle/imageparticle.cpp
@@ -24,7 +24,7 @@
#include "render/graphics.h"
-#include "resources/image.h"
+#include "resources/image/image.h"
#include "debug.h"
diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp
index f7ecccd93..4e7b154c0 100644
--- a/src/particle/particle.cpp
+++ b/src/particle/particle.cpp
@@ -28,12 +28,12 @@
#include "particle/particleemitter.h"
#include "particle/rotationalparticle.h"
-#include "resources/image.h"
-
#include "resources/animation/simpleanimation.h"
#include "resources/dye/dye.h"
+#include "resources/image/image.h"
+
#include "resources/loaders/imageloader.h"
#include "utils/delete2.h"
diff --git a/src/particle/particleemitter.cpp b/src/particle/particleemitter.cpp
index 552831abc..b3fec4142 100644
--- a/src/particle/particleemitter.cpp
+++ b/src/particle/particleemitter.cpp
@@ -29,11 +29,12 @@
#include "particle/animationparticle.h"
#include "particle/rotationalparticle.h"
-#include "resources/image.h"
#include "resources/imageset.h"
#include "resources/dye/dye.h"
+#include "resources/image/image.h"
+
#include "resources/loaders/imageloader.h"
#include "resources/loaders/imagesetloader.h"
#include "resources/loaders/subimageloader.h"