diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-12-20 18:50:06 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-12-20 18:50:06 +0300 |
| commit | c4269ec3066959725f0f1d7670a14eadc8831a76 (patch) | |
| tree | 2a91b3f9f10e5b5e8c4d90f8fc9b1b157059107a | |
| parent | 982d842ce7006888cb943249efaa59db9607346d (diff) | |
| download | manaplus-c4269ec3066959725f0f1d7670a14eadc8831a76.tar.gz manaplus-c4269ec3066959725f0f1d7670a14eadc8831a76.tar.bz2 manaplus-c4269ec3066959725f0f1d7670a14eadc8831a76.tar.xz manaplus-c4269ec3066959725f0f1d7670a14eadc8831a76.zip | |
Move imagesprite into sprite directory.
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/being/actorsprite.cpp | 2 | ||||
| -rw-r--r-- | src/resources/sprite/imagesprite.cpp (renamed from src/imagesprite.cpp) | 2 | ||||
| -rw-r--r-- | src/resources/sprite/imagesprite.h (renamed from src/imagesprite.h) | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1307039e4..fb2429bec 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -944,8 +944,8 @@ SET(SRCS enums/magicschool.h particle/imageparticle.cpp particle/imageparticle.h - imagesprite.cpp - imagesprite.h + resources/sprite/imagesprite.cpp + resources/sprite/imagesprite.h inventory.cpp inventory.h item.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 98ad1ef6d..0f89cf44d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -706,8 +706,8 @@ manaplus_SOURCES += main.cpp \ actions/windows.h \ client.cpp \ client.h \ - imagesprite.cpp \ - imagesprite.h \ + resources/sprite/imagesprite.cpp \ + resources/sprite/imagesprite.h \ inventory.cpp \ inventory.h \ textcommand.cpp \ diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp index c9577b2dc..5fd9884de 100644 --- a/src/being/actorsprite.cpp +++ b/src/being/actorsprite.cpp @@ -22,7 +22,6 @@ #include "being/actorsprite.h" #include "configuration.h" -#include "imagesprite.h" #include "statuseffect.h" #include "being/localplayer.h" @@ -38,6 +37,7 @@ #include "resources/resourcemanager.h" #include "resources/sprite/animatedsprite.h" +#include "resources/sprite/imagesprite.h" #include "resources/sprite/spritereference.h" #include "utils/checkutils.h" diff --git a/src/imagesprite.cpp b/src/resources/sprite/imagesprite.cpp index 953e91472..9b14e3126 100644 --- a/src/imagesprite.cpp +++ b/src/resources/sprite/imagesprite.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "imagesprite.h" +#include "resources/sprite/imagesprite.h" #include "render/graphics.h" diff --git a/src/imagesprite.h b/src/resources/sprite/imagesprite.h index 61defaa2f..89a8bdbe1 100644 --- a/src/imagesprite.h +++ b/src/resources/sprite/imagesprite.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef IMAGESPRITE_H -#define IMAGESPRITE_H +#ifndef RESOURCES_SPRITE_IMAGESPRITE_H +#define RESOURCES_SPRITE_IMAGESPRITE_H #include "resources/sprite/sprite.h" @@ -79,4 +79,4 @@ class ImageSprite final : public Sprite Image *mImage; }; -#endif // IMAGESPRITE_H +#endif // RESOURCES_SPRITE_IMAGESPRITE_H |