diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-12-20 17:55:49 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-12-20 17:55:49 +0300 |
| commit | 2a506c72f0690b1b73034ce1d6911a1abba74029 (patch) | |
| tree | 0bfffb22e4b8e58932f3f7bd5805cd7efcac343b /src | |
| parent | fc34c84d4ef4a51b49297dabffc8c3aa936c9588 (diff) | |
| download | plus-2a506c72f0690b1b73034ce1d6911a1abba74029.tar.gz plus-2a506c72f0690b1b73034ce1d6911a1abba74029.tar.bz2 plus-2a506c72f0690b1b73034ce1d6911a1abba74029.tar.xz plus-2a506c72f0690b1b73034ce1d6911a1abba74029.zip | |
Move spritedef into sprite directory.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/resources/resourcemanager.cpp | 3 | ||||
| -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 | ||||
| -rw-r--r-- | src/sprite.h | 2 |
6 files changed, 13 insertions, 12 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 89e3cb267..fbff965d1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -735,8 +735,8 @@ SET(SRCS resources/soundeffect.h resources/soundinfo.h resources/spriteaction.h - resources/spritedef.h - resources/spritedef.cpp + resources/sprite/spritedef.h + resources/sprite/spritedef.cpp resources/spritedirection.h resources/spritedisplay.h resources/spritereference.h @@ -1373,8 +1373,8 @@ SET(DYE_CMD_SRCS resources/surfaceimagehelper.h resources/textureatlas.h resources/updatefile.h - resources/spritedef.cpp - resources/spritedef.h + resources/sprite/spritedef.cpp + resources/sprite/spritedef.h resources/spritedisplay.h resources/spritereference.h utils/files.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 8a26916fb..7b446fb73 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -384,8 +384,8 @@ SRC += events/actionevent.h \ resources/soundeffect.h \ resources/soundinfo.h \ resources/spriteaction.h \ - resources/spritedef.cpp \ - resources/spritedef.h \ + resources/sprite/spritedef.cpp \ + resources/sprite/spritedef.h \ resources/spritedirection.h \ resources/subimage.cpp \ resources/subimage.h \ 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 diff --git a/src/sprite.h b/src/sprite.h index 1062615c9..3575eea2f 100644 --- a/src/sprite.h +++ b/src/sprite.h @@ -22,7 +22,7 @@ #ifndef SPRITE_H #define SPRITE_H -#include "resources/spritedef.h" +#include "resources/sprite/spritedef.h" #include "localconsts.h" |