summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-20 17:55:49 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-20 17:55:49 +0300
commit2a506c72f0690b1b73034ce1d6911a1abba74029 (patch)
tree0bfffb22e4b8e58932f3f7bd5805cd7efcac343b /src/resources
parentfc34c84d4ef4a51b49297dabffc8c3aa936c9588 (diff)
downloadmv-2a506c72f0690b1b73034ce1d6911a1abba74029.tar.gz
mv-2a506c72f0690b1b73034ce1d6911a1abba74029.tar.bz2
mv-2a506c72f0690b1b73034ce1d6911a1abba74029.tar.xz
mv-2a506c72f0690b1b73034ce1d6911a1abba74029.zip
Move spritedef into sprite directory.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/resourcemanager.cpp3
-rw-r--r--src/resources/sprite/spritedef.cpp (renamed from src/resources/spritedef.cpp)2
-rw-r--r--src/resources/sprite/spritedef.h (renamed from src/resources/spritedef.h)6
3 files changed, 6 insertions, 5 deletions
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index bb566d9f4..8d8e843df 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -38,7 +38,8 @@
#include "resources/imageset.h"
#include "resources/sdlmusic.h"
#include "resources/soundeffect.h"
-#include "resources/spritedef.h"
+
+#include "resources/sprite/spritedef.h"
#include "utils/delete2.h"
#include "utils/physfscheckutils.h"
diff --git a/src/resources/spritedef.cpp b/src/resources/sprite/spritedef.cpp
index 53b975a9f..cb0fc777c 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/sprite/spritedef.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "resources/spritedef.h"
+#include "resources/sprite/spritedef.h"
#include "configuration.h"
#include "logger.h"
diff --git a/src/resources/spritedef.h b/src/resources/sprite/spritedef.h
index d24837aec..02ce98ff9 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/sprite/spritedef.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef RESOURCES_SPRITEDEF_H
-#define RESOURCES_SPRITEDEF_H
+#ifndef RESOURCES_SPRITE_SPRITEDEF_H
+#define RESOURCES_SPRITE_SPRITEDEF_H
#include "resources/resource.h"
@@ -156,4 +156,4 @@ class SpriteDef final : public Resource
std::set<std::string> mProcessedFiles;
};
-#endif // RESOURCES_SPRITEDEF_H
+#endif // RESOURCES_SPRITE_SPRITEDEF_H