diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-06-07 15:54:27 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-06-07 15:54:27 +0300 |
commit | c43a3b024bf3da2b0c7b6eb177b662d63db41808 (patch) | |
tree | 0be376f2f92a4ef1671636f9a9e55ec01ce544b4 /src/resources | |
parent | f69f346518f473f4f8fb13966e5831d105d1239c (diff) | |
download | manaplus-c43a3b024bf3da2b0c7b6eb177b662d63db41808.tar.gz manaplus-c43a3b024bf3da2b0c7b6eb177b662d63db41808.tar.bz2 manaplus-c43a3b024bf3da2b0c7b6eb177b662d63db41808.tar.xz manaplus-c43a3b024bf3da2b0c7b6eb177b662d63db41808.zip |
Move subimage class into image directory.
Diffstat (limited to 'src/resources')
-rw-r--r-- | src/resources/image/image.cpp | 3 | ||||
-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.cpp | 7 |
4 files changed, 7 insertions, 5 deletions
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 |