diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-12-20 18:23:50 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-12-20 18:23:50 +0300 |
| commit | a6d1f7f9abdedce7c03056408ed2172792abce53 (patch) | |
| tree | 72f08877deade7b93e1386fc16d94b1a89f27c6b | |
| parent | 5b0636a4bf89b22ec5e18fd41f9c9d122034b7a8 (diff) | |
| download | mv-a6d1f7f9abdedce7c03056408ed2172792abce53.tar.gz mv-a6d1f7f9abdedce7c03056408ed2172792abce53.tar.bz2 mv-a6d1f7f9abdedce7c03056408ed2172792abce53.tar.xz mv-a6d1f7f9abdedce7c03056408ed2172792abce53.zip | |
Move sprite.h into sprites directory.
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/animatedsprite.h | 2 | ||||
| -rw-r--r-- | src/being/compoundsprite.h | 2 | ||||
| -rw-r--r-- | src/imagesprite.h | 2 | ||||
| -rw-r--r-- | src/resources/sprite/sprite.h (renamed from src/sprite.h) | 6 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 616a1fa8f..cb4eb0fd4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1126,7 +1126,7 @@ SET(SRCS const/sound.h soundmanager.cpp soundmanager.h - sprite.h + resources/sprite/sprite.h enums/screendensity.h enums/state.h enums/textcommandtype.h diff --git a/src/Makefile.am b/src/Makefile.am index 8665aff0e..6b3c0aac5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -644,7 +644,7 @@ SRC += events/actionevent.h \ resources/animation.h \ simpleanimation.cpp \ simpleanimation.h \ - sprite.h \ + resources/sprite/sprite.h \ const/sound.h \ soundmanager.cpp \ soundmanager.h \ diff --git a/src/animatedsprite.h b/src/animatedsprite.h index 10e378593..be27e5d10 100644 --- a/src/animatedsprite.h +++ b/src/animatedsprite.h @@ -23,7 +23,7 @@ #ifndef ANIMATEDSPRITE_H #define ANIMATEDSPRITE_H -#include "sprite.h" +#include "resources/sprite/sprite.h" class Animation; class AnimationDelayLoad; diff --git a/src/being/compoundsprite.h b/src/being/compoundsprite.h index 25dee6b65..4a82855cf 100644 --- a/src/being/compoundsprite.h +++ b/src/being/compoundsprite.h @@ -22,7 +22,7 @@ #ifndef BEING_COMPOUNDSPRITE_H #define BEING_COMPOUNDSPRITE_H -#include "sprite.h" +#include "resources/sprite/sprite.h" #include <list> #include <vector> diff --git a/src/imagesprite.h b/src/imagesprite.h index 528b8c6ac..61defaa2f 100644 --- a/src/imagesprite.h +++ b/src/imagesprite.h @@ -22,7 +22,7 @@ #ifndef IMAGESPRITE_H #define IMAGESPRITE_H -#include "sprite.h" +#include "resources/sprite/sprite.h" #include "resources/image.h" diff --git a/src/sprite.h b/src/resources/sprite/sprite.h index 3575eea2f..34ec001e1 100644 --- a/src/sprite.h +++ b/src/resources/sprite/sprite.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SPRITE_H -#define SPRITE_H +#ifndef RESOURCES_SPRITE_SPRITE_H +#define RESOURCES_SPRITE_SPRITE_H #include "resources/sprite/spritedef.h" @@ -127,4 +127,4 @@ class Sprite notfinal float mAlpha; /**< The alpha opacity used to draw */ }; -#endif // SPRITE_H +#endif // RESOURCES_SPRITE_SPRITE_H |