diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-05-24 23:09:33 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-05-24 23:14:31 +0300 |
| commit | d0a3a9f0f6dd3571e9f3a15bf4f8493a46d69eef (patch) | |
| tree | d7204315244dc0a820df3c7834647893e83653e7 /src/resources/sprite | |
| parent | 21ea310d2fa35a38efdd63e01685262dd77f8bad (diff) | |
| download | manaverse-d0a3a9f0f6dd3571e9f3a15bf4f8493a46d69eef.tar.gz manaverse-d0a3a9f0f6dd3571e9f3a15bf4f8493a46d69eef.tar.bz2 manaverse-d0a3a9f0f6dd3571e9f3a15bf4f8493a46d69eef.tar.xz manaverse-d0a3a9f0f6dd3571e9f3a15bf4f8493a46d69eef.zip | |
Move resourcemanager into subdirectory.
Diffstat (limited to 'src/resources/sprite')
| -rw-r--r-- | src/resources/sprite/animatedsprite.cpp | 3 | ||||
| -rw-r--r-- | src/resources/sprite/animatedsprite_unittest.cc | 3 | ||||
| -rw-r--r-- | src/resources/sprite/animationdelayload.cpp | 2 | ||||
| -rw-r--r-- | src/resources/sprite/spritedef.cpp | 3 |
4 files changed, 7 insertions, 4 deletions
diff --git a/src/resources/sprite/animatedsprite.cpp b/src/resources/sprite/animatedsprite.cpp index 87fe72a7b..6ada9c394 100644 --- a/src/resources/sprite/animatedsprite.cpp +++ b/src/resources/sprite/animatedsprite.cpp @@ -29,10 +29,11 @@ #include "resources/action.h" #include "resources/delayedmanager.h" #include "resources/image.h" -#include "resources/resourcemanager.h" #include "resources/animation/animation.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "resources/sprite/animationdelayload.h" #include "utils/delete2.h" diff --git a/src/resources/sprite/animatedsprite_unittest.cc b/src/resources/sprite/animatedsprite_unittest.cc index f9b6e65a9..1a77ea38f 100644 --- a/src/resources/sprite/animatedsprite_unittest.cc +++ b/src/resources/sprite/animatedsprite_unittest.cc @@ -30,11 +30,12 @@ #include "gui/theme.h" -#include "resources/resourcemanager.h" #include "resources/sdlimagehelper.h" #include "resources/animation/animation.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/env.h" #include "utils/mrand.h" #include "utils/physfstools.h" diff --git a/src/resources/sprite/animationdelayload.cpp b/src/resources/sprite/animationdelayload.cpp index ab0362337..fa33ff5f5 100644 --- a/src/resources/sprite/animationdelayload.cpp +++ b/src/resources/sprite/animationdelayload.cpp @@ -22,7 +22,7 @@ #include "const/resources/spriteaction.h" -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #include "resources/sprite/animatedsprite.h" diff --git a/src/resources/sprite/spritedef.cpp b/src/resources/sprite/spritedef.cpp index 01651bd80..25c5952e3 100644 --- a/src/resources/sprite/spritedef.cpp +++ b/src/resources/sprite/spritedef.cpp @@ -34,12 +34,13 @@ #include "resources/action.h" #include "resources/imageset.h" -#include "resources/resourcemanager.h" #include "resources/animation/animation.h" #include "resources/dye/dye.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "resources/sprite/spritereference.h" #include "debug.h" |